---

yaml --- r: 204491 b: refs/heads/master c: 526a2fe h: refs/heads/master i: 204489: bbd9fbd 204487: a86b3d6 v: v3
git-mirror · Aug 5, 2010 · 1fcd3d3 · 1fcd3d3
1 parent e7a7190
commit 1fcd3d3
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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