diff options
| author | Tom Rini <trini@konsulko.com> | 2020-10-30 15:24:30 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-10-30 15:24:30 -0400 |
| commit | 63d4607e03e5f1f7ab9a18bc640e31f7d28874b4 (patch) | |
| tree | bdea1f28ad176fcd44f209bf943d25c8bddbe8d2 /arch/arm/mach-imx/mx6/soc.c | |
| parent | 096912b5fe9bb2fd90599d86a714001df6924198 (diff) | |
| parent | 2424057b2ad0eacdd2d81e35e7bea5df97802b8f (diff) | |
Merge tag 'dm-pull-30oct20' of https://gitlab.denx.de/u-boot/custodians/u-boot-dm
of-platdata and dtoc improvements
sandbox SPL tests
binman support for compressed sections
Diffstat (limited to 'arch/arm/mach-imx/mx6/soc.c')
| -rw-r--r-- | arch/arm/mach-imx/mx6/soc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mx6/soc.c b/arch/arm/mach-imx/mx6/soc.c index e129286065..a636107410 100644 --- a/arch/arm/mach-imx/mx6/soc.c +++ b/arch/arm/mach-imx/mx6/soc.c @@ -34,7 +34,7 @@ struct scu_regs { u32 fpga_rev; }; -#if defined(CONFIG_IMX_THERMAL) +#if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_IMX_THERMAL) static const struct imx_thermal_plat imx6_thermal_plat = { .regs = (void *)ANATOP_BASE_ADDR, .fuse_bank = 1, |