summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config/data/coreboot/mkhelper.cfg8
-rw-r--r--config/data/u-boot/mkhelper.cfg4
-rwxr-xr-xmk9
3 files changed, 15 insertions, 6 deletions
diff --git a/config/data/coreboot/mkhelper.cfg b/config/data/coreboot/mkhelper.cfg
index 8414ab53..6808f18f 100644
--- a/config/data/coreboot/mkhelper.cfg
+++ b/config/data/coreboot/mkhelper.cfg
@@ -26,3 +26,11 @@ cbfscfg=""
premake="corebootpremake"
mkhelper="coreboot_pad_one_byte"
postmake="mkcorebootbin"
+
+# must confirm, but i think git-clean
+# will also delete crossgcc builds in
+# coreboot.git, which we do not currently
+# rely on out-of-tree
+gitclean="n"
+
+# so, TODO: support out-of-tree xgcc builds
diff --git a/config/data/u-boot/mkhelper.cfg b/config/data/u-boot/mkhelper.cfg
deleted file mode 100644
index 2108034d..00000000
--- a/config/data/u-boot/mkhelper.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-gitclean="y"
-gitcleanargs="-fdx"
diff --git a/mk b/mk
index 71ea5d0e..5ec238b6 100755
--- a/mk
+++ b/mk
@@ -74,7 +74,11 @@ eval "`newvar autoconfargs autogenargs badhash badtghash bootstrapargs \
build_depend buildtype cleanargs cmakedir cmd defconfig dest_dir elfdir \
forcepull listfile makeargs mdir mkhelper mkhelpercfg mode postmake \
premake project release rev srcdir target target_dir tree xarch xgcctree \
- xlang gitclean gitcleanargs`"
+ xlang`"
+
+# can be overridden in project mkhelper.cfg
+gitclean="y"
+gitcleanargs="-fdx"
main()
{
@@ -268,7 +272,8 @@ configure_project()
eval "`newvar autoconfargs badhash badtghash bootstrapargs \
build_depend buildtype cleanargs makeargs mkhelper postmake \
- premake release xarch xgcctree xlang gitclean gitcleanargs`"
+ premake release xarch xgcctree xlang`"
+ gitclean="y"
[ ! -f "$_tcfg" ] && \
buildtype="auto"