config/coreboot/hp8560w_8mb/target.cfg

@@ -5,3 +5,4 @@ payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
 vcfg="hp8560w"
+payload_uboot_amd64="y"

config/data/grub/bootorder_uboot

@@ -1 +0,0 @@
-/rom@img/u-boot

config/u-boot/x86/patches/0002-x86-Avoid-clearing-the-VESA-display.patch

@@ -1,34 +0,0 @@
-From a6b9e69a21970951252419b5b5fa9c04fabbf1a4 Mon Sep 17 00:00:00 2001
-From: Simon Glass <sjg@chromium.org>
-Date: Tue, 12 Nov 2024 06:59:02 -0700
-Subject: [PATCH 1/2] x86: Avoid clearing the VESA display
-
-U-Boot clears the display when it starts up, so there is no need to ask
-the VESA driver to do this. Fix this and add a comment explaining the
-flags.
-
-Signed-off-by: Simon Glass <sjg@chromium.org>
----
- arch/x86/lib/bios.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/arch/x86/lib/bios.c b/arch/x86/lib/bios.c
-index 03f7360032..374f4f20b8 100644
---- a/arch/x86/lib/bios.c
-+++ b/arch/x86/lib/bios.c
-@@ -228,7 +228,11 @@ static void vbe_set_graphics(int vesa_mode, struct vesa_state *mode_info)
- {
- 	unsigned char *framebuffer;
- 
--	mode_info->video_mode = (1 << 14) | vesa_mode;
-+	/*
-+	 * bit 14 is linear-framebuffer mode
-+	 * bit 15 means don't clear the display
-+	 */
-+	mode_info->video_mode = (1 << 14) | (1 << 15) | vesa_mode;
- 	vbe_get_mode_info(mode_info);
- 
- 	framebuffer = (unsigned char *)(ulong)mode_info->vesa.phys_base_ptr;
--- 
-2.39.5
-

config/u-boot/x86/patches/0003-x86-Avoid-clearing-the-VESA-display.patch

@@ -1,29 +0,0 @@
-From d098961a91c8f410f50ae31e60300c0ef1f67075 Mon Sep 17 00:00:00 2001
-From: Simon Glass <sjg@chromium.org>
-Date: Tue, 12 Nov 2024 06:59:06 -0700
-Subject: [PATCH 2/2] x86: Drop the message about features missing in 64-bit
-
-This functions normally and has done for a while, so drop this scary
-message.
-
-Signed-off-by: Simon Glass <sjg@chromium.org>
----
- arch/x86/lib/spl.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/x86/lib/spl.c b/arch/x86/lib/spl.c
-index f761fbc8bc..656f59ede0 100644
---- a/arch/x86/lib/spl.c
-+++ b/arch/x86/lib/spl.c
-@@ -283,7 +283,7 @@ void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image)
- {
- 	int ret;
- 
--	printf("Jumping to 64-bit U-Boot: Note many features are missing\n");
-+	log_debug("Jumping to 64-bit U-Boot\n");
- 	ret = cpu_jump_to_64bit_uboot(spl_image->entry_point);
- 	debug("ret=%d\n", ret);
- 	hang();
--- 
-2.39.5
-

config/u-boot/x86_64/patches/0002-x86-Avoid-clearing-the-VESA-display.patch

@@ -1,34 +0,0 @@
-From a6b9e69a21970951252419b5b5fa9c04fabbf1a4 Mon Sep 17 00:00:00 2001
-From: Simon Glass <sjg@chromium.org>
-Date: Tue, 12 Nov 2024 06:59:02 -0700
-Subject: [PATCH 1/2] x86: Avoid clearing the VESA display
-
-U-Boot clears the display when it starts up, so there is no need to ask
-the VESA driver to do this. Fix this and add a comment explaining the
-flags.
-
-Signed-off-by: Simon Glass <sjg@chromium.org>
----
- arch/x86/lib/bios.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/arch/x86/lib/bios.c b/arch/x86/lib/bios.c
-index 03f7360032..374f4f20b8 100644
---- a/arch/x86/lib/bios.c
-+++ b/arch/x86/lib/bios.c
-@@ -228,7 +228,11 @@ static void vbe_set_graphics(int vesa_mode, struct vesa_state *mode_info)
- {
- 	unsigned char *framebuffer;
- 
--	mode_info->video_mode = (1 << 14) | vesa_mode;
-+	/*
-+	 * bit 14 is linear-framebuffer mode
-+	 * bit 15 means don't clear the display
-+	 */
-+	mode_info->video_mode = (1 << 14) | (1 << 15) | vesa_mode;
- 	vbe_get_mode_info(mode_info);
- 
- 	framebuffer = (unsigned char *)(ulong)mode_info->vesa.phys_base_ptr;
--- 
-2.39.5
-

config/u-boot/x86_64/patches/0003-x86-Avoid-clearing-the-VESA-display.patch

@@ -1,29 +0,0 @@
-From d098961a91c8f410f50ae31e60300c0ef1f67075 Mon Sep 17 00:00:00 2001
-From: Simon Glass <sjg@chromium.org>
-Date: Tue, 12 Nov 2024 06:59:06 -0700
-Subject: [PATCH 2/2] x86: Drop the message about features missing in 64-bit
-
-This functions normally and has done for a while, so drop this scary
-message.
-
-Signed-off-by: Simon Glass <sjg@chromium.org>
----
- arch/x86/lib/spl.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/x86/lib/spl.c b/arch/x86/lib/spl.c
-index f761fbc8bc..656f59ede0 100644
---- a/arch/x86/lib/spl.c
-+++ b/arch/x86/lib/spl.c
-@@ -283,7 +283,7 @@ void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image)
- {
- 	int ret;
- 
--	printf("Jumping to 64-bit U-Boot: Note many features are missing\n");
-+	log_debug("Jumping to 64-bit U-Boot\n");
- 	ret = cpu_jump_to_64bit_uboot(spl_image->entry_point);
- 	debug("ret=%d\n", ret);
- 	hang();
--- 
-2.39.5
-

include/rom.sh

@@ -154,9 +154,7 @@ add_seabios()
 
 	[ "$payload_grub" = "y" ] && add_grub
 
-	cprom
+	cprom && [ "$payload_grub" = "y" ] && pname="seagrub" && mkseagrub; :
-	[ "$payload_uboot_amd64" = "y" ] && pname="seauboot" && cprom "seauboot"
-	[ "$payload_grub" = "y" ] && pname="seagrub" && mkseagrub; :
 }
 
 add_grub()
@@ -212,14 +210,11 @@ add_uboot()
 cprom()
 {
 	newrom="bin/$target/${pname}_${target}_$initmode$displaymode.rom"
-	[ $# -gt 0 ] && [ "$1" != "seauboot" ] && \
+	[ $# -gt 0 ] && newrom="${newrom%.rom}_${1%.gkb}.rom"
-	    newrom="${newrom%.rom}_${1%.gkb}.rom"
 
 	x_ mkdir -p "bin/$target"
-	x_ cp "$tmprom" "$newrom" && [ $# -gt 0 ] && [ "$1" != "seauboot" ] && \
+	x_ cp "$tmprom" "$newrom" && [ $# -gt 0 ] && \
 	    cbfs "$newrom" "config/data/grub/keymap/$1" keymap.gkb raw
-	[ $# -gt 0 ] && [ "$1" = "seauboot" ] && \
-	    cbfs "$newrom" "config/data/grub/bootorder_uboot" "bootorder" raw
 
 	[ "$XBMK_RELEASE" = "y" ] || return 0
 	$dry mksha512sum "$newrom" "vendorhashes"; $dry ./vendor inject \