diff options
| author | Tom Rini <trini@konsulko.com> | 2024-07-01 13:17:56 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-07-01 15:00:56 -0600 |
| commit | 65fbdab27224ee3943a89496b21862db83c34da2 (patch) | |
| tree | 775a0a54066c2e9a6bbba201676e3d896b5cb0e2 /common/spl/spl.c | |
| parent | 3f772959501c99fbe5aa0b22a36efe3478d1ae1c (diff) | |
| parent | b4cbd1a257d4027038b4f997d73bdb0a066db045 (diff) | |
Merge branch 'next'
Diffstat (limited to 'common/spl/spl.c')
| -rw-r--r-- | common/spl/spl.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/common/spl/spl.c b/common/spl/spl.c index e06bc75d36b..7794ddccade 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -6,7 +6,7 @@ * Aneesh V <aneesh@ti.com> */ -#include <common.h> +#include <config.h> #include <bloblist.h> #include <binman_sym.h> #include <bootstage.h> @@ -23,7 +23,6 @@ #include <system-constants.h> #include <asm/global_data.h> #include <asm-generic/gpio.h> -#include <asm/u-boot.h> #include <nand.h> #include <fat.h> #include <u-boot/crc.h> @@ -711,6 +710,9 @@ void board_init_r(gd_t *dummy1, ulong dummy2) } } + if (CONFIG_IS_ENABLED(SOC_INIT)) + spl_soc_init(); + if (CONFIG_IS_ENABLED(BOARD_INIT)) spl_board_init(); |