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 /common/spl/spl.c | |
| parent | 5d2fae79c7d60eaf7f50322e4ec125d2f58544e9 (diff) | |
| parent | 5728246dfa11400d4f7aa8262ea630d8c09a85b9 (diff) | |
Merge tag 'x86-pull-20230922' of https://source.denx.de/u-boot/custodians/u-boot-x86 into 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 'common/spl/spl.c')
| -rw-r--r-- | common/spl/spl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/spl/spl.c b/common/spl/spl.c index 0062f3f45d9..045a5e89625 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -800,7 +800,7 @@ void board_init_r(gd_t *dummy1, ulong dummy2) IS_ENABLED(CONFIG_SPL_ATF)) dram_init_banksize(); - if (CONFIG_IS_ENABLED(PCI)) { + if (CONFIG_IS_ENABLED(PCI) && !(gd->flags & GD_FLG_DM_DEAD)) { ret = pci_init(); if (ret) puts(SPL_TPL_PROMPT "Cannot initialize PCI\n"); |