4 files changed, 11 insertions, 12 deletions

diff --git a/arch/mips/Kbuild.platforms b/arch/mips/Kbuild.platforms
index a4bda755c3a6..8985487b3def 100644
--- a/arch/mips/Kbuild.platforms
+++ b/arch/mips/Kbuild.platforms
@@ -7,6 +7,7 @@ platforms += bcm63xx
 platforms += cavium-octeon
 platforms += cobalt
 platforms += dec
+platforms += emma
 platforms += jazz
 platforms += lasat
 platforms += loongson
diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index e136e6204d87..2ba20d97c660 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -217,18 +217,6 @@ load-$(CONFIG_PNX8550_JBS)	+= 0xffffffff80060000
 libs-$(CONFIG_PNX8550_STB810)   += arch/mips/nxp/pnx8550/stb810/
 load-$(CONFIG_PNX8550_STB810)   += 0xffffffff80060000
 
-#
-# Common NEC EMMAXXX
-#
-core-$(CONFIG_SOC_EMMA2RH)      += arch/mips/emma/common/
-cflags-$(CONFIG_SOC_EMMA2RH)    += -I$(srctree)/arch/mips/include/asm/mach-emma2rh
-
-#
-# NEC EMMA2RH Mark-eins
-#
-core-$(CONFIG_NEC_MARKEINS)     += arch/mips/emma/markeins/
-load-$(CONFIG_NEC_MARKEINS)     += 0xffffffff88100000
-
 cflags-y                        += -I$(srctree)/arch/mips/include/asm/mach-generic
 drivers-$(CONFIG_PCI)           += arch/mips/pci/
 
diff --git a/arch/mips/emma/Makefile b/arch/mips/emma/Makefile
new file mode 100644
index 000000000000..4254a31edb09
--- /dev/null
+++ b/arch/mips/emma/Makefile
@@ -0,0 +1,6 @@
+obj-$(CONFIG_SOC_EMMA2RH)       += common/
+
+#
+# NEC EMMA2RH Mark-eins
+#
+obj-$(CONFIG_NEC_MARKEINS)      += markeins/
diff --git a/arch/mips/emma/Platform b/arch/mips/emma/Platform
new file mode 100644
index 000000000000..0282f7f99b88
--- /dev/null
+++ b/arch/mips/emma/Platform
@@ -0,0 +1,4 @@
+platform-$(CONFIG_SOC_EMMA2RH)  += emma/
+cflags-$(CONFIG_SOC_EMMA2RH)    +=                                      \
+                -I$(srctree)/arch/mips/include/asm/mach-emma2rh
+load-$(CONFIG_NEC_MARKEINS)     += 0xffffffff88100000