mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2025-08-15 11:46:59 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

x86: Show an error if video fails

Browse Source 
If video is enabled we expect it to work. Avoid silent failure by adding
a panic if things go wrong.

Expand the SPL malloc-area for qemu-x86_64 to avoid a panic.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2025-01-10 17:00:20 -07:00 committed by Tom Rini
parent 97425461e7
commit 44e39ff6ac
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/x86/lib/spl.c
View File

@ -300,9 +300,14 @@ void spl_board_init(void)
if (CONFIG_IS_ENABLED(VIDEO)) { if (CONFIG_IS_ENABLED(VIDEO)) {
struct udevice *dev; struct udevice *dev;
int ret;
/* Set up PCI video in SPL if required */ /* Set up PCI video in SPL if required */
uclass_first_device_err(UCLASS_PCI, &dev); ret = uclass_first_device_err(UCLASS_PCI, &dev);
uclass_first_device_err(UCLASS_VIDEO, &dev); if (ret)
panic("Failed to set up PCI");
ret = uclass_first_device_err(UCLASS_VIDEO, &dev);
if (ret)
panic("Failed to set up video");
} }
} }

2
configs/qemu-x86_64_defconfig
View File

@ -6,7 +6,7 @@ CONFIG_ENV_SIZE=0x40000
CONFIG_MAX_CPUS=2 CONFIG_MAX_CPUS=2
CONFIG_SPL_DM_SPI=y CONFIG_SPL_DM_SPI=y
CONFIG_DEFAULT_DEVICE_TREE="qemu-x86_i440fx" CONFIG_DEFAULT_DEVICE_TREE="qemu-x86_i440fx"
CONFIG_SPL_SYS_MALLOC_F_LEN=0x2000 CONFIG_SPL_SYS_MALLOC_F_LEN=0x3000
CONFIG_SPL_TEXT_BASE=0xfffd0000 CONFIG_SPL_TEXT_BASE=0xfffd0000
CONFIG_DEBUG_UART_BASE=0x3f8 CONFIG_DEBUG_UART_BASE=0x3f8
CONFIG_DEBUG_UART_CLOCK=1843200 CONFIG_DEBUG_UART_CLOCK=1843200