diff options
| author | Tom Rini <trini@konsulko.com> | 2023-09-22 11:16:22 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-09-22 11:16:22 -0400 |
| commit | b05a184379631d13c4a49e423aa1324dc1ae6158 (patch) | |
| tree | d9937c7de598c7edc5741ebc67c98dce47ea42d5 /arch/x86/lib/spl.c | |
| parent | 5d2fae79c7d60eaf7f50322e4ec125d2f58544e9 (diff) | |
| parent | 5728246dfa11400d4f7aa8262ea630d8c09a85b9 (diff) | |
| download | u-boot-WIP/22Sep2023-next.tar.gz | |
Merge tag 'x86-pull-20230922' of https://source.denx.de/u-boot/custodians/u-boot-x86 into nextWIP/22Sep2023-next
- Add bootstd support to 64-bit efi payload
- Fix a bug of missing setting size of initrd in pxeboot
- Allow Python packages to be dropped
- Reland "x86: Move FACP table into separate functions"
- Fixes for chromebook_link64 and chromebook_samus_tpl
- Fixes and improvements for coreboot
- x86 documentation updates
Diffstat (limited to 'arch/x86/lib/spl.c')
| -rw-r--r-- | arch/x86/lib/spl.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/x86/lib/spl.c b/arch/x86/lib/spl.c index 58fa572b71a..c15f11f8cdf 100644 --- a/arch/x86/lib/spl.c +++ b/arch/x86/lib/spl.c @@ -230,6 +230,9 @@ void board_init_f_r(void) mtrr_commit(false); init_cache(); gd->flags &= ~GD_FLG_SERIAL_READY; + + /* make sure driver model is not accessed from now on */ + gd->flags |= GD_FLG_DM_DEAD; debug("cache status %d\n", dcache_status()); board_init_r(gd, 0); } @@ -258,7 +261,7 @@ static int spl_board_load_image(struct spl_image_info *spl_image, spl_image->os = IH_OS_U_BOOT; spl_image->name = "U-Boot"; - if (!IS_ENABLED(CONFIG_SYS_COREBOOT)) { + if (spl_image->load_addr != spl_get_image_pos()) { /* Copy U-Boot from ROM */ memcpy((void *)spl_image->load_addr, (void *)spl_get_image_pos(), spl_get_image_size()); |