diff options
| author | Leah Rowe <vimuser@noreply.codeberg.org> | 2023-10-14 19:42:54 +0000 |
|---|---|---|
| committer | Leah Rowe <vimuser@noreply.codeberg.org> | 2023-10-14 19:42:54 +0000 |
| commit | 8583a05dde772923125976a9ba7c85d249306126 (patch) | |
| tree | e6cd786f0d4b55e0303da296d4bbea24ca6544cc /script/build | |
| parent | 65af756fc33ce1a8960c690e681d12ebeef20750 (diff) | |
| parent | 4d9567a7561df6eeb0dd81f2faf522c8526163b0 (diff) | |
Merge pull request 'Update U-Boot to v2023.10 and use default coreboot tree for gru chromebooks' (#136) from alpernebbi/lbmk:uboot-v2023.10 into master
Reviewed-on: https://codeberg.org/libreboot/lbmk/pulls/136
Diffstat (limited to 'script/build')
| -rwxr-xr-x | script/build/fw/coreboot | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/script/build/fw/coreboot b/script/build/fw/coreboot index 934d6ffd..487bfa31 100755 --- a/script/build/fw/coreboot +++ b/script/build/fw/coreboot @@ -3,7 +3,7 @@ # SPDX-FileCopyrightText: 2014-2016,2020,2021,2023 Leah Rowe <leah@libreboot.org> # SPDX-FileCopyrightText: 2021,2022 Ferass El Hafidi <vitali64pmemail@protonmail.com> # SPDX-FileCopyrightText: 2022 Caleb La Grange <thonkpeasant@protonmail.com> -# SPDX-FileCopyrightText: 2022 Alper Nebi Yasak <alpernebiyasak@gmail.com> +# SPDX-FileCopyrightText: 2022-2023 Alper Nebi Yasak <alpernebiyasak@gmail.com> # SPDX-FileCopyrightText: 2023 Riku Viitanen <riku.viitanen@protonmail.com> [ "x${DEBUG+set}" = 'xset' ] && set -v @@ -187,8 +187,8 @@ build_dependency_uboot() x_ ./update project trees -b u-boot ${board} ubdir="elf/u-boot/${board}/${uboot_config}" ubootelf="${ubdir}/u-boot.elf" - [ ! -f "${ubootelf}" ] && [ -f "${ubdir}/u-boot.bin" ] && \ - ubootelf="${ubdir}/u-boot.bin" + [ ! -f "${ubootelf}" ] && [ -f "${ubdir}/u-boot" ] && \ + ubootelf="${ubdir}/u-boot" [ -f "${ubootelf}" ] && return 0 err "Could not find u-boot build for board, ${board}" } @@ -369,7 +369,7 @@ mkUbootRom() { _ubdir="elf/u-boot/${board}/${uboot_config}" _ubootelf="${_ubdir}/u-boot.elf" - [ -f "${_ubootelf}" ] || _ubootelf="${_ubdir}/u-boot.bin" + [ -f "${_ubootelf}" ] || _ubootelf="${_ubdir}/u-boot" [ -f "${_ubootelf}" ] || err "mkUbootRom: ${board}: cant find u-boot" tmprom=$(mktemp -t coreboot_rom.XXXXXXXXXX) |