From 1fcd3d3224c45982ae06f0f5912c8d4b21019f71 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Thu, 5 Aug 2010 13:25:45 +0100
Subject: [PATCH] --- yaml --- r: 204491 b: refs/heads/master c:
 526a2fe2f5d887ef8b89243c3a5e64f0f38c21cc h: refs/heads/master i:   204489:
 bbd9fbda92fa169f1f65dd8f15754f2f2a825d56   204487:
 a86b3d6849cc124d6a2852283d87f61628e4f923 v: v3

---
 [refs]                           | 2 +-
 trunk/arch/mips/Kbuild.platforms | 1 +
 trunk/arch/mips/Makefile         | 7 -------
 trunk/arch/mips/mipssim/Makefile | 2 --
 trunk/arch/mips/mipssim/Platform | 6 ++++++
 5 files changed, 8 insertions(+), 10 deletions(-)
 create mode 100644 trunk/arch/mips/mipssim/Platform

diff --git a/[refs] b/[refs]
index 4106982462df..8a631b55aae8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 28c945c88676bf71ec649429f2c1c4ce3719cd7c
+refs/heads/master: 526a2fe2f5d887ef8b89243c3a5e64f0f38c21cc
diff --git a/trunk/arch/mips/Kbuild.platforms b/trunk/arch/mips/Kbuild.platforms
index 9784c4941c9f..13244f326fff 100644
--- a/trunk/arch/mips/Kbuild.platforms
+++ b/trunk/arch/mips/Kbuild.platforms
@@ -2,6 +2,7 @@
 
 platforms += ar7
 platforms += loongson
+platforms += mipssim
 
 # include the platform specific files
 include $(patsubst %, $(srctree)/arch/mips/%/Platform, $(platforms))
diff --git a/trunk/arch/mips/Makefile b/trunk/arch/mips/Makefile
index 3eafe7fcb27c..cc2ae36a4546 100644
--- a/trunk/arch/mips/Makefile
+++ b/trunk/arch/mips/Makefile
@@ -333,13 +333,6 @@ cflags-$(CONFIG_MIPS_MALTA)	+= -I$(srctree)/arch/mips/include/asm/mach-malta
 load-$(CONFIG_MIPS_MALTA)	+= 0xffffffff80100000
 all-$(CONFIG_MIPS_MALTA)	:= $(COMPRESSION_FNAME).bin
 
-#
-# MIPS SIM
-#
-core-$(CONFIG_MIPS_SIM)		+= arch/mips/mipssim/
-cflags-$(CONFIG_MIPS_SIM)	+= -I$(srctree)/arch/mips/include/asm/mach-mipssim
-load-$(CONFIG_MIPS_SIM)		+= 0x80100000
-
 #
 # PMC-Sierra MSP SOCs
 #
diff --git a/trunk/arch/mips/mipssim/Makefile b/trunk/arch/mips/mipssim/Makefile
index 41b96571315e..01410a3f1729 100644
--- a/trunk/arch/mips/mipssim/Makefile
+++ b/trunk/arch/mips/mipssim/Makefile
@@ -21,5 +21,3 @@ obj-y := sim_platform.o sim_setup.o sim_mem.o sim_time.o sim_int.o
 
 obj-$(CONFIG_EARLY_PRINTK) += sim_console.o
 obj-$(CONFIG_MIPS_MT_SMTC) += sim_smtc.o
-
-EXTRA_CFLAGS += -Werror
diff --git a/trunk/arch/mips/mipssim/Platform b/trunk/arch/mips/mipssim/Platform
new file mode 100644
index 000000000000..3df60b8a12ef
--- /dev/null
+++ b/trunk/arch/mips/mipssim/Platform
@@ -0,0 +1,6 @@
+#
+# MIPS SIM
+#
+platform-$(CONFIG_MIPS_SIM)	+= mipssim/
+cflags-$(CONFIG_MIPS_SIM)	+= -I$(srctree)/arch/mips/include/asm/mach-mipssim
+load-$(CONFIG_MIPS_SIM)		+= 0x80100000