rom.sh: properly cook coreboot configs

new mkhelper variable added: cook_config

Signed-off-by: Leah Rowe <leah@libreboot.org>

3 files changed, 8 insertions, 4 deletions

diff --git a/config/data/coreboot/mkhelper.cfg b/config/data/coreboot/mkhelper.cfg
index a81db2bf..f7122f9c 100644
--- a/config/data/coreboot/mkhelper.cfg
+++ b/config/data/coreboot/mkhelper.cfg
@@ -31,3 +31,4 @@ cbfscfg=""
 premake="corebootpremake"
 mkhelper="$if_not_dry_build coreboot_pad_one_byte"
 postmake="$if_not_dry_build mkcorebootbin"
+cook_config="$if_not_dry_build cook_coreboot_config"
diff --git a/include/fw/rom.sh b/include/fw/rom.sh
index 2ef54db4..d4a77ff6 100644
--- a/include/fw/rom.sh
+++ b/include/fw/rom.sh
@@ -60,7 +60,7 @@ corebootpremake()
 	[ "$XBMK_RELEASE" = "y" ] && [ "$release" = "n" ] && \
 		return 0
 
-	[ "$XBMK_RELEASE" = "y" ] \
+	[ "$XBMK_RELEASE" = "y" ] && \
 		payload_edk2="" # source-only payload, for now.
 
 	forx 'check_coreboot_util %s' cbfstool ifdtool
@@ -68,8 +68,6 @@ corebootpremake()
 	printf "%s\n" "${version%%-*}" > "$srcdir/.coreboot-version" || \
 	    err "!mk $srcdir .coreboot-version" "corebootpremake" "$@"
 
-	cook_coreboot_config
-
 	[ "$target" != "$tree" ] && \
 		x_ "$mk" download "$target"; :
 }
@@ -100,6 +98,8 @@ cook_coreboot_config()
 	for ecfgval in $ecfg; do
 		printf "%s\n" "$ecfgval" >> "$srcdir/$cfgname"
 	done
+
+	x_ make -C "$srcdir" oldconfig
 }
 
 check_coreboot_util()
diff --git a/mk b/mk
index 036b6714..4f3340d5 100755
--- a/mk
+++ b/mk
@@ -89,7 +89,7 @@ eval "`newvar if_not_make_config if_not_build if_not_dry_build if_not_fetch`"
 cfgvars="autogenargs cmakedir configureargs badhash badtghash bootstrapargs \
     build_depend cleanargs fetch_depend makeargs mkhelper noconfig postmake \
     premake release rev tree xarch xgcctree xlang cfgname defscan \
-    if_not_skip_build"
+    if_not_skip_build cook_config"
 
 eval "`newvar buildcfg dest_dir elfdir flag forcepull listfile mdir \
     mkhelpercfg mode project srcdir target target_dir _tcfg \
@@ -391,6 +391,9 @@ run_make_command()
 	$if_build \
 		check_autoconf "$srcdir"
 
+	$if_build \
+		x_ $cook_config
+
 	check_makefile "$srcdir" && \
 	    x_ make -C "$srcdir" $mode -j$XBMK_THREADS $makeargs
 }