SeaBIOS October 2019

seabios@seabios.org

17 participants
20 discussions

Cannot load Windows installers (or anything besides Linux live USBs, for that matter)
by Rafael Send 23 Oct '19

23 Oct '19

Hi, I've built SeaBIOS 1.12.1 with coreboot for the Thinkpad X210 (51nb aftermarket board). Generally I can get into SeaBIOS itself just fine, but I haven't had any luck loading much of anything besides Linux Live. Tianocore & other payloads work just fine as far as I can tell. I've prepared various Windows install USBs (using Media Creation Tool, Rufus, Windows 7 Creator etc) making sure that they actually boot on non-coreboot machines. I tested them with an old Core2Duo as well as the current machine in question set to Legacy mode, and they load fine. I've read SeaBIOS is supposed to be fairly compatible these days, so I'm surprised I can't load these things. How could I debug this / is there anything I should be checking for? SeaBIOS / coreboot is built with vgabios.bin extracted from my board, not gfxinit. Although using gfxinit doesn't make any difference though, it behaves the same... Thanks, Rafael

2 2

Add SeaBIOS license to handful of c files
by Kevin O'Connor 22 Oct '19

22 Oct '19

Hi Gerd and Michael, After a quick review it seems a few .c files in the SeaBIOS repo are missing the typical LGPLv3 license statement. egrep LGPLv3 -R --include='*.c' -L vgasrc/ src/ If we ignore build files and files from external projects it finds: vgasrc/ramfb.c vgasrc/bochsdisplay.c src/cp437.c src/fw/romfile_loader.c Gerd, the first three look like yours - could you add a copyright notice to them? Michael, are you okay with me adding your copyright to the top of src/fw/romfile_loader.c? Something like: // Support for loading QEMU provided tables into memory // // Copyright (C) 2013 Michael S. Tsirkin <mst(a)redhat.com> // // This file may be distributed under the terms of the GNU LGPLv3 license. Thanks, -Kevin

1 0

[PATCH v8 0/8] Add Qemu to SeaBIOS LCHS interface
by Sam Eiderman 22 Oct '19

22 Oct '19

v1: Non-standard logical geometries break under QEMU. A virtual disk which contains an operating system which depends on logical geometries (consistent values being reported from BIOS INT13 AH=08) will most likely break under QEMU/SeaBIOS if it has non-standard logical geometries - for example 56 SPT (sectors per track). No matter what QEMU will guess - SeaBIOS, for large enough disks - will use LBA translation, which will report 63 SPT instead. In addition we can not enforce SeaBIOS to rely on phyiscal geometries at all. A virtio-blk-pci virtual disk with 255 phyiscal heads can not report more than 16 physical heads when moved to an IDE controller, the ATA spec allows a maximum of 16 heads - this is an artifact of virtualization. By supplying the logical geometies directly we are able to support such "exotic" disks. We will use fw_cfg to do just that. v2: Fix missing parenthesis check in "hd-geo-test: Add tests for lchs override" v3: * Rename fw_cfg key to "bios-geometry". * Remove "extendible" interface. * Add cpu_to_le32 fix as Laszlo suggested or big endian hosts * Fix last qtest commit - automatic docker tester for some reason does not have qemu-img set v4: * Change fw_cfg interface from mixed textual/binary to textual only v5: * Fix line > 80 chars in tests/hd-geo-test.c v6: * Small fixes for issues pointed by Max * (&conf->conf)->lcyls to conf->conf.lcyls and so on * Remove scsi_unrealize from everything other than scsi-hd * Add proper include to sysemu.h * scsi_device_unrealize() after scsi_device_purge_requests() v7: * Adapted last commit (tests) to changes in qtest v8: * Fixed BE issue with tests by using qfw_cfg_get_file() instead of read_fw_cfg_file(), thanks Laszlo. * Removed incorrect comment in 7/8. Sam Eiderman (8): block: Refactor macros - fix tabbing block: Support providing LCHS from user bootdevice: Add interface to gather LCHS scsi: Propagate unrealize() callback to scsi-hd bootdevice: Gather LCHS from all relevant devices bootdevice: Refactor get_boot_devices_list bootdevice: FW_CFG interface for LCHS values hd-geo-test: Add tests for lchs override bootdevice.c | 147 +++++++++-- hw/block/virtio-blk.c | 6 + hw/ide/qdev.c | 7 +- hw/nvram/fw_cfg.c | 14 +- hw/scsi/scsi-bus.c | 16 ++ hw/scsi/scsi-disk.c | 12 + include/hw/block/block.h | 22 +- include/hw/scsi/scsi.h | 1 + include/sysemu/sysemu.h | 4 + tests/Makefile.include | 2 +- tests/hd-geo-test.c | 551 +++++++++++++++++++++++++++++++++++++++ 11 files changed, 741 insertions(+), 41 deletions(-) -- 2.23.0.700.g56cf767bdb-goog

3 16

[PATCH] fw/coreboot: Pass the cb_table as argument when calling payloads
by Arthur Heymans 21 Oct '19

21 Oct '19

When coreboot calls payloads it passes a pointer to the coreboot tables as an argument. SeaBIOS does not make use of this functionality and instead tries to find the coreboot tables via a pointer placed in lower memory. To improve compatibility when calling payloads from SeaBIOS call payloads with the coreboot table as an argument. This fixes Tianocore with UefiPayloadPkg not booting when loaded from SeaBIOS. Signed-off-by: Arthur Heymans <arthur(a)aheymans.xyz> diff --git a/src/fw/coreboot.c b/src/fw/coreboot.c index 7c0954b..25317ca 100644 --- a/src/fw/coreboot.c +++ b/src/fw/coreboot.c @@ -518,9 +518,10 @@ cbfs_run_payload(struct cbfs_file *fhdr) memset(dest, 0, dest_len); break; case PAYLOAD_SEGMENT_ENTRY: { - dprintf(1, "Calling addr %p\n", dest); - void (*func)(void) = dest; - func(); + void *arg = find_cb_table(); + dprintf(1, "Calling addr %p(%p)\n", dest, arg); + void (*func)(void *) = dest; + func(arg); return; } default: -- 2.23.0

2 2

[PATCH v2 1/2] cbvga: reuse svga modes definitions from svgamodes.c
by Uwe Kleine-König 21 Oct '19

21 Oct '19

For cbvga only modes with MM_DIRECT are usable, so skip the other ones. This effectively adds the following modes: { 0x10D, { MM_DIRECT, 320, 200, 15, 8, 16, SEG_GRAPH } }, { 0x10E, { MM_DIRECT, 320, 200, 16, 8, 16, SEG_GRAPH } }, { 0x10F, { MM_DIRECT, 320, 200, 24, 8, 16, SEG_GRAPH } }, { 0x140, { MM_DIRECT, 320, 200, 32, 8, 16, SEG_GRAPH } }, Signed-off-by: Uwe Kleine-König <uwe(a)kleine-koenig.org> --- vgasrc/cbvga.c | 80 ++++++-------------------------------------------- 1 file changed, 9 insertions(+), 71 deletions(-) diff --git a/vgasrc/cbvga.c b/vgasrc/cbvga.c index 438d8fda6c6e..b919137bb183 100644 --- a/vgasrc/cbvga.c +++ b/vgasrc/cbvga.c @@ -13,76 +13,13 @@ #include "vgabios.h" // SET_VGA #include "vgafb.h" // handle_gfx_op #include "vgautil.h" // VBE_total_memory +#include "svgamodes.h" // svga_modes static int CBmode VAR16; static struct vgamode_s CBmodeinfo VAR16; static struct vgamode_s CBemulinfo VAR16; static u32 CBlinelength VAR16; -static struct cbvga_mode_s -{ - u16 mode; - struct vgamode_s info; -} cbvesa_modes[] VAR16 = { - /* VESA 1.0 modes */ - { 0x110, { MM_DIRECT, 640, 480, 15, 8, 16, SEG_GRAPH } }, - { 0x111, { MM_DIRECT, 640, 480, 16, 8, 16, SEG_GRAPH } }, - { 0x112, { MM_DIRECT, 640, 480, 24, 8, 16, SEG_GRAPH } }, - { 0x113, { MM_DIRECT, 800, 600, 15, 8, 16, SEG_GRAPH } }, - { 0x114, { MM_DIRECT, 800, 600, 16, 8, 16, SEG_GRAPH } }, - { 0x115, { MM_DIRECT, 800, 600, 24, 8, 16, SEG_GRAPH } }, - { 0x116, { MM_DIRECT, 1024, 768, 15, 8, 16, SEG_GRAPH } }, - { 0x117, { MM_DIRECT, 1024, 768, 16, 8, 16, SEG_GRAPH } }, - { 0x118, { MM_DIRECT, 1024, 768, 24, 8, 16, SEG_GRAPH } }, - { 0x119, { MM_DIRECT, 1280, 1024, 15, 8, 16, SEG_GRAPH } }, - { 0x11A, { MM_DIRECT, 1280, 1024, 16, 8, 16, SEG_GRAPH } }, - { 0x11B, { MM_DIRECT, 1280, 1024, 24, 8, 16, SEG_GRAPH } }, - { 0x11D, { MM_DIRECT, 1600, 1200, 15, 8, 16, SEG_GRAPH } }, - { 0x11E, { MM_DIRECT, 1600, 1200, 16, 8, 16, SEG_GRAPH } }, - { 0x11F, { MM_DIRECT, 1600, 1200, 24, 8, 16, SEG_GRAPH } }, - /* VESA 2.0 modes */ - { 0x141, { MM_DIRECT, 640, 400, 32, 8, 16, SEG_GRAPH } }, - { 0x142, { MM_DIRECT, 640, 480, 32, 8, 16, SEG_GRAPH } }, - { 0x143, { MM_DIRECT, 800, 600, 32, 8, 16, SEG_GRAPH } }, - { 0x144, { MM_DIRECT, 1024, 768, 32, 8, 16, SEG_GRAPH } }, - { 0x145, { MM_DIRECT, 1280, 1024, 32, 8, 16, SEG_GRAPH } }, - { 0x147, { MM_DIRECT, 1600, 1200, 32, 8, 16, SEG_GRAPH } }, - { 0x149, { MM_DIRECT, 1152, 864, 15, 8, 16, SEG_GRAPH } }, - { 0x14a, { MM_DIRECT, 1152, 864, 16, 8, 16, SEG_GRAPH } }, - { 0x14b, { MM_DIRECT, 1152, 864, 24, 8, 16, SEG_GRAPH } }, - { 0x14c, { MM_DIRECT, 1152, 864, 32, 8, 16, SEG_GRAPH } }, - { 0x175, { MM_DIRECT, 1280, 768, 16, 8, 16, SEG_GRAPH } }, - { 0x176, { MM_DIRECT, 1280, 768, 24, 8, 16, SEG_GRAPH } }, - { 0x177, { MM_DIRECT, 1280, 768, 32, 8, 16, SEG_GRAPH } }, - { 0x178, { MM_DIRECT, 1280, 800, 16, 8, 16, SEG_GRAPH } }, - { 0x179, { MM_DIRECT, 1280, 800, 24, 8, 16, SEG_GRAPH } }, - { 0x17a, { MM_DIRECT, 1280, 800, 32, 8, 16, SEG_GRAPH } }, - { 0x17b, { MM_DIRECT, 1280, 960, 16, 8, 16, SEG_GRAPH } }, - { 0x17c, { MM_DIRECT, 1280, 960, 24, 8, 16, SEG_GRAPH } }, - { 0x17d, { MM_DIRECT, 1280, 960, 32, 8, 16, SEG_GRAPH } }, - { 0x17e, { MM_DIRECT, 1440, 900, 16, 8, 16, SEG_GRAPH } }, - { 0x17f, { MM_DIRECT, 1440, 900, 24, 8, 16, SEG_GRAPH } }, - { 0x180, { MM_DIRECT, 1440, 900, 32, 8, 16, SEG_GRAPH } }, - { 0x181, { MM_DIRECT, 1400, 1050, 16, 8, 16, SEG_GRAPH } }, - { 0x182, { MM_DIRECT, 1400, 1050, 24, 8, 16, SEG_GRAPH } }, - { 0x183, { MM_DIRECT, 1400, 1050, 32, 8, 16, SEG_GRAPH } }, - { 0x184, { MM_DIRECT, 1680, 1050, 16, 8, 16, SEG_GRAPH } }, - { 0x185, { MM_DIRECT, 1680, 1050, 24, 8, 16, SEG_GRAPH } }, - { 0x186, { MM_DIRECT, 1680, 1050, 32, 8, 16, SEG_GRAPH } }, - { 0x187, { MM_DIRECT, 1920, 1200, 16, 8, 16, SEG_GRAPH } }, - { 0x188, { MM_DIRECT, 1920, 1200, 24, 8, 16, SEG_GRAPH } }, - { 0x189, { MM_DIRECT, 1920, 1200, 32, 8, 16, SEG_GRAPH } }, - { 0x18a, { MM_DIRECT, 2560, 1600, 16, 8, 16, SEG_GRAPH } }, - { 0x18b, { MM_DIRECT, 2560, 1600, 24, 8, 16, SEG_GRAPH } }, - { 0x18c, { MM_DIRECT, 2560, 1600, 32, 8, 16, SEG_GRAPH } }, - { 0x18d, { MM_DIRECT, 1280, 720, 16, 8, 16, SEG_GRAPH } }, - { 0x18e, { MM_DIRECT, 1280, 720, 24, 8, 16, SEG_GRAPH } }, - { 0x18f, { MM_DIRECT, 1280, 720, 32, 8, 16, SEG_GRAPH } }, - { 0x190, { MM_DIRECT, 1920, 1080, 16, 8, 16, SEG_GRAPH } }, - { 0x191, { MM_DIRECT, 1920, 1080, 24, 8, 16, SEG_GRAPH } }, - { 0x192, { MM_DIRECT, 1920, 1080, 32, 8, 16, SEG_GRAPH } }, -}; - struct vgamode_s *cbvga_find_mode(int mode) { if (mode == GET_GLOBAL(CBmode)) @@ -91,8 +28,8 @@ struct vgamode_s *cbvga_find_mode(int mode) return &CBemulinfo; int i; - for (i = 0; i < ARRAY_SIZE(cbvesa_modes); i++) { - struct cbvga_mode_s *cbmode_g = &cbvesa_modes[i]; + for (i = 0; i < GET_GLOBAL(svga_mcount); i++) { + struct generic_svga_mode *cbmode_g = &svga_modes[i]; if (GET_GLOBAL(cbmode_g->mode) == 0xffff) continue; if (GET_GLOBAL(cbmode_g->mode) == mode) @@ -114,8 +51,8 @@ cbvga_list_modes(u16 seg, u16 *dest, u16 *last) * + 24 Bpp and 32 Bpp are supported */ int i; - for (i = 0; i < ARRAY_SIZE(cbvesa_modes) && dest < last; i++) { - struct cbvga_mode_s *cbmode_g = &cbvesa_modes[i]; + for (i = 0; i < GET_GLOBAL(svga_mcount) && dest < last; i++) { + struct generic_svga_mode *cbmode_g = &svga_modes[i]; u16 mode = GET_GLOBAL(cbmode_g->mode); if (mode == 0xffff) continue; @@ -265,10 +202,11 @@ cbvga_setup_modes(u64 addr, u8 bpp, u32 xlines, u32 ylines, u32 linelength) , get_global_seg(), &CBmodeinfo, sizeof(CBemulinfo)); // Validate modes - for (i = 0; i < ARRAY_SIZE(cbvesa_modes); i++) { - struct cbvga_mode_s *cbmode_g = &cbvesa_modes[i]; + for (i = 0; i < GET_GLOBAL(svga_mcount); i++) { + struct generic_svga_mode *cbmode_g = &svga_modes[i]; /* Skip VBE modes that doesn't fit into coreboot's framebuffer */ - if ((GET_GLOBAL(cbmode_g->info.height) > ylines) + if ((GET_GLOBAL(cbmode_g->info.memmodel) != MM_DIRECT) + || (GET_GLOBAL(cbmode_g->info.height) > ylines) || (GET_GLOBAL(cbmode_g->info.width) > xlines) || (GET_GLOBAL(cbmode_g->info.depth) != bpp)) { dprintf(3, "Removing mode %x\n", GET_GLOBAL(cbmode_g->mode)); -- 2.23.0

3 6

[PATCH v3 0/2] Add additional resolutions for 16:9 displays: 1600x900 and 2560x1440
by Uwe Kleine-König 17 Oct '19

17 Oct '19

Hello, this is my attempt to address the review comments I got for v2: - Gerd pointed out that cbvesa should only use the modes where memmodel == MM_DIRECT. - Kevin noted that reading global variables need the GET_GLOBAL wrapper. (I would have expected that the compiler does the right thing here. Probably I'm still to wet behind the ears here :-) Note this is only compile tested. Uwe Kleine-König (2): cbvga: reuse svga modes definitions from svgamodes.c Add additional resolutions for 16:9 displays: 1600x900 and 2560x1440 vgasrc/cbvga.c | 80 ++++++---------------------------------------- vgasrc/svgamodes.c | 8 +++++ 2 files changed, 17 insertions(+), 71 deletions(-) -- 2.20.1

4 10

[PATCH v1] virtio: extend virtio queue size to 256
by Denis Plotnikov 17 Oct '19

17 Oct '19

v1: * more verbose commit message [Gerd] --- The goal of the patch is to work around a performance bug in guest linux kernels. Old linux kernels has a performance flaw in virtio block device access: on some frequent disk access patterns, e.g. 1M read, the kernel produces more block requests than needed. This happens because of virtio seg_max parameter set to 126 (virtqueue_size - 2) which limits the maximum block request to 516096 (126 * 4096_PAGE_SIZE) bytes. Setting seg_max > 126 fixes the issue, however, not all linux kernels allow that without increasing virtio virtqueue size. The old kernels have a restriction: virtqueue_size >= seg_max. In case of the restriction violation the old kernels crash. The restriction is relaxed in the recent linux kernels (ver >= 4.13) with: commit 44ed8089e991a60d614abe0ee4b9057a28b364e4 Author: Richard W.M. Jones Date: Thu Aug 10 17:56:51 2017 +0100 scsi: virtio: Reduce BUG if total_sg > virtqueue size to WARN. and the recent linux kernels don't crash if total_sg > virtqueue size allowing to set seg_max to the needed value without virtqueue size increasing. To fix the performance flaw in the old linux kernels, it's needed to increse seg_max to 254, and comply the restriction by setting virtqueue_size to 256. This is achievable if seabios can support virtqueue size > 128 which this patch actually does. Windows kernels don't have virtqueue_size >= seg_max restriction and isn't affected with this kind of the performance bug. Signed-off-by: Denis Plotnikov <dplotnikov(a)virtuozzo.com> --- src/hw/virtio-ring.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hw/virtio-ring.h b/src/hw/virtio-ring.h index 8604a01..dccc50d 100644 --- a/src/hw/virtio-ring.h +++ b/src/hw/virtio-ring.h @@ -20,7 +20,7 @@ #define VIRTIO_F_VERSION_1 32 #define VIRTIO_F_IOMMU_PLATFORM 33 -#define MAX_QUEUE_NUM (128) +#define MAX_QUEUE_NUM (256) #define VRING_DESC_F_NEXT 1 #define VRING_DESC_F_WRITE 2 -- 2.17.0

1 0

[PATCH v7 0/8] Add Qemu to SeaBIOS LCHS interface
by Sam Eiderman 16 Oct '19

16 Oct '19

v1: Non-standard logical geometries break under QEMU. A virtual disk which contains an operating system which depends on logical geometries (consistent values being reported from BIOS INT13 AH=08) will most likely break under QEMU/SeaBIOS if it has non-standard logical geometries - for example 56 SPT (sectors per track). No matter what QEMU will guess - SeaBIOS, for large enough disks - will use LBA translation, which will report 63 SPT instead. In addition we can not enforce SeaBIOS to rely on phyiscal geometries at all. A virtio-blk-pci virtual disk with 255 phyiscal heads can not report more than 16 physical heads when moved to an IDE controller, the ATA spec allows a maximum of 16 heads - this is an artifact of virtualization. By supplying the logical geometies directly we are able to support such "exotic" disks. We will use fw_cfg to do just that. v2: Fix missing parenthesis check in "hd-geo-test: Add tests for lchs override" v3: * Rename fw_cfg key to "bios-geometry". * Remove "extendible" interface. * Add cpu_to_le32 fix as Laszlo suggested or big endian hosts * Fix last qtest commit - automatic docker tester for some reason does not have qemu-img set v4: * Change fw_cfg interface from mixed textual/binary to textual only v5: * Fix line > 80 chars in tests/hd-geo-test.c v6: * Small fixes for issues pointed by Max * (&conf->conf)->lcyls to conf->conf.lcyls and so on * Remove scsi_unrealize from everything other than scsi-hd * Add proper include to sysemu.h * scsi_device_unrealize() after scsi_device_purge_requests() v7: * Adapted last commit (tests) to changes in qtest Sam Eiderman (8): block: Refactor macros - fix tabbing block: Support providing LCHS from user bootdevice: Add interface to gather LCHS scsi: Propagate unrealize() callback to scsi-hd bootdevice: Gather LCHS from all relevant devices bootdevice: Refactor get_boot_devices_list bootdevice: FW_CFG interface for LCHS values hd-geo-test: Add tests for lchs override bootdevice.c | 148 ++++++++-- hw/block/virtio-blk.c | 6 + hw/ide/qdev.c | 7 +- hw/nvram/fw_cfg.c | 14 +- hw/scsi/scsi-bus.c | 16 ++ hw/scsi/scsi-disk.c | 12 + include/hw/block/block.h | 22 +- include/hw/scsi/scsi.h | 1 + include/sysemu/sysemu.h | 4 + tests/Makefile.include | 2 +- tests/hd-geo-test.c | 589 +++++++++++++++++++++++++++++++++++++++ 11 files changed, 780 insertions(+), 41 deletions(-) -- 2.23.0.351.gc4317032e6-goog

4 28

[PATCH] virtio: extend virtio queue size to 256
by Denis Plotnikov 16 Oct '19

16 Oct '19

Some linux kernels has a performance flaw in virtio block device access. On some frequent disk access patterns, e.g. 1M read, the kernel produces more block requests than needed. This happens because of virtio seg_max parameter set to 126 (virtqueue_size - 2) which limits the maximum block request to 516096 (126 * 4096_PAGE_SIZE). Setting seg_max > 126 fixes the issue, however, not all linux kernels allow that. The old ones have a restriction virtqueue_size >= seg_max. This restriction is hardcoded and the kernel crashes in case of violation. The restriction is relaxed in the recent kernels. Windows kernels don't have such a restriction. To increse seg_max and not to break the restriction, one can increase the virtqueue size to 256 and seg_max to 254. To do that, seabios support of 256 virtqueue size is needed. Signed-off-by: Denis Plotnikov <dplotnikov(a)virtuozzo.com> --- src/hw/virtio-ring.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hw/virtio-ring.h b/src/hw/virtio-ring.h index 8604a01..dccc50d 100644 --- a/src/hw/virtio-ring.h +++ b/src/hw/virtio-ring.h @@ -20,7 +20,7 @@ #define VIRTIO_F_VERSION_1 32 #define VIRTIO_F_IOMMU_PLATFORM 33 -#define MAX_QUEUE_NUM (128) +#define MAX_QUEUE_NUM (256) #define VRING_DESC_F_NEXT 1 #define VRING_DESC_F_WRITE 2 -- 2.17.0

3 4

[PATCH] Reduce video modeswitching when using a boot splash image
by Matt DeVillier 04 Oct '19

04 Oct '19

From 015d42aefa7cdebee79f12f9eca113e234574c89 Mon Sep 17 00:00:00 2001 From: Matt DeVillier <matt.devillier(a)puri.sm> Date: Tue, 24 Sep 2019 12:29:55 -0500 Subject: [PATCH] Reduce video modeswitching when using a boot splash image In the normal boot flow, the VGA console is enabled immediately after running the VGA option ROM. Later, after device hardware setup, if a bootsplash is used, the video modeis changed from VGA text to a graphics mode, then back to VGA text mode to show the boot menu. In the normal case where the boot menu is not invoked, this can produce a bit of flickering as the display mode changes 3x in a short period of time. To mitigate this, display the bootsplash earlier in the boot process if used, and switch to VGA text mode only as needed to show the boot menu. Show the Boot Menu Message only if a boot splash is not currently being shown. Signed-off-by: Matt DeVillier <matt.devillier(a)puri.sm> --- src/boot.c | 10 ++++++---- src/bootsplash.c | 2 +- src/post.c | 2 +- src/util.h | 1 + 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/boot.c b/src/boot.c index 9f82f3c..f4c0f42 100644 --- a/src/boot.c +++ b/src/boot.c @@ -479,11 +479,13 @@ interactive_bootmenu(void) char *bootmsg = romfile_loadfile("etc/boot-menu-message", NULL); int menukey = romfile_loadint("etc/boot-menu-key", 1); - printf("%s", bootmsg ?: "\nPress ESC for boot menu.\n\n"); - free(bootmsg); - u32 menutime = romfile_loadint("etc/boot-menu-wait", DEFAULT_BOOTMENU_WAIT); - enable_bootsplash(); + + if (!BootsplashActive) { + enable_vga_console(); + printf("%s", bootmsg ?: "\nPress ESC for boot menu.\n\n"); + free(bootmsg); + } int scan_code = get_keystroke(menutime); disable_bootsplash(); if (scan_code != menukey) diff --git a/src/bootsplash.c b/src/bootsplash.c index 538b316..6fa91dd 100644 --- a/src/bootsplash.c +++ b/src/bootsplash.c @@ -92,7 +92,7 @@ find_videomode(struct vbe_info *vesa_info, struct vbe_mode_info *mode_info } } -static int BootsplashActive; +int BootsplashActive = 0; void enable_bootsplash(void) diff --git a/src/post.c b/src/post.c index f93106a..ad45b07 100644 --- a/src/post.c +++ b/src/post.c @@ -209,7 +209,7 @@ maininit(void) // Run vga option rom vgarom_setup(); sercon_setup(); - enable_vga_console(); + enable_bootsplash(); // Do hardware initialization (if running synchronously) if (!threads_during_optionroms()) { diff --git a/src/util.h b/src/util.h index 9c06850..997789d 100644 --- a/src/util.h +++ b/src/util.h @@ -42,6 +42,7 @@ int get_keystroke(int msec); void enable_vga_console(void); void enable_bootsplash(void); void disable_bootsplash(void); +extern int BootsplashActive; // cdrom.c extern struct eltorito_s CDEmu; -- 2.20.1

2 2

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

SeaBIOS October 2019