Attention is currently required from: Martin Roth. Patrick Georgi has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/56374 )
Change subject: util/kconfig: Mess less with Linux's kconfig Makefile ......................................................................
util/kconfig: Mess less with Linux's kconfig Makefile
We can just save and recover the CONFIG_ setting, one less dependency on what precisely goes on in the upstream Makefile.
Change-Id: I3c5ebf8c925bd1e2df570a84ddbb9275024c7dae Signed-off-by: Patrick Georgi pgeorgi@google.com --- M util/kconfig/Makefile.inc 1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/74/56374/1
diff --git a/util/kconfig/Makefile.inc b/util/kconfig/Makefile.inc index bedb41d..e6f66d7 100644 --- a/util/kconfig/Makefile.inc +++ b/util/kconfig/Makefile.inc @@ -17,14 +17,15 @@ -e "s,^savedefconfig:,__disable__&," \ -e "s,$$(srctree)/arch/$$(SRCARCH)/configs/$$(KBUILD_DEFCONFIG),$$(KBUILD_DEFCONFIG)," \ -e "s,--defconfig=arch/$$(SRCARCH)/configs/$$(KBUILD_DEFCONFIG),--defconfig=$$(KBUILD_DEFCONFIG)," \ - -e "/^unexport CONFIG_$$/d" \ $< > $@.tmp mv $@.tmp $@
kecho := echo
+OUR_CONFIG_ := CONFIG_ -include $(objk)/Makefile.real unexport KCONFIG_DEFCONFIG_LIST +export CONFIG_ := $(OUR_CONFIG_)
# Fill in Linux kconfig build rules to work