diff --git a/arch/mips/Kbuild.platforms b/arch/mips/Kbuild.platforms
index 8985487b3deff3a0d6c018341d43bcd14209ab3f..6f007c30bfb8ea647509c79708b831fbf21847f9 100644
--- a/arch/mips/Kbuild.platforms
+++ b/arch/mips/Kbuild.platforms
@@ -14,6 +14,7 @@ platforms += loongson
 platforms += mipssim
 platforms += mti-malta
 platforms += pmc-sierra
+platforms += pnx833x
 platforms += powertv
 platforms += rb532
 platforms += sgi-ip22
diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index 4ba8070ef4f257fd8da3bd31321478498f3044b6..17f93314b94e8815b0f761566fd64eec6f80d72f 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -191,14 +191,6 @@ endif
 #
 include $(srctree)/arch/mips/Kbuild.platforms
 
-# NXP STB225
-core-$(CONFIG_SOC_PNX833X)		+= arch/mips/pnx833x/common/
-cflags-$(CONFIG_SOC_PNX833X)	+= -Iarch/mips/include/asm/mach-pnx833x
-core-$(CONFIG_NXP_STB220)		+= arch/mips/pnx833x/stb22x/
-load-$(CONFIG_NXP_STB220)		+= 0xffffffff80001000
-core-$(CONFIG_NXP_STB225)		+= arch/mips/pnx833x/stb22x/
-load-$(CONFIG_NXP_STB225)		+= 0xffffffff80001000
-
 #
 # Common NXP PNX8550
 #
diff --git a/arch/mips/pnx833x/Makefile b/arch/mips/pnx833x/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..02c4698cab05332b211fff3f06777aad473345e4
--- /dev/null
+++ b/arch/mips/pnx833x/Makefile
@@ -0,0 +1,3 @@
+obj-$(CONFIG_SOC_PNX833X)	+= common/
+obj-$(CONFIG_NXP_STB220)	+= stb22x/
+obj-$(CONFIG_NXP_STB225)	+= stb22x/
diff --git a/arch/mips/pnx833x/Platform b/arch/mips/pnx833x/Platform
new file mode 100644
index 0000000000000000000000000000000000000000..7e6ec4dbc8ddb16b769f90b02601e4625a1ad162
--- /dev/null
+++ b/arch/mips/pnx833x/Platform
@@ -0,0 +1,5 @@
+# NXP STB225
+platform-$(CONFIG_SOC_PNX833X)	+= pnx833x/
+cflags-$(CONFIG_SOC_PNX833X)    += -Iarch/mips/include/asm/mach-pnx833x
+load-$(CONFIG_NXP_STB220)	+= 0xffffffff80001000
+load-$(CONFIG_NXP_STB225)	+= 0xffffffff80001000
diff --git a/arch/mips/pnx833x/common/Makefile b/arch/mips/pnx833x/common/Makefile
index 4a16f3b503b55b0919b7fe12422396c5d0f5560f..1a46dd291b16d3cfc193ae0df59d18de1ac67c80 100644
--- a/arch/mips/pnx833x/common/Makefile
+++ b/arch/mips/pnx833x/common/Makefile
@@ -1,3 +1 @@
 obj-y := interrupts.o platform.o prom.o setup.o reset.o
-
-EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/pnx833x/stb22x/Makefile b/arch/mips/pnx833x/stb22x/Makefile
index 0c4df9f22098a9a4832411e6159e04a2e2e3e249..7b580060de50f02ec34cb0881433bddd2e5390aa 100644
--- a/arch/mips/pnx833x/stb22x/Makefile
+++ b/arch/mips/pnx833x/stb22x/Makefile
@@ -1,3 +1 @@
 obj-y := board.o
-
-EXTRA_CFLAGS += -Werror