summaryrefslogtreecommitdiff
path: root/script
diff options
context:
space:
mode:
authorLeah Rowe <vimuser@noreply.codeberg.org>2023-10-14 19:42:54 +0000
committerLeah Rowe <vimuser@noreply.codeberg.org>2023-10-14 19:42:54 +0000
commit8583a05dde772923125976a9ba7c85d249306126 (patch)
treee6cd786f0d4b55e0303da296d4bbea24ca6544cc /script
parent65af756fc33ce1a8960c690e681d12ebeef20750 (diff)
parent4d9567a7561df6eeb0dd81f2faf522c8526163b0 (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')
-rwxr-xr-xscript/build/fw/coreboot8
-rwxr-xr-xscript/update/project/trees18
2 files changed, 15 insertions, 11 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)
diff --git a/script/update/project/trees b/script/update/project/trees
index 6a31d8d0..bb0899f0 100755
--- a/script/update/project/trees
+++ b/script/update/project/trees
@@ -1,6 +1,6 @@
#!/usr/bin/env sh
# SPDX-License-Identifier: GPL-3.0-or-later
-# SPDX-FileCopyrightText: 2022 Alper Nebi Yasak <alpernebiyasak@gmail.com>
+# SPDX-FileCopyrightText: 2022-2023 Alper Nebi Yasak <alpernebiyasak@gmail.com>
# SPDX-FileCopyrightText: 2022 Ferass El Hafidi <vitali64pmemail@protonmail.com>
# SPDX-FileCopyrightText: 2023 Leah Rowe <leah@libreboot.org>
@@ -21,7 +21,7 @@ tmpclean="$(mktemp -d -t makeclean.XXXXXXXXXX)"
main()
{
- while getopts f:b:m:u:c:x: option
+ while getopts f:b:m:u:c:x:s:l:n: option
do
_f="${1}"
case "${1}" in
@@ -31,11 +31,14 @@ main()
-c) mode="distclean" ;;
-x) mode="crossgcc-clean" ;;
-f) mode="fetch" ;;
+ -s) mode="savedefconfig" ;;
+ -l) mode="olddefconfig" ;;
+ -n) mode="nconfig" ;;
*) err "Invalid option" ;;
esac
shift; project="${OPTARG#src/}"; shift
done
- [ -z "${_f}" ] && err "flag not specified (-m, -u, -b, -c or -x)"
+ [ -z "${_f}" ] && err "flag not specified (-m, -u, -b, -c, -x, -f, -s, -l or -n)"
[ -z "${project}" ] && err "project name not specified"
if [ ! -f "config/${project}/build.list" ]; then
@@ -193,9 +196,7 @@ check_cross_compiler()
cbdir="src/coreboot/${tree}"
[ "${project}" != "coreboot" ] && \
- cbdir="src/coreboot/default" # not u-boot (e.g. linux)
- [ "${project}" = "u-boot" ] && \
- cbdir="src/coreboot/cros" # u-boot only used on coreboot/cros
+ cbdir="src/coreboot/default"
# only true if not building coreboot:
ctarget="${cbdir#src/coreboot/}"
@@ -263,8 +264,11 @@ handle_makefile()
if [ -e "${codedir}/.git" ] && [ "${project}" = "u-boot" ] && \
[ "${mode}" = "distclean" ]; then
x_ git -C "${codedir}" clean -fdx
- elif [ "${mode}" = "oldconfig" ] || [ "${mode}" = "menuconfig" ]; then
+ elif [ "${mode}" = "oldconfig" ] || [ "${mode}" = "olddefconfig" ] || \
+ [ "${mode}" = "menuconfig" ] || [ "${mode}" = "nconfig" ]; then
x_ cp "${codedir}/.config" "${config}"
+ elif [ "${mode}" = "savedefconfig" ]; then
+ x_ cp "${codedir}/defconfig" "${config}"
fi
}