diff options
Diffstat (limited to 'config/seabios')
5 files changed, 12 insertions, 75 deletions
diff --git a/config/seabios/default/patches/0001-romfile-implement-a-generic-loader.patch b/config/seabios/default/patches/0001-romfile-implement-a-generic-loader.patch index dc1464bb..c7925ecb 100644 --- a/config/seabios/default/patches/0001-romfile-implement-a-generic-loader.patch +++ b/config/seabios/default/patches/0001-romfile-implement-a-generic-loader.patch @@ -1,7 +1,7 @@ -From 04e972e14191f3a480e569e972c195ba8eb53a30 Mon Sep 17 00:00:00 2001 +From cb35009da3b9335845a6e8a2f0ba2a031bf52183 Mon Sep 17 00:00:00 2001 From: Riku Viitanen <riku.viitanen@protonmail.com> Date: Sat, 10 Feb 2024 21:23:33 +0200 -Subject: [PATCH 1/4] romfile: implement a generic loader +Subject: [PATCH 1/3] romfile: implement a generic loader romfile_loadfile_g: Based on romfile_loadfile but more flexible. User has to supply pointer @@ -82,5 +82,5 @@ index ae2f4ac7..f62b2fee 100644 u64 romfile_loadint(const char *name, u64 defval); u32 romfile_loadbool(const char *name, u32 defval); -- -2.39.5 +2.47.3 diff --git a/config/seabios/default/patches/0002-vgahooks-optionroms-implement-mxm-3.0-interrupts.patch b/config/seabios/default/patches/0002-vgahooks-optionroms-implement-mxm-3.0-interrupts.patch index 5224d768..c1400f64 100644 --- a/config/seabios/default/patches/0002-vgahooks-optionroms-implement-mxm-3.0-interrupts.patch +++ b/config/seabios/default/patches/0002-vgahooks-optionroms-implement-mxm-3.0-interrupts.patch @@ -1,7 +1,7 @@ -From 270ac30b862c58c69455dbdace716044d29b20e2 Mon Sep 17 00:00:00 2001 +From 7c1400e3cd2b5e6ece0bf141a0ddca9f4f9df16e Mon Sep 17 00:00:00 2001 From: Riku Viitanen <riku.viitanen@protonmail.com> Date: Sat, 10 Feb 2024 21:38:17 +0200 -Subject: [PATCH 2/4] vgahooks, optionroms: implement mxm 3.0 interrupts +Subject: [PATCH 2/3] vgahooks, optionroms: implement mxm 3.0 interrupts VGAROMs on MXM graphics cards need certain int15h functions present. @@ -184,5 +184,5 @@ index 00000000..f0c203af + +#endif // vgahooks.h -- -2.39.5 +2.47.3 diff --git a/config/seabios/default/patches/0003-Print-the-Libreboot-version-in-the-SeaBIOS-menu.patch b/config/seabios/default/patches/0003-Print-the-Libreboot-version-in-the-SeaBIOS-menu.patch index acde7f20..b5a20a09 100644 --- a/config/seabios/default/patches/0003-Print-the-Libreboot-version-in-the-SeaBIOS-menu.patch +++ b/config/seabios/default/patches/0003-Print-the-Libreboot-version-in-the-SeaBIOS-menu.patch @@ -1,7 +1,7 @@ -From cc6b13ddea9086586d34621d0b82d820af5ae785 Mon Sep 17 00:00:00 2001 +From cd0b2ad4c0d68c00f7e430d098e540a1af629f97 Mon Sep 17 00:00:00 2001 From: Leah Rowe <leah@libreboot.org> Date: Mon, 6 Jan 2025 18:49:58 +0000 -Subject: [PATCH 3/4] Print the Libreboot version in the SeaBIOS menu +Subject: [PATCH 3/3] Print the Libreboot version in the SeaBIOS menu Signed-off-by: Leah Rowe <leah@libreboot.org> --- @@ -9,7 +9,7 @@ Signed-off-by: Leah Rowe <leah@libreboot.org> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bootsplash.c b/src/bootsplash.c -index 538b316d..9eed0b12 100644 +index 538b316d..e02bf3d2 100644 --- a/src/bootsplash.c +++ b/src/bootsplash.c @@ -48,7 +48,7 @@ enable_vga_console(void) @@ -17,10 +17,10 @@ index 538b316d..9eed0b12 100644 // Write to screen. - printf("SeaBIOS (version %s)\n", VERSION); -+ printf("Libreboot 25.04 Corny Calamity (SeaBIOS menu): https://libreboot.org/\n"); ++ printf("Libreboot 25.06 Luminous Lemon (SeaBIOS menu): https://libreboot.org/\n"); display_uuid(); } -- -2.39.5 +2.47.3 diff --git a/config/seabios/default/patches/0004-ahci-Only-reset-controller-on-CSM.patch b/config/seabios/default/patches/0004-ahci-Only-reset-controller-on-CSM.patch deleted file mode 100644 index 43f2b8a9..00000000 --- a/config/seabios/default/patches/0004-ahci-Only-reset-controller-on-CSM.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 5fe2215bc5196d836b54e1e5fb00b63fa096fda7 Mon Sep 17 00:00:00 2001 -From: Leah Rowe <leah@libreboot.org> -Date: Thu, 1 May 2025 15:46:54 +0100 -Subject: [PATCH 4/4] ahci: Only reset controller on CSM - -Please refer to this commit: - -commit 8863cbbd15a73b03153553c562f5b1fb939ad4d7 -Author: Gerd Hoffmann <kraxel@redhat.com> -Date: Thu Feb 6 12:10:21 2025 +0100 - - ahci: add controller reset - -This commit broke AHCI init on the Lenovo ThinkPad T420, -when tested with SeaBIOS as a coreboot payload. - -Since the above commit was made with CSMs in mind, to make -the AHCI driver work there, that change has been re-worked -so as to only apply when a CSM is in use. - -Signed-off-by: Leah Rowe <leah@libreboot.org> ---- - src/hw/ahci.c | 17 ++++++++++++++--- - 1 file changed, 14 insertions(+), 3 deletions(-) - -diff --git a/src/hw/ahci.c b/src/hw/ahci.c -index 2285d33d..b09b198a 100644 ---- a/src/hw/ahci.c -+++ b/src/hw/ahci.c -@@ -637,7 +637,7 @@ static void - ahci_controller_setup(struct pci_device *pci) - { - struct ahci_port_s *port; -- u32 pnr, max; -+ u32 val, pnr, max; - - if (create_bounce_buf() < 0) - return; -@@ -660,8 +660,19 @@ ahci_controller_setup(struct pci_device *pci) - - pci_enable_busmaster(pci); - -- ahci_ctrl_writel(ctrl, HOST_CTL, HOST_CTL_RESET); -- ahci_ctrl_writel(ctrl, HOST_CTL, HOST_CTL_AHCI_EN); -+ /* AHCI controller reset, but only for CSM. Commit 8863cbbd -+ introduced this universally, to make AHCI drivers work in -+ CSM mode, but it broke AHCI setup on the ThinkPad T420 when -+ SeaBIOS is used as a coreboot payload, hence the else clause: */ -+ if (CONFIG_CSM) { -+ /* Enable AHCI controller after resetting its state */ -+ ahci_ctrl_writel(ctrl, HOST_CTL, HOST_CTL_RESET); -+ ahci_ctrl_writel(ctrl, HOST_CTL, HOST_CTL_AHCI_EN); -+ } else { -+ /* Enable AHCI controller from its current state */ -+ val = ahci_ctrl_readl(ctrl, HOST_CTL); -+ ahci_ctrl_writel(ctrl, HOST_CTL, val | HOST_CTL_AHCI_EN); -+ } - - ctrl->caps = ahci_ctrl_readl(ctrl, HOST_CAP); - ctrl->ports = ahci_ctrl_readl(ctrl, HOST_PORTS_IMPL); --- -2.39.5 - diff --git a/config/seabios/default/target.cfg b/config/seabios/default/target.cfg index 92b906f2..78cfc9e2 100644 --- a/config/seabios/default/target.cfg +++ b/config/seabios/default/target.cfg @@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-3.0-or-later tree="default" -rev="9029a010ec413e6c3c0eb52c29c252a5b9a9f774" +rev="0026c353eb4e220af29750fcf000d48faf8d4ab3" |