diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-13 02:06:27 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-13 02:06:27 +0300 |
commit | 106f1466e7e7057ec6f4dc9516c13ea8cb9dffa0 (patch) | |
tree | 3bb73941127123ef598709bca38dc9cc0439ffc7 /arch/unicore32 | |
parent | 39ceda5ce1b002e30563fcb8ad1bb5ac8e4d59ee (diff) | |
parent | e3cd5136a4ecece6a7599a07add0dfb811a7f49d (diff) | |
download | linux-106f1466e7e7057ec6f4dc9516c13ea8cb9dffa0.tar.xz |
Merge tag 'kconfig-v5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull Kconfig updates from Masahiro Yamada:
- always require argument for --defconfig and remove the hard-coded
arch/$(ARCH)/defconfig path
- make arch/$(SRCARCH)/configs/defconfig the new default of defconfig
- some code cleanups
* tag 'kconfig-v5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
kconfig: remove meaningless if-conditional in conf_read()
kconfig: Fix spelling of sym_is_changable
unicore32: rename unicore32_defconfig to defconfig
kconfig: make arch/*/configs/defconfig the default of KBUILD_DEFCONFIG
kconfig: add static qualifier to expand_string()
kconfig: require the argument of --defconfig
kconfig: remove always false ifeq ($(KBUILD_DEFCONFIG,) conditional
Diffstat (limited to 'arch/unicore32')
-rw-r--r-- | arch/unicore32/Makefile | 3 | ||||
-rw-r--r-- | arch/unicore32/configs/defconfig (renamed from arch/unicore32/configs/unicore32_defconfig) | 0 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/unicore32/Makefile b/arch/unicore32/Makefile index 98a5ca43ae87..390819947c37 100644 --- a/arch/unicore32/Makefile +++ b/arch/unicore32/Makefile @@ -41,8 +41,7 @@ libs-y += arch/unicore32/lib/ boot := arch/unicore32/boot -# Default defconfig and target when executing plain make -KBUILD_DEFCONFIG := $(ARCH)_defconfig +# Default target when executing plain make KBUILD_IMAGE := $(boot)/zImage all: zImage diff --git a/arch/unicore32/configs/unicore32_defconfig b/arch/unicore32/configs/defconfig index 360cc9abcdb0..360cc9abcdb0 100644 --- a/arch/unicore32/configs/unicore32_defconfig +++ b/arch/unicore32/configs/defconfig |