diff options
| author | Tom Rini <trini@konsulko.com> | 2020-01-21 08:36:50 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-01-21 08:36:50 -0500 |
| commit | ad647690b1346f57847d4c9251293293af8928a8 (patch) | |
| tree | fc1e5e42f6e5869e950ecc394635b12e2b7d9f66 /arch/arm/mach-imx/mx7ulp | |
| parent | 07add22cab3be86067c227a30ad5d0feab541316 (diff) | |
| parent | 419603ca2d7a8065029a838cb0227ad7bfc5e1d3 (diff) | |
Merge tag 'u-boot-imx-20200121' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
---------------------------------
imx8: cleanup, fix warnings
imx6ull: add VisionSOM SoM and EVK
mx7ulp: fix warning due network, cleanup
mx7dsabre: Fix dm probe pmic
imx6: fixed for vining2000
Travis: https://travis-ci.org/sbabic/u-boot-imx/builds/639512296
Diffstat (limited to 'arch/arm/mach-imx/mx7ulp')
| -rw-r--r-- | arch/arm/mach-imx/mx7ulp/soc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/mx7ulp/soc.c b/arch/arm/mach-imx/mx7ulp/soc.c index 7f8fdc7005..46484813d2 100644 --- a/arch/arm/mach-imx/mx7ulp/soc.c +++ b/arch/arm/mach-imx/mx7ulp/soc.c @@ -118,6 +118,7 @@ void init_wdog(void) disable_wdog(WDG2_RBASE); } +#if !defined(CONFIG_SPL) || (defined(CONFIG_SPL) && defined(CONFIG_SPL_BUILD)) #if defined(CONFIG_LDO_ENABLED_MODE) static void init_ldo_mode(void) { @@ -175,6 +176,7 @@ void s_init(void) #endif return; } +#endif #ifndef CONFIG_ULP_WATCHDOG void reset_cpu(ulong addr) |