diff options
| author | Leah Rowe <leah@libreboot.org> | 2024-11-27 02:41:39 +0000 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2024-11-27 02:41:39 +0000 |
| commit | f4b6aeea281407d2dd5aafcd823b2d5ca8c9131f (patch) | |
| tree | 3acfdabd9ddd0590cde2c9149c819c789cc64867 | |
| parent | 7014b303f98021011e0c016524e30bcccb3dc200 (diff) | |
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 <leah@libreboot.org>
| -rw-r--r-- | include/rom.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/rom.sh b/include/rom.sh index eb75d411..f86e5e1a 100644 --- a/include/rom.sh +++ b/include/rom.sh @@ -132,6 +132,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" @@ -146,11 +151,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 |