From 07983c1d882180a301e7be9dcf68e155c6c5a7f7 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Thu, 5 Dec 2024 13:01:31 +0000 Subject: [PATCH] Revert "Revert "disable u-boot on thinkpad t480"" Nope! Bootflow menu is cursed on this machine. Too many issues in U-Boot on this machine. I did however boot a Debian installer after it booted, using bootflow. The installed system wouldn't boot with bootflow, but I could then boot it with "bootefi bootmgr". I'll rig up a uart on the T480 when I get round to it and start investigating U-Boot bugs on this board. I don't want people flashing something that doesn't work. GRUB and SeaBIOS work, so ship those, and don't ship U-Boot. This reverts commit 19ec440a6f79dcbb089715fef814808a0fd40ae0. --- config/coreboot/t480_fsp_16mb/target.cfg | 3 +-- config/coreboot/t480s_fsp_16mb/target.cfg | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/config/coreboot/t480_fsp_16mb/target.cfg b/config/coreboot/t480_fsp_16mb/target.cfg index af8d71e3..af89a367 100644 --- a/config/coreboot/t480_fsp_16mb/target.cfg +++ b/config/coreboot/t480_fsp_16mb/target.cfg @@ -6,6 +6,5 @@ payload_memtest="y" grub_scan_disk="nvme ahci" grubtree="xhci" vcfg="t480" -build_depend="seabios/default grub/xhci memtest86plus u-boot/amd64coreboot" +build_depend="seabios/default grub/xhci memtest86plus" IFD_platform="sklkbl" -payload_uboot_amd64="y" diff --git a/config/coreboot/t480s_fsp_16mb/target.cfg b/config/coreboot/t480s_fsp_16mb/target.cfg index 05450bf6..c8835c8f 100644 --- a/config/coreboot/t480s_fsp_16mb/target.cfg +++ b/config/coreboot/t480s_fsp_16mb/target.cfg @@ -6,6 +6,5 @@ payload_memtest="y" grub_scan_disk="nvme ahci" grubtree="xhci" vcfg="t480s" -build_depend="seabios/default grub/xhci memtest86plus u-boot/amd64coreboot" +build_depend="seabios/default grub/xhci memtest86plus" IFD_platform="sklkbl" -payload_uboot_amd64="y"