Skip to content

Commit ededa08

Browse files
committed
parisc: Fix defconfig selection
Fix the recursive loop when running "make ARCH=parisc defconfig". Fixes: 8466992 ("parisc: Regenerate parisc defconfigs") Noticed-by: Guenter Roeck <[email protected]> Tested-by: Guenter Roeck <[email protected]> Signed-off-by: Helge Deller <[email protected]>
1 parent 9420e8a commit ededa08

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

arch/parisc/Kconfig

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,11 @@ config MMU
7979
config STACK_GROWSUP
8080
def_bool y
8181

82+
config ARCH_DEFCONFIG
83+
string
84+
default "arch/parisc/configs/generic-32bit_defconfig" if !64BIT
85+
default "arch/parisc/configs/generic-64bit_defconfig" if 64BIT
86+
8287
config GENERIC_LOCKBREAK
8388
bool
8489
default y

arch/parisc/Makefile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,13 @@ CC_ARCHES = hppa hppa2.0 hppa1.1
3434
LD_BFD := elf32-hppa-linux
3535
endif
3636

37+
# select defconfig based on actual architecture
38+
ifeq ($(shell uname -m),parisc64)
39+
KBUILD_DEFCONFIG := generic-64bit_defconfig
40+
else
41+
KBUILD_DEFCONFIG := generic-32bit_defconfig
42+
endif
43+
3744
export LD_BFD
3845

3946
ifneq ($(SUBARCH),$(UTS_MACHINE))

0 commit comments

Comments
 (0)