diff options
| author | Leah Rowe <leah@libreboot.org> | 2026-09-11 21:43:50 +0100 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2026-09-11 21:43:50 +0100 |
| commit | d0a1b40910eecc9687dab4c97c4b0b92057842e8 (patch) | |
| tree | 60a76e520f15dcedc3516401df551762656e7b1f /include/rom.sh | |
| parent | 0fd3d729985e69da307eae327ecdd3cd0ac6c0c1 (diff) | |
more cleanup
Signed-off-by: Leah Rowe <leah@libreboot.org>
Diffstat (limited to 'include/rom.sh')
| -rw-r--r-- | include/rom.sh | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/include/rom.sh b/include/rom.sh index 3d628acb..bf7f1164 100644 --- a/include/rom.sh +++ b/include/rom.sh @@ -368,8 +368,7 @@ add_uboot() ubtree="x86_64" ubtarget="amd64coreboot" - if [ "$payload_uboot" = "i386" ] - then + if [ "$payload_uboot" = "i386" ]; then ubpath="u-boot" # 32-bit ubtree="x86" ubtarget="i386coreboot"; : @@ -378,18 +377,13 @@ add_uboot() ubdir="elf/u-boot/$ubtree/$ubtarget/$uboot_config" - # aarch64 targets: - ubootelf="$ubdir/u-boot.elf" - if [ ! -f "$ubootelf" ]; then - ubootelf="$ubdir/u-boot" - fi - - # override for x86/x86_64 targets: - if [ "$payload_uboot" = "i386" ]; then - ubootelf="$ubdir/u-boot-dtb.bin" - elif [ "$payload_uboot" = "amd64" ]; then - ubootelf="$ubdir/u-boot-x86-with-spl.bin" # EFI-compatible - fi + ubootelf="$ubdir/u-boot.elf" # aarch64 + [ ! -f "$ubootelf" ] && \ + ubootelf="$ubdir/u-boot" # aarch64 (fallback) + [ "$payload_uboot" = "i386" ] && \ + ubootelf="$ubdir/u-boot-dtb.bin" # x86 override + [ "$payload_uboot" = "amd64" ] && \ + ubootelf="$ubdir/u-boot-x86-with-spl.bin" # x86_64 override cbfs "$tmprom" "$ubootelf" "$ubpath" $ubcbfsargs [ "$payload_seabios" != "y" ] && \ |