MIPS: JZ4740: introduce CONFIG_MACH_INGENIC

In preparation for supporting Ingenic SoCs other than the JZ4740,
introduce MACH_INGENIC to Kconfig & move MACH_JZ4740 to a separate
entry selected by the board when appropriate. This allows MACH_INGENIC
to be used to enable things generic across Ingenic SoCs.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Cc: Andrew Bresticker <abrestic@chromium.org>
Patchwork: https://patchwork.linux-mips.org/patch/10130/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 76efb02ae99f3fe165f5162d3c2920e566ec4aee..006d8147ed611adf35c5cbf1e17f2a58e61d1ae1 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -289,9 +289,8 @@ config MACH_JAZZ
         Members include the Acer PICA, MIPS Magnum 4000, MIPS Millennium and
         Olivetti M700-10 workstations.
 
-config MACH_JZ4740
-       bool "Ingenic JZ4740 based machines"
-       select SYS_HAS_CPU_MIPS32_R1
+config MACH_INGENIC
+       bool "Ingenic SoC based machines"
        select SYS_SUPPORTS_32BIT_KERNEL
        select SYS_SUPPORTS_LITTLE_ENDIAN
        select SYS_SUPPORTS_ZBOOT_UART16550

diff --git a/arch/mips/configs/qi_lb60_defconfig b/arch/mips/configs/qi_lb60_defconfig
index 2b965470c35b94331e7751149bc545450c2990fb..1139b899f96a5f1d857763918a45d824a94b4b16 100644 (file)
--- a/arch/mips/configs/qi_lb60_defconfig
+++ b/arch/mips/configs/qi_lb60_defconfig
@@ -1,4 +1,4 @@
-CONFIG_MACH_JZ4740=y
+CONFIG_MACH_INGENIC=y
 # CONFIG_COMPACTION is not set
 # CONFIG_CROSS_MEMORY_ATTACH is not set
 CONFIG_HZ_100=y

diff --git a/arch/mips/jz4740/Kconfig b/arch/mips/jz4740/Kconfig
index 4689030538839b796cd76567b495bef494a8c0e7..dff0966284c438fa4f9884ed11ef69f164272270 100644 (file)
--- a/arch/mips/jz4740/Kconfig
+++ b/arch/mips/jz4740/Kconfig
@@ -1,9 +1,14 @@
 choice
        prompt "Machine type"
-       depends on MACH_JZ4740
+       depends on MACH_INGENIC
        default JZ4740_QI_LB60
 
 config JZ4740_QI_LB60
        bool "Qi Hardware Ben NanoNote"
+       select MACH_JZ4740
 
 endchoice
+
+config MACH_JZ4740
+       bool
+       select SYS_HAS_CPU_MIPS32_R1

diff --git a/arch/mips/jz4740/Platform b/arch/mips/jz4740/Platform
index c41d30080098e2acfa267cf44980441c7342c48d..28448d358c10d42c6ed5600ed3a5e5d67919e7e5 100644 (file)
--- a/arch/mips/jz4740/Platform
+++ b/arch/mips/jz4740/Platform
@@ -1,4 +1,4 @@
-platform-$(CONFIG_MACH_JZ4740) += jz4740/
-cflags-$(CONFIG_MACH_JZ4740)   += -I$(srctree)/arch/mips/include/asm/mach-jz4740
-load-$(CONFIG_MACH_JZ4740)     += 0xffffffff80010000
-zload-$(CONFIG_MACH_JZ4740)    += 0xffffffff80600000
+platform-$(CONFIG_MACH_INGENIC)        += jz4740/
+cflags-$(CONFIG_MACH_INGENIC)  += -I$(srctree)/arch/mips/include/asm/mach-jz4740
+load-$(CONFIG_MACH_INGENIC)    += 0xffffffff80010000
+zload-$(CONFIG_MACH_INGENIC)   += 0xffffffff80600000