diff options
| -rw-r--r-- | config/u-boot/amd64coreboot/target.cfg | 2 | ||||
| -rw-r--r-- | config/u-boot/gru_bob/target.cfg | 2 | ||||
| -rw-r--r-- | config/u-boot/gru_kevin/target.cfg | 2 | ||||
| -rw-r--r-- | config/u-boot/i386coreboot/target.cfg | 2 | ||||
| -rw-r--r-- | config/u-boot/qemu_arm64_12mb/target.cfg | 2 | ||||
| -rw-r--r-- | include/get.sh | 6 | ||||
| -rw-r--r-- | include/tree.sh | 8 |
7 files changed, 12 insertions, 12 deletions
diff --git a/config/u-boot/amd64coreboot/target.cfg b/config/u-boot/amd64coreboot/target.cfg index 8b89408e..d3415dc6 100644 --- a/config/u-boot/amd64coreboot/target.cfg +++ b/config/u-boot/amd64coreboot/target.cfg @@ -2,6 +2,6 @@ tree="x86_64" # test building with x86_64 hostcc by commenting these: -# xtree="default" # coreboot tree containing crossgcc +# xgcctree="default" # coreboot tree containing crossgcc # xarch="x86_64-elf" # or uncomment them to use crossgcc(buggy) diff --git a/config/u-boot/gru_bob/target.cfg b/config/u-boot/gru_bob/target.cfg index e19603c2..0c90e338 100644 --- a/config/u-boot/gru_bob/target.cfg +++ b/config/u-boot/gru_bob/target.cfg @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-3.0-or-later tree="default" -xtree="default" +xgcctree="default" xarch="aarch64-elf arm-eabi" diff --git a/config/u-boot/gru_kevin/target.cfg b/config/u-boot/gru_kevin/target.cfg index e19603c2..0c90e338 100644 --- a/config/u-boot/gru_kevin/target.cfg +++ b/config/u-boot/gru_kevin/target.cfg @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-3.0-or-later tree="default" -xtree="default" +xgcctree="default" xarch="aarch64-elf arm-eabi" diff --git a/config/u-boot/i386coreboot/target.cfg b/config/u-boot/i386coreboot/target.cfg index 71cdde44..213049fe 100644 --- a/config/u-boot/i386coreboot/target.cfg +++ b/config/u-boot/i386coreboot/target.cfg @@ -2,6 +2,6 @@ tree="x86" # test building with x86_64 hostcc by commenting these: -# xtree="default" # coreboot tree containing crossgcc +# xgcctree="default" # coreboot tree containing crossgcc # xarch="i386-elf" # or uncomment them to use crossgcc(buggy) diff --git a/config/u-boot/qemu_arm64_12mb/target.cfg b/config/u-boot/qemu_arm64_12mb/target.cfg index e19603c2..0c90e338 100644 --- a/config/u-boot/qemu_arm64_12mb/target.cfg +++ b/config/u-boot/qemu_arm64_12mb/target.cfg @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-3.0-or-later tree="default" -xtree="default" +xgcctree="default" xarch="aarch64-elf arm-eabi" diff --git a/include/get.sh b/include/get.sh index 30813dc0..a0f7fb20 100644 --- a/include/get.sh +++ b/include/get.sh @@ -27,7 +27,7 @@ fetch_targets() fetch_project() { - xtree="" + xgcctree="" . "config/git/$project/pkg.cfg" || \ err "Can't read config 'config/git/$project/pkg.cfg'" \ @@ -38,8 +38,8 @@ fetch_project() "fetch_project" "$@" fi - if [ -n "$xtree" ]; then - x_ ./mk -f coreboot "$xtree" + if [ -n "$xgcctree" ]; then + x_ ./mk -f coreboot "$xgcctree" fi if [ -n "$depend" ]; then for d in $depend ; do diff --git a/include/tree.sh b/include/tree.sh index ff775c42..2b6c4b7f 100644 --- a/include/tree.sh +++ b/include/tree.sh @@ -20,7 +20,7 @@ project="" target="" target_dir="" targets="" -xtree="" +xgcctree="" release="" bootstrapargs="" mkhelper="" @@ -257,7 +257,7 @@ configure_project() cleanargs="" build_depend="" autoconfargs="" - xtree="" + xgcctree="" postmake="" makeargs="" buildtype="" @@ -469,8 +469,8 @@ check_cross_compiler() if [ "$project" != "coreboot" ]; then cbdir="src/coreboot/default" fi - if [ -n "$xtree" ]; then - cbdir="src/coreboot/$xtree" + if [ -n "$xgcctree" ]; then + cbdir="src/coreboot/$xgcctree" fi xfix="${1%-*}" |