ARM: mach-rda: Move RDA Micro support into Kconfig.platforms

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

Signed-off-by: Andrew Davis <afd@ti.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

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

diff --git a/arch/arm/Kconfig.platforms b/arch/arm/Kconfig.platforms
index b80a5b49d276dbc2e93bc6a4f0c28e2c7a74622a..80f5b040e6ef489674447cae2970e4c09a6833e2 100644 (file)
--- a/arch/arm/Kconfig.platforms
+++ b/arch/arm/Kconfig.platforms
@@ -75,3 +75,11 @@ config MACH_ASM9260
        select ASM9260_TIMER
        help
          Support for Alphascale ASM9260 based platform.
+
+config ARCH_RDA
+       bool "RDA Micro SoCs"
+       depends on ARCH_MULTI_V7
+       select RDA_INTC
+       select RDA_TIMER
+       help
+         This enables support for the RDA Micro 8810PL SoC family.

diff --git a/arch/arm/mach-rda/Kconfig b/arch/arm/mach-rda/Kconfig
deleted file mode 100644 (file)
index 4d2e4e0..0000000
--- a/arch/arm/mach-rda/Kconfig
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-menuconfig ARCH_RDA
-       bool "RDA Micro SoCs"
-       depends on ARCH_MULTI_V7
-       select RDA_INTC
-       select RDA_TIMER
-       help
-         This enables support for the RDA Micro 8810PL SoC family.