kconfig: remove always false ifeq ($(KBUILD_DEFCONFIG,) conditional
authorMasahiro Yamada <yamada.masahiro@socionext.com>
Mon, 27 May 2019 14:37:21 +0000 (23:37 +0900)
committerMasahiro Yamada <yamada.masahiro@socionext.com>
Sun, 9 Jun 2019 06:08:18 +0000 (15:08 +0900)
With the following two commits applied, all the arch Makefiles
define KBUILD_DEFCONFIG.

- Commit f3e20ad67b4c ("s390: move arch/s390/defconfig to
  arch/s390/configs/defconfig")

- Commit 986a13769c4b ("alpha: move arch/alpha/defconfig to
  arch/alpha/configs/defconfig")

The first conditional in the defconfig rule is always false.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
scripts/kconfig/Makefile

index 3f327e21f60e23c25b7bc14179afcea6f9104868..059642bd65842a14e62f2e56e98e5615766c4d5a 100644 (file)
@@ -74,9 +74,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