From: Andrew Davis Date: Mon, 13 Nov 2023 14:43:52 +0000 (-0600) Subject: ARM: mach-asm9260: Move ASM9260 support into Kconfig.platforms X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b6ed4800136f591cb9b1d95031ba1856f6647dcc;p=linux.git 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 Reviewed-by: Oleksij Rempel Signed-off-by: Arnd Bergmann --- diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index c39e3db466897..b31489f05ba86 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 ed1f6da11e243..b80a5b49d276d 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 74e0f61c74c88..0000000000000 --- 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.