gnuboot-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH 13/20] use seabios revision from canoeboot 20231103


From: Leah Rowe
Subject: [PATCH 13/20] use seabios revision from canoeboot 20231103
Date: Sun, 14 Jan 2024 15:55:30 +0000

From: Leah Rowe <leah@libreboot.org>

this uses seabios revision:
1e1da7a963007d03a4e0e9a9e0ff17990bb1608d

this is from 21 april 2023, versus gnuboot's revision:
64f37cc530f144e53c190c9e8209a51b58fd5c43

gnuboot's current revision is from 7 september 2021.
the newer revision includes many fixes from upstream.

a "normal" config is also included, in this patch, not
yet used, but handling for it will be added in a
follow-up patch. gnuboot currently uses libreboot's old
design, where boards that don't have graphics cards would
use the vgarom config, which would actually load vgaroms
from seabios - but gnuboot doesn't use the vgarom config
either, only the libgfxinit setup. in libreboot and canoeboot,
it works like this: libgfxinit for coreboot providing native
video initialisation (and seabios can still load an option
rom on graphics cards), vgarom where seabios doesn't execute
anything and coreboot does, and normal where coreboot doesn't
initialise anything even natively, and instead seabios is
expected to run a vgarom - normal would be used on desktops
that lack onboard graphics, or laptops that lack libgfxinit,
though the latter kind of laptop would not be supported
by gnuboot.

the new seabios configs are much more flexible, as will be
seen in the next commits. finally: an absolete python-
related patch was removed from gnuboot's seabios tree.

Signed-off-by: Leah Rowe <leah@libreboot.org>
---
 resources/packages/seabios/download           |  2 +-
 resources/seabios/config/normal               | 91 +++++++++++++++++++
 resources/seabios/config/vgarom               |  3 +-
 ...-use-python3-specifically-in-scripts.patch | 35 -------
 4 files changed, 93 insertions(+), 38 deletions(-)
 create mode 100644 resources/seabios/config/normal
 delete mode 100644 
resources/seabios/patches/0001-use-python3-specifically-in-scripts.patch

diff --git a/resources/packages/seabios/download 
b/resources/packages/seabios/download
index a7c4ab5..fe8cf03 100755
--- a/resources/packages/seabios/download
+++ b/resources/packages/seabios/download
@@ -65,7 +65,7 @@ cd "seabios/"
 # Reset to the last commit that was tested (we use stable releases for seabios)
 # 
------------------------------------------------------------------------------
 
-git reset --hard 64f37cc530f144e53c190c9e8209a51b58fd5c43
+git reset --hard 1e1da7a963007d03a4e0e9a9e0ff17990bb1608d
 
 for patchfile in ../resources/seabios/patches/*.patch; do
        if [ ! -f "${patchfile}" ]; then continue; fi
diff --git a/resources/seabios/config/normal b/resources/seabios/config/normal
new file mode 100644
index 0000000..92b9c56
--- /dev/null
+++ b/resources/seabios/config/normal
@@ -0,0 +1,91 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# SeaBIOS Configuration
+#
+
+#
+# General Features
+#
+CONFIG_COREBOOT=y
+# CONFIG_QEMU is not set
+# CONFIG_CSM is not set
+# CONFIG_QEMU_HARDWARE is not set
+CONFIG_THREADS=y
+CONFIG_RELOCATE_INIT=y
+CONFIG_BOOTMENU=y
+CONFIG_BOOTSPLASH=y
+CONFIG_BOOTORDER=y
+CONFIG_HOST_BIOS_GEOMETRY=y
+CONFIG_COREBOOT_FLASH=y
+CONFIG_LZMA=y
+CONFIG_CBFS_LOCATION=0
+CONFIG_MULTIBOOT=y
+CONFIG_ENTRY_EXTRASTACK=y
+CONFIG_MALLOC_UPPERMEMORY=y
+CONFIG_ROM_SIZE=0
+
+#
+# Hardware support
+#
+CONFIG_ATA=y
+CONFIG_ATA_DMA=y
+# CONFIG_ATA_PIO32 is not set
+CONFIG_AHCI=y
+CONFIG_SDCARD=y
+CONFIG_MEGASAS=y
+CONFIG_FLOPPY=y
+CONFIG_FLASH_FLOPPY=y
+CONFIG_NVME=y
+CONFIG_PS2PORT=y
+CONFIG_USB=y
+CONFIG_USB_UHCI=y
+CONFIG_USB_OHCI=y
+CONFIG_USB_EHCI=y
+CONFIG_USB_XHCI=y
+CONFIG_USB_MSC=y
+CONFIG_USB_UAS=y
+CONFIG_USB_HUB=y
+CONFIG_USB_KEYBOARD=y
+CONFIG_USB_MOUSE=y
+CONFIG_SERIAL=y
+CONFIG_SERCON=y
+CONFIG_LPT=y
+CONFIG_RTC_TIMER=y
+CONFIG_HARDWARE_IRQ=y
+CONFIG_PMTIMER=y
+CONFIG_TSC_TIMER=y
+
+#
+# BIOS interfaces
+#
+CONFIG_DRIVES=y
+CONFIG_CDROM_BOOT=y
+CONFIG_CDROM_EMU=y
+CONFIG_PCIBIOS=y
+CONFIG_APMBIOS=y
+CONFIG_PNPBIOS=y
+CONFIG_OPTIONROMS=y
+CONFIG_PMM=y
+CONFIG_BOOT=y
+CONFIG_KEYBOARD=y
+CONFIG_KBD_CALL_INT15_4F=y
+CONFIG_MOUSE=y
+CONFIG_S3_RESUME=y
+CONFIG_VGAHOOKS=y
+# CONFIG_DISABLE_A20 is not set
+CONFIG_TCGBIOS=y
+
+#
+# VGA ROM
+#
+CONFIG_NO_VGABIOS=y
+# CONFIG_VGA_GEODEGX2 is not set
+# CONFIG_VGA_GEODELX is not set
+# CONFIG_VGA_COREBOOT is not set
+# CONFIG_BUILD_VGABIOS is not set
+CONFIG_VGA_EXTRA_STACK_SIZE=512
+
+#
+# Debugging
+#
+CONFIG_DEBUG_LEVEL=0
diff --git a/resources/seabios/config/vgarom b/resources/seabios/config/vgarom
index 92b9c56..9f543ce 100644
--- a/resources/seabios/config/vgarom
+++ b/resources/seabios/config/vgarom
@@ -64,8 +64,7 @@ CONFIG_CDROM_EMU=y
 CONFIG_PCIBIOS=y
 CONFIG_APMBIOS=y
 CONFIG_PNPBIOS=y
-CONFIG_OPTIONROMS=y
-CONFIG_PMM=y
+# CONFIG_OPTIONROMS is not set
 CONFIG_BOOT=y
 CONFIG_KEYBOARD=y
 CONFIG_KBD_CALL_INT15_4F=y
diff --git 
a/resources/seabios/patches/0001-use-python3-specifically-in-scripts.patch 
b/resources/seabios/patches/0001-use-python3-specifically-in-scripts.patch
deleted file mode 100644
index 9680835..0000000
--- a/resources/seabios/patches/0001-use-python3-specifically-in-scripts.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From a21f175947d7186e0b5554826e1ae51880a6cfb8 Mon Sep 17 00:00:00 2001
-From: Leah Rowe <leah@libreboot.org>
-Date: Sun, 13 Mar 2022 18:02:26 +0000
-Subject: [PATCH 1/1] use python3 specifically, in scripts
-
-some systems don't have a python binary anymore, only python2 and
-python3 binaries, without creating a symlink to either of them
----
- scripts/acpi_extract.py            | 2 +-
- scripts/acpi_extract_preprocess.py | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/scripts/acpi_extract.py b/scripts/acpi_extract.py
-index 3ed863b..eb910f3 100755
---- a/scripts/acpi_extract.py
-+++ b/scripts/acpi_extract.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python3
- # Copyright (C) 2011 Red Hat, Inc., Michael S. Tsirkin <mst@redhat.com>
- #
- # This file may be distributed under the terms of the GNU GPLv3 license.
-diff --git a/scripts/acpi_extract_preprocess.py 
b/scripts/acpi_extract_preprocess.py
-index 2698118..6963847 100755
---- a/scripts/acpi_extract_preprocess.py
-+++ b/scripts/acpi_extract_preprocess.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python3
- # Copyright (C) 2011 Red Hat, Inc., Michael S. Tsirkin <mst@redhat.com>
- #
- # This file may be distributed under the terms of the GNU GPLv3 license.
--- 
-2.25.1
-
-- 
2.39.2




reply via email to

[Prev in Thread] Current Thread [Next in Thread]