Merge tag 'soc-arm-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[linux-2.6-microblaze.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index b2ab8db..b67d054 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -340,83 +340,7 @@ config ARCH_MULTIPLATFORM
          Selecting N here allows using those options, including
          DEBUG_UNCOMPRESS, XIP_KERNEL and ZBOOT_ROM. If unsure, say Y.
 
-menu "Platform selection"
-       depends on MMU
-
-comment "CPU Core family selection"
-
-config ARCH_MULTI_V4
-       bool "ARMv4 based platforms (FA526, StrongARM)"
-       depends on !ARCH_MULTI_V6_V7
-       # https://github.com/llvm/llvm-project/issues/50764
-       depends on !LD_IS_LLD || LLD_VERSION >= 160000
-       select ARCH_MULTI_V4_V5
-       select CPU_FA526 if !(CPU_SA110 || CPU_SA1100)
-
-config ARCH_MULTI_V4T
-       bool "ARMv4T based platforms (ARM720T, ARM920T, ...)"
-       depends on !ARCH_MULTI_V6_V7
-       # https://github.com/llvm/llvm-project/issues/50764
-       depends on !LD_IS_LLD || LLD_VERSION >= 160000
-       select ARCH_MULTI_V4_V5
-       select CPU_ARM920T if !(CPU_ARM7TDMI || CPU_ARM720T || \
-               CPU_ARM740T || CPU_ARM9TDMI || CPU_ARM922T || \
-               CPU_ARM925T || CPU_ARM940T)
-
-config ARCH_MULTI_V5
-       bool "ARMv5 based platforms (ARM926T, XSCALE, PJ1, ...)"
-       depends on !ARCH_MULTI_V6_V7
-       select ARCH_MULTI_V4_V5
-       select CPU_ARM926T if !(CPU_ARM946E || CPU_ARM1020 || \
-               CPU_ARM1020E || CPU_ARM1022 || CPU_ARM1026 || \
-               CPU_XSCALE || CPU_XSC3 || CPU_MOHAWK || CPU_FEROCEON)
-
-config ARCH_MULTI_V4_V5
-       bool
-
-config ARCH_MULTI_V6
-       bool "ARMv6 based platforms (ARM11)"
-       select ARCH_MULTI_V6_V7
-       select CPU_V6K
-
-config ARCH_MULTI_V7
-       bool "ARMv7 based platforms (Cortex-A, PJ4, Scorpion, Krait)"
-       default y
-       select ARCH_MULTI_V6_V7
-       select CPU_V7
-       select HAVE_SMP
-
-config ARCH_MULTI_V6_V7
-       bool
-       select MIGHT_HAVE_CACHE_L2X0
-
-config ARCH_MULTI_CPU_AUTO
-       def_bool !(ARCH_MULTI_V4 || ARCH_MULTI_V4T || ARCH_MULTI_V6_V7)
-       select ARCH_MULTI_V5
-
-endmenu
-
-config ARCH_VIRT
-       bool "Dummy Virtual Machine"
-       depends on ARCH_MULTI_V7
-       select ARM_AMBA
-       select ARM_GIC
-       select ARM_GIC_V2M if PCI
-       select ARM_GIC_V3
-       select ARM_GIC_V3_ITS if PCI
-       select ARM_PSCI
-       select HAVE_ARM_ARCH_TIMER
-
-config ARCH_AIROHA
-       bool "Airoha SoC Support"
-       depends on ARCH_MULTI_V7
-       select ARM_AMBA
-       select ARM_GIC
-       select ARM_GIC_V3
-       select ARM_PSCI
-       select HAVE_ARM_ARCH_TIMER
-       help
-         Support for Airoha EN7523 SoCs
+source "arch/arm/Kconfig.platforms"
 
 #
 # This is sorted alphabetically by mach-* pathname.  However, plat-*
@@ -429,8 +353,6 @@ source "arch/arm/mach-alpine/Kconfig"
 
 source "arch/arm/mach-artpec/Kconfig"
 
-source "arch/arm/mach-asm9260/Kconfig"
-
 source "arch/arm/mach-aspeed/Kconfig"
 
 source "arch/arm/mach-at91/Kconfig"
@@ -479,8 +401,6 @@ source "arch/arm/mach-milbeaut/Kconfig"
 
 source "arch/arm/mach-mmp/Kconfig"
 
-source "arch/arm/mach-moxart/Kconfig"
-
 source "arch/arm/mach-mstar/Kconfig"
 
 source "arch/arm/mach-mv78xx0/Kconfig"
@@ -493,8 +413,6 @@ source "arch/arm/mach-nomadik/Kconfig"
 
 source "arch/arm/mach-npcm/Kconfig"
 
-source "arch/arm/mach-nspire/Kconfig"
-
 source "arch/arm/mach-omap1/Kconfig"
 
 source "arch/arm/mach-omap2/Kconfig"
@@ -505,8 +423,6 @@ source "arch/arm/mach-pxa/Kconfig"
 
 source "arch/arm/mach-qcom/Kconfig"
 
-source "arch/arm/mach-rda/Kconfig"
-
 source "arch/arm/mach-realtek/Kconfig"
 
 source "arch/arm/mach-rpc/Kconfig"
@@ -529,14 +445,10 @@ source "arch/arm/mach-sti/Kconfig"
 
 source "arch/arm/mach-stm32/Kconfig"
 
-source "arch/arm/mach-sunplus/Kconfig"
-
 source "arch/arm/mach-sunxi/Kconfig"
 
 source "arch/arm/mach-tegra/Kconfig"
 
-source "arch/arm/mach-uniphier/Kconfig"
-
 source "arch/arm/mach-ux500/Kconfig"
 
 source "arch/arm/mach-versatile/Kconfig"