ARM: mach-asm9260: Move ASM9260 support into Kconfig.platforms

This removes the need for a dedicated Kconfig and mach directory.

Signed-off-by: Andrew Davis <afd@ti.com>
Reviewed-by: Oleksij Rempel <o.rempel@pengutronix.de>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index c39e3db..b31489f 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -364,8 +364,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"

diff --git a/arch/arm/Kconfig.platforms b/arch/arm/Kconfig.platforms
index ed1f6da..b80a5b4 100644 (file)
--- a/arch/arm/Kconfig.platforms
+++ b/arch/arm/Kconfig.platforms
@@ -66,3 +66,12 @@ config ARCH_VIRT
        select ARM_GIC_V3_ITS if PCI
        select ARM_PSCI
        select HAVE_ARM_ARCH_TIMER
+
+config MACH_ASM9260
+       bool "Alphascale ASM9260"
+       depends on ARCH_MULTI_V5
+       depends on CPU_LITTLE_ENDIAN
+       select CPU_ARM926T
+       select ASM9260_TIMER
+       help
+         Support for Alphascale ASM9260 based platform.

diff --git a/arch/arm/mach-asm9260/Kconfig b/arch/arm/mach-asm9260/Kconfig
deleted file mode 100644 (file)
index 74e0f61..0000000
--- a/arch/arm/mach-asm9260/Kconfig
+++ /dev/null
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-config MACH_ASM9260
-       bool "Alphascale ASM9260"
-       depends on ARCH_MULTI_V5
-       depends on CPU_LITTLE_ENDIAN
-       select CPU_ARM926T
-       select ASM9260_TIMER
-       help
-         Support for Alphascale ASM9260 based platform.