summaryrefslogtreecommitdiff
path: root/resources/scripts/modify
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2023-08-16 21:34:21 +0100
committerLeah Rowe <leah@libreboot.org>2023-08-16 22:40:34 +0100
commit59dba6cfcdc6c154e4d46c14c42e7b6f0b84c7b5 (patch)
tree59147fae1f05a32c954772cd22ffab1405aaad0b /resources/scripts/modify
parent2453c303e64b3b3c2480564106ea77d89af624d8 (diff)
merge coreboot/u-boot download logic to one script
they are fundamentally the same, in an lbmk context. they are downloaded in the same way, and compiled in the same way! (Kconfig infrastructure, board-specific code, the way submodules are used in git, etc) ~200 sloc reduction in resources/scripts the audit begins Signed-off-by: Leah Rowe <leah@libreboot.org>
Diffstat (limited to 'resources/scripts/modify')
-rwxr-xr-xresources/scripts/modify/coreboot/configs14
-rwxr-xr-xresources/scripts/modify/u-boot/configs14
2 files changed, 14 insertions, 14 deletions
diff --git a/resources/scripts/modify/coreboot/configs b/resources/scripts/modify/coreboot/configs
index 665ee091..f6daa2f4 100755
--- a/resources/scripts/modify/coreboot/configs
+++ b/resources/scripts/modify/coreboot/configs
@@ -44,20 +44,20 @@ main()
modifyconf() {
board="$1"
- if [ ! -f "resources/coreboot/${board}/board.cfg" ]; then
- printf "\nmodify/config/coreboot: no board.cfg for: %s\n" \
+ if [ ! -f "resources/coreboot/${board}/target.cfg" ]; then
+ printf "\nmodify/config/coreboot: no target.cfg for: %s\n" \
"${board}"
fi
- cbtree=""
- . "resources/coreboot/${board}/board.cfg" # source
+ tree=""
+ . "resources/coreboot/${board}/target.cfg" # source
- if [ -z ${cbtree} ]; then
+ if [ -z ${tree} ]; then
return 0
fi
- cbdir="coreboot/${cbtree}"
+ cbdir="coreboot/${tree}"
if [ ! -d "${cbdir}" ]; then
- ./download coreboot ${cbtree}
+ ./fetch_trees coreboot ${tree}
fi
for cbcfg in resources/coreboot/${board}/config/*; do
diff --git a/resources/scripts/modify/u-boot/configs b/resources/scripts/modify/u-boot/configs
index 9572a5b8..4e16f353 100755
--- a/resources/scripts/modify/u-boot/configs
+++ b/resources/scripts/modify/u-boot/configs
@@ -44,22 +44,22 @@ main()
modifyconf()
{
board="$1"
- if [ ! -f "resources/u-boot/${board}/board.cfg" ]; then
- printf "\nmodify/config/u-boot: no board.cfg for: %s\n" \
+ if [ ! -f "resources/u-boot/${board}/target.cfg" ]; then
+ printf "\nmodify/config/u-boot: no target.cfg for: %s\n" \
"${board}"
return 0
fi
- ubtree="undefined"
- . "resources/u-boot/${board}/board.cfg" # source
+ tree="undefined"
+ . "resources/u-boot/${board}/target.cfg" # source
- if [ "${ubtree}" = "undefined" ]; then
+ if [ "${tree}" = "undefined" ]; then
return 0
fi
- ubdir="u-boot/${ubtree}"
+ ubdir="u-boot/${tree}"
if [ ! -d "${ubdir}" ]; then
- ./download u-boot ${ubtree}
+ ./fetch_trees u-boot ${tree}
fi
for ubcfg in resources/u-boot/${board}/config/*; do