diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2019-08-08 01:06:48 +0900 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-08-12 08:59:27 +0200 |
| commit | 21e5652f989d2df9a1722698b2d5f9257c6c4c3b (patch) | |
| tree | 399c82bd978995a06c15dd126a098d4ac2c60a5c /scripts/kconfig/Makefile | |
| parent | 1f5e9d331548ee02322511365a00a142bdf15f4d (diff) | |
| download | barebox-21e5652f989d2df9a1722698b2d5f9257c6c4c3b.tar.gz barebox-21e5652f989d2df9a1722698b2d5f9257c6c4c3b.tar.xz | |
kconfig: update to Linux 5.3-rc3
Recently, Linux merged some important fixes.
Commit 8e2442a5f86e ("kconfig: fix missing choice values in auto.conf")
Commit 0c5b6c28ed68 ("kconfig: Clear "written" flag to avoid data loss")
Barebox must import them.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'scripts/kconfig/Makefile')
| -rw-r--r-- | scripts/kconfig/Makefile | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index 3f327e21f6..7656e1137b 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -12,6 +12,10 @@ else Kconfig := Kconfig endif +ifndef KBUILD_DEFCONFIG +KBUILD_DEFCONFIG := defconfig +endif + ifeq ($(quiet),silent_) silent := -s endif @@ -74,9 +78,7 @@ savedefconfig: $(obj)/conf $< $(silent) --$@=defconfig $(Kconfig) defconfig: $(obj)/conf -ifeq ($(KBUILD_DEFCONFIG),) - $< $(silent) --defconfig $(Kconfig) -else ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG)),) +ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG)),) @$(kecho) "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'" $(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig) else @@ -92,7 +94,7 @@ configfiles=$(wildcard $(srctree)/kernel/configs/$@ $(srctree)/arch/$(SRCARCH)/c %.config: $(obj)/conf $(if $(call configfiles),, $(error No configuration exists for this target on this architecture)) $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m .config $(configfiles) - +$(Q)yes "" | $(MAKE) -f $(srctree)/Makefile oldconfig + $(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig PHONY += kvmconfig kvmconfig: kvm_guest.config |