parisc: Fix defconfig selection

Fix the recursive loop when running "make ARCH=parisc defconfig".

Fixes: 28d8a45e3f57 ("parisc: Regenerate parisc defconfigs")
Noticed-by: Guenter Roeck <linux@roeck-us.net>
Tested-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Helge Deller <deller@gmx.de>

diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index 71034b54d74e3e45c750ad2854621a3f65d0901b..3801a2ef9bca1e8baafdf96577a784d36897af49 100644 (file)
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -79,6 +79,11 @@ config MMU
 config STACK_GROWSUP
        def_bool y
 
+config ARCH_DEFCONFIG
+       string
+       default "arch/parisc/configs/generic-32bit_defconfig" if !64BIT
+       default "arch/parisc/configs/generic-64bit_defconfig" if 64BIT
+
 config GENERIC_LOCKBREAK
        bool
        default y

diff --git a/arch/parisc/Makefile b/arch/parisc/Makefile
index dca8f2de8cf5d0491cb072e88a5af43662ee37c3..628cd8bb7ad8500d682042a6a8ec64f7909cecb8 100644 (file)
--- a/arch/parisc/Makefile
+++ b/arch/parisc/Makefile
@@ -34,6 +34,13 @@ CC_ARCHES    = hppa hppa2.0 hppa1.1
 LD_BFD         := elf32-hppa-linux
 endif
 
+# select defconfig based on actual architecture
+ifeq ($(shell uname -m),parisc64)
+       KBUILD_DEFCONFIG := generic-64bit_defconfig
+else
+       KBUILD_DEFCONFIG := generic-32bit_defconfig
+endif
+
 export LD_BFD
 
 ifneq ($(SUBARCH),$(UTS_MACHINE))