aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc/Makefile
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2018-08-21 02:08:28 +0900
committerDavid S. Miller <davem@davemloft.net>2018-08-21 12:41:12 -0700
commitc84ca616b1260949782f408271336f0eda056c61 (patch)
tree1bce9a79f3ca0981e0d1b52c14aff0a2bd01a8a9 /arch/sparc/Makefile
parentMerge branch 'sparc32-NO_BOOTMEM' (diff)
downloadlinux-dev-c84ca616b1260949782f408271336f0eda056c61.tar.xz
linux-dev-c84ca616b1260949782f408271336f0eda056c61.zip
sparc: fix KBUILD_DEFCONFIG for ARCH=sparc32
As commit 5ba800962a80 ("kbuild: update ARCH alias info for sparc") addressed, SPARC accepts ARCH=sparc32 as an alias. However, arch/sparc/Makefile wrongly sets KBUILD_DEFCONFIG, then sparc64_defconfig is chosen as the base configuration for ARCH=sparc32. $ make ARCH=sparc32 defconfig *** Default configuration is based on 'sparc64_defconfig' # # configuration written to .config # Fix the logic to choose sparc64_defconfig only when ARCH=sparc64. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/Makefile')
-rw-r--r--arch/sparc/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/sparc/Makefile b/arch/sparc/Makefile
index 966a13d2b127..e32ef20de567 100644
--- a/arch/sparc/Makefile
+++ b/arch/sparc/Makefile
@@ -9,10 +9,10 @@
# Copyright (C) 1998 Jakub Jelinek (jj@ultra.linux.cz)
# We are not yet configured - so test on arch
-ifeq ($(ARCH),sparc)
- KBUILD_DEFCONFIG := sparc32_defconfig
-else
+ifeq ($(ARCH),sparc64)
KBUILD_DEFCONFIG := sparc64_defconfig
+else
+ KBUILD_DEFCONFIG := sparc32_defconfig
endif
ifeq ($(CONFIG_SPARC32),y)