diff options
| author | Tom Rini <trini@konsulko.com> | 2020-04-30 13:00:20 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-04-30 13:00:20 -0400 |
| commit | 9f0a6df3a57469061582c6b27fc869829681beca (patch) | |
| tree | 80b1a3707a5a4f6fd1d9db03ce24e12e0d47b781 /arch/x86/lib/fsp2/fsp_init.c | |
| parent | 6d7dacf726ca043a3f5487549bbfa506c990c813 (diff) | |
| parent | 249154672d43db6c7978fd9b67d224e9dec09867 (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-x86
- DM ACPI support (Part A)
- Improve support for chain-loading x86 U-Boot
Diffstat (limited to 'arch/x86/lib/fsp2/fsp_init.c')
| -rw-r--r-- | arch/x86/lib/fsp2/fsp_init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/lib/fsp2/fsp_init.c b/arch/x86/lib/fsp2/fsp_init.c index da9bd6b45cf..c7dc2ea2578 100644 --- a/arch/x86/lib/fsp2/fsp_init.c +++ b/arch/x86/lib/fsp2/fsp_init.c @@ -23,7 +23,7 @@ int arch_cpu_init_dm(void) int ret; /* Make sure pads are set up early in U-Boot */ - if (spl_phase() != PHASE_BOARD_F) + if (!ll_boot_init() || spl_phase() != PHASE_BOARD_F) return 0; /* Probe all pinctrl devices to set up the pads */ |