summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile9
-rw-r--r--util/kconfig/Makefile.inc2
2 files changed, 6 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 5ed69330cc..d41dd4f32b 100644
--- a/Makefile
+++ b/Makefile
@@ -29,14 +29,17 @@ KCONFIG_DEPENDENCIES := $(obj)/auto.conf.cmd
KCONFIG_SPLITCONFIG := $(obj)/config/
KCONFIG_TRISTATE := $(obj)/tristate.conf
KCONFIG_NEGATIVES := 1
-KCONFIG_WERROR:= 1
-KCONFIG_WARN_UNKNOWN_SYMBOLS:= 1
+KCONFIG_WERROR := 1
+KCONFIG_WARN_UNKNOWN_SYMBOLS := 1
KCONFIG_PACKAGE := CB.Config
KCONFIG_MAKEFILE_REAL ?= $(objk)/Makefile.real
COREBOOT_EXPORTS += KCONFIG_CONFIG KCONFIG_AUTOHEADER KCONFIG_AUTOCONFIG
COREBOOT_EXPORTS += KCONFIG_DEPENDENCIES KCONFIG_SPLITCONFIG KCONFIG_TRISTATE
-COREBOOT_EXPORTS += KCONFIG_NEGATIVES KCONFIG_WERROR
+COREBOOT_EXPORTS += KCONFIG_NEGATIVES
+ifeq ($(filter %config,$(MAKECMDGOALS)),)
+COREBOOT_EXPORTS += KCONFIG_WERROR
+endif
COREBOOT_EXPORTS += KCONFIG_WARN_UNKNOWN_SYMBOLS
COREBOOT_EXPORTS += KCONFIG_AUTOADS KCONFIG_PACKAGE
diff --git a/util/kconfig/Makefile.inc b/util/kconfig/Makefile.inc
index 3a9f3530c0..83fad884b7 100644
--- a/util/kconfig/Makefile.inc
+++ b/util/kconfig/Makefile.inc
@@ -47,8 +47,6 @@ unexport KCONFIG_DEFCONFIG_LIST
# Fill in Linux kconfig build rules to work
-oldconfig: KCONFIG_STRICT=
-
savedefconfig: $(objk)/conf
cp $(DOTCONFIG) $(DEFCONFIG)
chmod +w $(DEFCONFIG)