summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xresources/scripts/build/boot/roms_helper23
1 files changed, 16 insertions, 7 deletions
diff --git a/resources/scripts/build/boot/roms_helper b/resources/scripts/build/boot/roms_helper
index f533e6ab..66a7be8f 100755
--- a/resources/scripts/build/boot/roms_helper
+++ b/resources/scripts/build/boot/roms_helper
@@ -268,14 +268,17 @@ if [ "${payload_grub}" = "y" ] || [ "${payload_seabios_withgrub}" = "y" ]; then
fi
if [ "${payload_uboot}" = "y" ]; then
- if [ "${uboot_config}" = "default" ] && \
- [ -f "payload/u-boot/${board}/u-boot.elf" ]; then
- ubootelf="payload/u-boot/${board}/u-boot.elf"
+ if [ "${uboot_config}" = "default" ]; then
+ ubdir="payload/u-boot/${board}"
else
- ubootelf="payload/u-boot/${board}/${uboot_config}/u-boot.elf"
+ ubdir="payload/u-boot/${board}/${uboot_config}"
fi
- if [ ! -f "${ubootelf}" ]; then
+ if [ -f "${ubdir}/u-boot.elf" ]; then
+ ubootelf="${ubdir}/u-boot.elf"
+ elif [ -f "${ubdir}/u-boot" ]; then
+ ubootelf="${ubdir}/u-boot"
+ else
printf "Required U-Boot payloads not yet built. Building now:\n"
rm -Rf "payload/u-boot/${board}" # just in case
./build payload u-boot "${board}"
@@ -397,9 +400,15 @@ make_uboot_payload_rom() {
cbfstool_path="${4}"
if [ "${target_uboot_config}" = "default" ]; then
- target_ubootelf="payload/u-boot/${board}/u-boot.elf"
+ target_ubdir="payload/u-boot/${board}"
else
- target_ubootelf="payload/u-boot/${board}/${target_uboot_config}/u-boot.elf"
+ target_ubdir="payload/u-boot/${board}/${target_uboot_config}"
+ fi
+
+ if [ -f "${target_ubdir}/u-boot.elf" ]; then
+ target_ubootelf="${target_ubdir}/u-boot.elf"
+ elif [ -f "${target_ubdir}/u-boot" ]; then
+ target_ubootelf="${target_ubdir}/u-boot"
fi
tmprom=$(mktemp -t coreboot_rom.XXXXXXXXXX)