MIPS: EMMA: Kconfig reorganization
authorShinya Kuribayashi <skuribay@ruby.dti.ne.jp>
Thu, 23 Oct 2008 21:00:01 +0000 (06:00 +0900)
committerRalf Baechle <ralf@linux-mips.org>
Mon, 27 Oct 2008 16:18:29 +0000 (16:18 +0000)
- Move EMMA related stuff into arch/mips/emma/Kconfig
- Create CONFIG_SOC_EMMA* to handle more EMMA SoCs effectively
- Rename CONFIG_MARKEINS into CONFIG_NEC_MARKEINS

Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/Kconfig
arch/mips/Makefile
arch/mips/emma/Kconfig [new file with mode: 0644]
arch/mips/emma2rh/common/Makefile
arch/mips/emma2rh/common/prom.c
arch/mips/emma2rh/markeins/Makefile
arch/mips/include/asm/emma2rh/emma2rh.h
arch/mips/pci/Makefile

index 16fc6155285a2de345ecd771eaded8d05948b71a..653574bc19cf0c52a99f0c5ef76145c61d52d1fa 100644 (file)
@@ -238,20 +238,8 @@ config MIPS_SIM
          This option enables support for MIPS Technologies MIPSsim software
          emulator.
 
-config MARKEINS
-       bool "NEC EMMA2RH Mark-eins"
-       select CEVT_R4K
-       select CSRC_R4K
-       select DMA_NONCOHERENT
-       select HW_HAS_PCI
-       select IRQ_CPU
-       select SWAP_IO_SPACE
-       select SYS_SUPPORTS_32BIT_KERNEL
-       select SYS_SUPPORTS_BIG_ENDIAN
-       select SYS_SUPPORTS_LITTLE_ENDIAN
-       select SYS_HAS_CPU_R5500
-       help
-         This enables support for the NEC Mark-eins board with VR5500 CPU.
+config MACH_EMMA
+       bool "NEC EMMA series based machines"
 
 config MACH_VR41XX
        bool "NEC VR4100 series based machines"
@@ -613,6 +601,7 @@ endchoice
 
 source "arch/mips/alchemy/Kconfig"
 source "arch/mips/basler/excite/Kconfig"
+source "arch/mips/emma/Kconfig"
 source "arch/mips/jazz/Kconfig"
 source "arch/mips/lasat/Kconfig"
 source "arch/mips/pmc-sierra/Kconfig"
index a21b12ce903da29e6106f1829686188436a58f03..041c4f2e088a0e5074ff63500df897ea9c4c9b0b 100644 (file)
@@ -409,14 +409,17 @@ load-$(CONFIG_PNX8550_JBS)        += 0xffffffff80060000
 libs-$(CONFIG_PNX8550_STB810)  += arch/mips/nxp/pnx8550/stb810/
 load-$(CONFIG_PNX8550_STB810)  += 0xffffffff80060000
 
+#
 # NEC EMMA2RH boards
 #
-core-$(CONFIG_EMMA2RH)          += arch/mips/emma2rh/common/
-cflags-$(CONFIG_EMMA2RH)        += -I$(srctree)/arch/mips/include/asm/mach-emma2rh
+core-$(CONFIG_SOC_EMMA2RH)     += arch/mips/emma2rh/common/
+cflags-$(CONFIG_SOC_EMMA2RH)   += -I$(srctree)/arch/mips/include/asm/mach-emma2rh
 
+#
 # NEC EMMA2RH Mark-eins
-core-$(CONFIG_MARKEINS)         += arch/mips/emma2rh/markeins/
-load-$(CONFIG_MARKEINS)         += 0xffffffff88100000
+#
+core-$(CONFIG_NEC_MARKEINS)    += arch/mips/emma2rh/markeins/
+load-$(CONFIG_NEC_MARKEINS)    += 0xffffffff88100000
 
 #
 # SGI IP22 (Indy/Indigo2)
diff --git a/arch/mips/emma/Kconfig b/arch/mips/emma/Kconfig
new file mode 100644 (file)
index 0000000..9669c72
--- /dev/null
@@ -0,0 +1,29 @@
+choice
+       prompt "Machine type"
+       depends on MACH_EMMA
+       default NEC_MARKEINS
+
+config NEC_MARKEINS
+       bool "NEC EMMA2RH Mark-eins board"
+       select SOC_EMMA2RH
+       select HW_HAS_PCI
+       help
+         This enables support for the NEC Electronics Mark-eins boards.
+
+endchoice
+
+config SOC_EMMA2RH
+       bool
+       select SOC_EMMA
+       select SYS_HAS_CPU_R5500
+       select SYS_SUPPORTS_32BIT_KERNEL
+       select SYS_SUPPORTS_64BIT_KERNEL
+
+config SOC_EMMA
+       bool
+       select CEVT_R4K
+       select CSRC_R4K
+       select DMA_NONCOHERENT
+       select IRQ_CPU
+       select SWAP_IO_SPACE
+       select SYS_SUPPORTS_BIG_ENDIAN
index 859121b3867d4097879b1db4b16619dfac6f0670..cb0fd328c61fc72c997f5b29a772a2d1f94b4926 100644 (file)
@@ -10,4 +10,4 @@
 #  (at your option) any later version.
 #
 
-obj-$(CONFIG_MARKEINS) += irq.o irq_emma2rh.o prom.o
+obj-$(CONFIG_NEC_MARKEINS)     += irq.o irq_emma2rh.o prom.o
index e14a2e3d8842e0a2704fb4a548a12b522cf15c49..97bf29e755a043b797779085c7e4cbde8ef42de7 100644 (file)
@@ -33,7 +33,7 @@
 
 const char *get_system_type(void)
 {
-#if defined(CONFIG_MARKEINS)
+#ifdef CONFIG_NEC_MARKEINS
        return "NEC EMMA2RH Mark-eins";
 #else
 #error  Unknown NEC board
@@ -60,7 +60,7 @@ void __init prom_init(void)
                strcat(arcs_cmdline, " ");
        }
 
-#if defined(CONFIG_MARKEINS)
+#ifdef CONFIG_NEC_MARKEINS
        add_memory_region(0, EMMA2RH_RAM_SIZE, BOOT_MEM_RAM);
 #else
 #error  Unknown NEC board
index 14fc268b175c02c986ce81ab9c0a2256bbea09fe..3c8b864f7bc58449c784e67876dbd9b60b4ef7f5 100644 (file)
@@ -10,4 +10,4 @@
 #  (at your option) any later version.
 #
 
-obj-$(CONFIG_MARKEINS) += irq.o irq_markeins.o setup.o led.o platform.o
+obj-$(CONFIG_NEC_MARKEINS) += irq.o irq_markeins.o setup.o led.o platform.o
index 6a1af0af51e3b221e57ec02761d865914677afe1..5d79669b3b732a09222f977622e8490380f631ac 100644 (file)
@@ -324,7 +324,7 @@ static inline u8 emma2rh_in8(u32 offset)
 /*
  * include the board dependent part
  */
-#if defined(CONFIG_MARKEINS)
+#ifdef CONFIG_NEC_MARKEINS
 #include <asm/emma2rh/markeins.h>
 #else
 #error "Unknown EMMA2RH board!"
index b1886244cedf1d29c231d4df8963bff8c158c959..e8a97f59e0661e585fc40565212d0e7d74130d1f 100644 (file)
@@ -13,7 +13,7 @@ obj-$(CONFIG_MIPS_MSC)                += ops-msc.o
 obj-$(CONFIG_MIPS_NILE4)       += ops-nile4.o
 obj-$(CONFIG_SOC_TX3927)       += ops-tx3927.o
 obj-$(CONFIG_PCI_VR41XX)       += ops-vr41xx.o pci-vr41xx.o
-obj-$(CONFIG_MARKEINS)         += ops-emma2rh.o pci-emma2rh.o fixup-emma2rh.o
+obj-$(CONFIG_NEC_MARKEINS)     += ops-emma2rh.o pci-emma2rh.o fixup-emma2rh.o
 obj-$(CONFIG_PCI_TX4927)       += ops-tx4927.o
 obj-$(CONFIG_BCM47XX)          += pci-bcm47xx.o