ARM: mach-moxart: Move MOXA ART 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 cfdfba4d52e1902f2ea2425db6010ccced299d17..dc906d0c3948e371e19d39afc86fdb53f49cc16e 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -412,8 +412,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"

diff --git a/arch/arm/Kconfig.platforms b/arch/arm/Kconfig.platforms
index 0e6d7172bf61ed3635dd6e6a8e1f987b9f584ff9..4b5fad18ca8b00b55f5ab709713084c90893b1f5 100644 (file)
--- a/arch/arm/Kconfig.platforms
+++ b/arch/arm/Kconfig.platforms
@@ -76,6 +76,34 @@ config MACH_ASM9260
        help
          Support for Alphascale ASM9260 based platform.
 
+menuconfig ARCH_MOXART
+       bool "MOXA ART SoC"
+       depends on ARCH_MULTI_V4
+       depends on CPU_LITTLE_ENDIAN
+       select CPU_FA526
+       select ARM_DMA_MEM_BUFFERABLE
+       select FARADAY_FTINTC010
+       select FTTMR010_TIMER
+       select GPIOLIB
+       select PHYLIB if NETDEVICES
+       help
+         Say Y here if you want to run your kernel on hardware with a
+         MOXA ART SoC.
+         The MOXA ART SoC is based on a Faraday FA526 ARMv4 32-bit
+         192 MHz CPU with MMU and 16KB/8KB D/I-cache (UC-7112-LX).
+         Used on models UC-7101, UC-7112/UC-7110, IA240/IA241, IA3341.
+
+if ARCH_MOXART
+
+config MACH_UC7112LX
+       bool "MOXA UC-7112-LX"
+       depends on ARCH_MOXART
+       help
+         Say Y here if you intend to run this kernel on a MOXA
+         UC-7112-LX embedded computer.
+
+endif
+
 config ARCH_RDA
        bool "RDA Micro SoCs"
        depends on ARCH_MULTI_V7

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 5ba42f69f8ce0c1c3d8858f8124004041076d6a6..826738b7c7a772bcdab007646e79d96eabb429ad 100644 (file)
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -192,7 +192,6 @@ machine-$(CONFIG_ARCH_LPC18XX)              += lpc18xx
 machine-$(CONFIG_ARCH_LPC32XX)         += lpc32xx
 machine-$(CONFIG_ARCH_MESON)           += meson
 machine-$(CONFIG_ARCH_MMP)             += mmp
-machine-$(CONFIG_ARCH_MOXART)          += moxart
 machine-$(CONFIG_ARCH_MV78XX0)         += mv78xx0
 machine-$(CONFIG_ARCH_MVEBU)           += mvebu
 machine-$(CONFIG_ARCH_MXC)             += imx

diff --git a/arch/arm/mach-moxart/Kconfig b/arch/arm/mach-moxart/Kconfig
deleted file mode 100644 (file)
index 909c657..0000000
--- a/arch/arm/mach-moxart/Kconfig
+++ /dev/null
@@ -1,28 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-menuconfig ARCH_MOXART
-       bool "MOXA ART SoC"
-       depends on ARCH_MULTI_V4
-       depends on CPU_LITTLE_ENDIAN
-       select CPU_FA526
-       select ARM_DMA_MEM_BUFFERABLE
-       select FARADAY_FTINTC010
-       select FTTMR010_TIMER
-       select GPIOLIB
-       select PHYLIB if NETDEVICES
-       help
-         Say Y here if you want to run your kernel on hardware with a
-         MOXA ART SoC.
-         The MOXA ART SoC is based on a Faraday FA526 ARMv4 32-bit
-         192 MHz CPU with MMU and 16KB/8KB D/I-cache (UC-7112-LX).
-         Used on models UC-7101, UC-7112/UC-7110, IA240/IA241, IA3341.
-
-if ARCH_MOXART
-
-config MACH_UC7112LX
-       bool "MOXA UC-7112-LX"
-       depends on ARCH_MOXART
-       help
-         Say Y here if you intend to run this kernel on a MOXA
-         UC-7112-LX embedded computer.
-
-endif

diff --git a/arch/arm/mach-moxart/Makefile b/arch/arm/mach-moxart/Makefile
deleted file mode 100644 (file)
index ded3e38..0000000
--- a/arch/arm/mach-moxart/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-# Object file lists.
-
-obj-$(CONFIG_MACH_UC7112LX)    += moxart.o

diff --git a/arch/arm/mach-moxart/moxart.c b/arch/arm/mach-moxart/moxart.c
deleted file mode 100644 (file)
index f1f58c0..0000000
--- a/arch/arm/mach-moxart/moxart.c
+++ /dev/null
@@ -1,6 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * arch/arm/mach-moxart/moxart.c
- *
- * (C) Copyright 2013, Jonas Jensen <jonas.jensen@gmail.com>
- */