---

yaml --- r: 101450 b: refs/heads/master c: 315806c h: refs/heads/master v: v3
git-mirror · Jul 15, 2008 · 2e8f3dc · 2e8f3dc
1 parent add9452
commit 2e8f3dc
Show file tree

Hide file tree

Showing 26 changed files with 24 additions and 60 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eda49eeebf263f3a34f6968959fc2e4825b42beb
+refs/heads/master: 315806cb19f9d375dccbc2d60fa14e16afdcd5ac
diff --git a/trunk/arch/mips/Makefile b/trunk/arch/mips/Makefile
@@ -307,9 +307,8 @@ cflags-$(CONFIG_LEMOTE_FULONG) += -Iinclude/asm-mips/mach-lemote
 #
 # MIPS Malta board
 #
-core-$(CONFIG_MIPS_MALTA)	+= arch/mips/mips-boards/generic/	\
-				   arch/mips/mips-boards/malta/
-cflags-$(CONFIG_MIPS_MALTA)	+= -Iinclude/asm-mips/mach-mips
+core-$(CONFIG_MIPS_MALTA)	+= arch/mips/mti-malta/
+cflags-$(CONFIG_MIPS_MALTA)	+= -Iinclude/asm-mips/mach-malta
 load-$(CONFIG_MIPS_MALTA)	+= 0xffffffff80100000
 all-$(CONFIG_MIPS_MALTA)	:= vmlinux.bin
 

diff --git a/trunk/arch/mips/mips-boards/generic/Makefile b/trunk/arch/mips/mips-boards/generic/Makefile
diff --git a/trunk/arch/mips/mips-boards/malta/Makefile b/trunk/arch/mips/mips-boards/malta/Makefile
diff --git a/trunk/arch/mips/mti-malta/Makefile b/trunk/arch/mips/mti-malta/Makefile
@@ -0,0 +1,21 @@
+#
+# Carsten Langgaard, carstenl@mips.com
+# Copyright (C) 1999,2000 MIPS Technologies, Inc.  All rights reserved.
+#
+# Copyright (C) 2008 Wind River Systems, Inc.
+#   written by Ralf Baechle <ralf@linux-mips.org>
+#
+obj-y				:= malta-amon.o malta-cmdline.o \
+				   malta-display.o malta-init.o malta-int.o \
+				   malta-memory.o malta-mtd.o \
+				   malta-platform.o malta-reset.o \
+				   malta-setup.o malta-time.o
+
+obj-$(CONFIG_EARLY_PRINTK)	+= malta-console.o
+obj-$(CONFIG_PCI)		+= malta-pci.o
+obj-$(CONFIG_KGDB)		+= malta-kgdb.o
+
+# FIXME FIXME FIXME
+obj-$(CONFIG_MIPS_MT_SMTC)	+= malta_smtc.o
+
+EXTRA_CFLAGS += -Werror
diff --git a/trunk/arch/mips/mips-boards/generic/amon.c → trunk/arch/mips/mti-malta/malta-amon.c b/trunk/arch/mips/mips-boards/generic/amon.c → trunk/arch/mips/mti-malta/malta-amon.c
diff --git a/...k/arch/mips/mips-boards/generic/cmdline.c → trunk/arch/mips/mti-malta/malta-cmdline.c b/...k/arch/mips/mips-boards/generic/cmdline.c → trunk/arch/mips/mti-malta/malta-cmdline.c
diff --git a/...k/arch/mips/mips-boards/generic/console.c → trunk/arch/mips/mti-malta/malta-console.c b/...k/arch/mips/mips-boards/generic/console.c → trunk/arch/mips/mti-malta/malta-console.c
diff --git a/...k/arch/mips/mips-boards/generic/display.c → trunk/arch/mips/mti-malta/malta-display.c b/...k/arch/mips/mips-boards/generic/display.c → trunk/arch/mips/mti-malta/malta-display.c
diff --git a/trunk/arch/mips/mips-boards/generic/init.c → trunk/arch/mips/mti-malta/malta-init.c b/trunk/arch/mips/mips-boards/generic/init.c → trunk/arch/mips/mti-malta/malta-init.c
diff --git a/...k/arch/mips/mips-boards/malta/malta_int.c → trunk/arch/mips/mti-malta/malta-int.c b/...k/arch/mips/mips-boards/malta/malta_int.c → trunk/arch/mips/mti-malta/malta-int.c
diff --git a/.../arch/mips/mips-boards/generic/gdb_hook.c → trunk/arch/mips/mti-malta/malta-kgdb.c b/.../arch/mips/mips-boards/generic/gdb_hook.c → trunk/arch/mips/mti-malta/malta-kgdb.c
diff --git a/trunk/arch/mips/mips-boards/generic/memory.c → trunk/arch/mips/mti-malta/malta-memory.c b/trunk/arch/mips/mips-boards/generic/memory.c → trunk/arch/mips/mti-malta/malta-memory.c
diff --git a/...k/arch/mips/mips-boards/malta/malta_mtd.c → trunk/arch/mips/mti-malta/malta-mtd.c b/...k/arch/mips/mips-boards/malta/malta_mtd.c → trunk/arch/mips/mti-malta/malta-mtd.c
diff --git a/trunk/arch/mips/mips-boards/generic/pci.c → trunk/arch/mips/mti-malta/malta-pci.c b/trunk/arch/mips/mips-boards/generic/pci.c → trunk/arch/mips/mti-malta/malta-pci.c
diff --git a/...h/mips/mips-boards/malta/malta_platform.c → trunk/arch/mips/mti-malta/malta-platform.c b/...h/mips/mips-boards/malta/malta_platform.c → trunk/arch/mips/mti-malta/malta-platform.c
diff --git a/trunk/arch/mips/mips-boards/generic/reset.c → trunk/arch/mips/mti-malta/malta-reset.c b/trunk/arch/mips/mips-boards/generic/reset.c → trunk/arch/mips/mti-malta/malta-reset.c
diff --git a/...arch/mips/mips-boards/malta/malta_setup.c → trunk/arch/mips/mti-malta/malta-setup.c b/...arch/mips/mips-boards/malta/malta_setup.c → trunk/arch/mips/mti-malta/malta-setup.c
diff --git a/.../arch/mips/mips-boards/malta/malta_smtc.c → trunk/arch/mips/mti-malta/malta-smtc.c b/.../arch/mips/mips-boards/malta/malta_smtc.c → trunk/arch/mips/mti-malta/malta-smtc.c
diff --git a/trunk/arch/mips/mips-boards/generic/time.c → trunk/arch/mips/mti-malta/malta-time.c b/trunk/arch/mips/mips-boards/generic/time.c → trunk/arch/mips/mti-malta/malta-time.c
diff --git a/...sm-mips/mach-mips/cpu-feature-overrides.h → ...m-mips/mach-malta/cpu-feature-overrides.h b/...sm-mips/mach-mips/cpu-feature-overrides.h → ...m-mips/mach-malta/cpu-feature-overrides.h
diff --git a/trunk/include/asm-mips/mach-mips/irq.h → trunk/include/asm-mips/mach-malta/irq.h b/trunk/include/asm-mips/mach-mips/irq.h → trunk/include/asm-mips/mach-malta/irq.h
diff --git a/...de/asm-mips/mach-mips/kernel-entry-init.h → ...e/asm-mips/mach-malta/kernel-entry-init.h b/...de/asm-mips/mach-mips/kernel-entry-init.h → ...e/asm-mips/mach-malta/kernel-entry-init.h
diff --git a/...include/asm-mips/mach-mips/mach-gt64120.h → ...nclude/asm-mips/mach-malta/mach-gt64120.h b/...include/asm-mips/mach-mips/mach-gt64120.h → ...nclude/asm-mips/mach-malta/mach-gt64120.h
diff --git a/.../include/asm-mips/mach-mips/mc146818rtc.h → ...include/asm-mips/mach-malta/mc146818rtc.h b/.../include/asm-mips/mach-mips/mc146818rtc.h → ...include/asm-mips/mach-malta/mc146818rtc.h
diff --git a/trunk/include/asm-mips/mach-mips/war.h → trunk/include/asm-mips/mach-malta/war.h b/trunk/include/asm-mips/mach-mips/war.h → trunk/include/asm-mips/mach-malta/war.h