summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Davis <afd@ti.com>2023-11-13 08:43:52 -0600
committerArnd Bergmann <arnd@arndb.de>2023-12-22 14:12:27 +0000
commitb6ed4800136f591cb9b1d95031ba1856f6647dcc (patch)
tree3fa62c84612529b51f93cb715d5584d5a565e3ee
parent20e3ab9ecb37a0e7ff4e820b79952280a3317d1d (diff)
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>
-rw-r--r--arch/arm/Kconfig2
-rw-r--r--arch/arm/Kconfig.platforms9
-rw-r--r--arch/arm/mach-asm9260/Kconfig9
3 files changed, 9 insertions, 11 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index c39e3db46689..b31489f05ba8 100644
--- 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 ed1f6da11e24..b80a5b49d276 100644
--- 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
index 74e0f61c74c8..000000000000
--- 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.