diff options
| author | Tom Rini <trini@konsulko.com> | 2023-08-09 20:17:34 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-08-09 20:17:34 +0300 |
| commit | ec58228830a1f68e8e65099387cf12c5a91c9e72 (patch) | |
| tree | 391ed6ad5f3fddcb88c976b0d413fa3912e68c40 /arch/x86/lib/spl.c | |
| parent | f26eda936bfb49c99d3c7829d416809013b95d3f (diff) | |
| parent | 9234b77b9d42ebd77585091a072b4ab958ba83ed (diff) | |
| download | u-boot-ec58228830a1f68e8e65099387cf12c5a91c9e72.tar.xz | |
Merge tag 'x86-pull-20230809' of https://source.denx.de/u-boot/custodians/u-boot-x86
- x86: Fixes for distro booting
- x86: Move some boards to text environment
Diffstat (limited to 'arch/x86/lib/spl.c')
| -rw-r--r-- | arch/x86/lib/spl.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/lib/spl.c b/arch/x86/lib/spl.c index b6812bb8ca..f99df08fbe 100644 --- a/arch/x86/lib/spl.c +++ b/arch/x86/lib/spl.c @@ -27,6 +27,7 @@ #include <asm/mtrr.h> #include <asm/pci.h> #include <asm/processor.h> +#include <asm/qemu.h> #include <asm/spl.h> #include <asm-generic/sections.h> @@ -137,7 +138,6 @@ static int x86_spl_init(void) } #ifndef CONFIG_SYS_COREBOOT - log_debug("bss\n"); debug("BSS clear from %lx to %lx len %lx\n", (ulong)&__bss_start, (ulong)&__bss_end, (ulong)&__bss_end - (ulong)&__bss_start); memset(&__bss_start, 0, (ulong)&__bss_end - (ulong)&__bss_start); @@ -292,6 +292,8 @@ void spl_board_init(void) #ifndef CONFIG_TPL preloader_console_init(); #endif + if (IS_ENABLED(CONFIG_QEMU)) + qemu_chipset_init(); if (CONFIG_IS_ENABLED(VIDEO)) { struct udevice *dev; |