summaryrefslogtreecommitdiff
path: root/arch/arm/configs/collie_defconfig
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2022-07-26 14:16:37 +0200
committerArnd Bergmann <arnd@arndb.de>2022-08-18 16:44:59 +0200
commit6fd09c9afa49b343d17cecedd7879d097f37f2a9 (patch)
treec1290dcaeb1d3dfb4be14e32ac623bdc24d6b841 /arch/arm/configs/collie_defconfig
parent8c7d29a75397198154f66541c2af18a8feccac42 (diff)
downloadlinux-next-6fd09c9afa49b343d17cecedd7879d097f37f2a9.tar.gz
ARM: Kconfig: clean up platform selection
The top-level platform selection is mostly meaningless these days after almost everything is sorted below the CONFIG_ARCH_MULTIPLATFORM, with the only exception being the 20+ year old StrongARM based machines. Make this more consistent by removing the entire choice statement and moving the StrongARM specific options into regular platform specific Kconfig files. The three platforms (footbridge, rpc and sa1100) are still mutually exclusive and cannot coexist with other ARMv4/v5 machines, but since there are only three of them and we will not add more, this can be expressed using Kconfig 'depends on' statements. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/configs/collie_defconfig')
-rw-r--r--arch/arm/configs/collie_defconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/collie_defconfig b/arch/arm/configs/collie_defconfig
index d35cc59ce847..2a2d2cb3ce2e 100644
--- a/arch/arm/configs/collie_defconfig
+++ b/arch/arm/configs/collie_defconfig
@@ -5,6 +5,8 @@ CONFIG_BLK_DEV_INITRD=y
CONFIG_EXPERT=y
# CONFIG_BASE_FULL is not set
# CONFIG_EPOLL is not set
+CONFIG_ARCH_MULTI_V4=y
+# CONFIG_ARCH_MULTI_V7 is not set
CONFIG_ARCH_SA1100=y
CONFIG_SA1100_COLLIE=y
CONFIG_CMDLINE="noinitrd root=/dev/mtdblock2 rootfstype=jffs2 fbcon=rotate:1"