From 106904ed81f6360bb5ce1e4ba5890737c86503e5 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Wed, 27 Nov 2024 02:41:39 +0000 Subject: [PATCH] rom.sh: Add U-Boot before SeaBIOS and GRUB (x86) Since U-Boot must be inserted at a specific offset, it's theoretically possible that other files might overlap, but cbfstool will work around wherever U-Boot was inserted if it was inserted first; we don't use specific offsets for the other files. This is technically a preventative bug fix, but it fixes a bug that would probably never occur in practise. Signed-off-by: Leah Rowe --- include/rom.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/rom.sh b/include/rom.sh index a2c6919..b9cf7ce 100644 --- a/include/rom.sh +++ b/include/rom.sh @@ -130,6 +130,11 @@ mkcorebootbin() add_seabios() { + if [ "$payload_uboot_i386" = "y" ] || \ + [ "$payload_uboot_amd64" = "y" ]; then + $dry add_uboot + fi + _seabioself="elf/seabios/default/$initmode/bios.bin.elf" cbfs "$tmprom" "$_seabioself" "fallback/payload" @@ -144,11 +149,6 @@ add_seabios() [ "$payload_memtest" = "y" ] && cbfs "$tmprom" \ "elf/memtest86plus/memtest.bin" img/memtest - if [ "$payload_uboot_i386" = "y" ] || \ - [ "$payload_uboot_amd64" = "y" ]; then - $dry add_uboot - fi - [ "$payload_grub" = "y" ] && add_grub cprom