Skip to content

Commit 5eeaafc

Browse files
rddunlaptsbogend
authored andcommitted
mips: BCM63XX: ensure that CPU_SUPPORTS_32BIT_KERNEL is set
Several header files need info on CONFIG_32BIT or CONFIG_64BIT, but kconfig symbol BCM63XX does not provide that info. This leads to many build errors, e.g.: arch/mips/include/asm/page.h:196:13: error: use of undeclared identifier 'CAC_BASE' return x - PAGE_OFFSET + PHYS_OFFSET; arch/mips/include/asm/mach-generic/spaces.h:91:23: note: expanded from macro 'PAGE_OFFSET' #define PAGE_OFFSET (CAC_BASE + PHYS_OFFSET) arch/mips/include/asm/io.h:134:28: error: use of undeclared identifier 'CAC_BASE' return (void *)(address + PAGE_OFFSET - PHYS_OFFSET); arch/mips/include/asm/mach-generic/spaces.h:91:23: note: expanded from macro 'PAGE_OFFSET' #define PAGE_OFFSET (CAC_BASE + PHYS_OFFSET) arch/mips/include/asm/uaccess.h:82:10: error: use of undeclared identifier '__UA_LIMIT' return (__UA_LIMIT & (addr | (addr + size) | __ua_size(size))) == 0; Selecting the SYS_HAS_CPU_BMIPS* symbols causes SYS_HAS_CPU_BMIPS to be set, which then selects CPU_SUPPORT_32BIT_KERNEL, which causes CONFIG_32BIT to be set. (a bit more indirect than v1 [RFC].) Fixes: e7300d0 ("MIPS: BCM63xx: Add support for the Broadcom BCM63xx family of SOCs.") Signed-off-by: Randy Dunlap <[email protected]> Reported-by: kernel test robot <[email protected]> Cc: Thomas Bogendoerfer <[email protected]> Cc: Florian Fainelli <[email protected]> Cc: [email protected] Cc: [email protected] Cc: Paul Burton <[email protected]> Cc: Maxime Bizon <[email protected]> Cc: Ralf Baechle <[email protected]> Suggested-by: Florian Fainelli <[email protected]> Acked-by: Florian Fainelli <[email protected]> Signed-off-by: Thomas Bogendoerfer <[email protected]>
1 parent f1245bc commit 5eeaafc

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

arch/mips/Kconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,9 @@ config BCM63XX
332332
select SYS_SUPPORTS_32BIT_KERNEL
333333
select SYS_SUPPORTS_BIG_ENDIAN
334334
select SYS_HAS_EARLY_PRINTK
335+
select SYS_HAS_CPU_BMIPS32_3300
336+
select SYS_HAS_CPU_BMIPS4350
337+
select SYS_HAS_CPU_BMIPS4380
335338
select SWAP_IO_SPACE
336339
select GPIOLIB
337340
select MIPS_L1_CACHE_SHIFT_4

0 commit comments

Comments
 (0)