* [PATCH -queue 1/2] MIPS: Move Cobalt Makefile parts to their own Platform file
@ 2010-06-02 7:51 Yoichi Yuasa
2010-06-02 7:52 ` [PATCH -queue 2/2] MIPS: Move VR41xx " Yoichi Yuasa
2010-06-02 8:08 ` [PATCH -queue 1/2] MIPS: Move Cobalt " Ralf Baechle
0 siblings, 2 replies; 4+ messages in thread
From: Yoichi Yuasa @ 2010-06-02 7:51 UTC (permalink / raw)
To: Ralf Baechle; +Cc: yuasa, linux-mips
Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
---
arch/mips/Kbuild.platforms | 1 +
arch/mips/Makefile | 7 -------
arch/mips/cobalt/Makefile | 2 --
arch/mips/cobalt/Platform | 6 ++++++
4 files changed, 7 insertions(+), 9 deletions(-)
create mode 100644 arch/mips/cobalt/Platform
diff --git a/arch/mips/Kbuild.platforms b/arch/mips/Kbuild.platforms
index 77e48b9..6c163c2 100644
--- a/arch/mips/Kbuild.platforms
+++ b/arch/mips/Kbuild.platforms
@@ -2,6 +2,7 @@
platforms += alchemy
platforms += ar7
+platforms += cobalt
platforms += loongson
platforms += mipssim
platforms += sgi-ip27
diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index 090c969..6b6dc42 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -199,13 +199,6 @@ cflags-$(CONFIG_MACH_JAZZ) += -I$(srctree)/arch/mips/include/asm/mach-jazz
load-$(CONFIG_MACH_JAZZ) += 0xffffffff80080000
#
-# Cobalt Server
-#
-core-$(CONFIG_MIPS_COBALT) += arch/mips/cobalt/
-cflags-$(CONFIG_MIPS_COBALT) += -I$(srctree)/arch/mips/include/asm/mach-cobalt
-load-$(CONFIG_MIPS_COBALT) += 0xffffffff80080000
-
-#
# DECstation family
#
core-$(CONFIG_MACH_DECSTATION) += arch/mips/dec/
diff --git a/arch/mips/cobalt/Makefile b/arch/mips/cobalt/Makefile
index 2379262..61a334a 100644
--- a/arch/mips/cobalt/Makefile
+++ b/arch/mips/cobalt/Makefile
@@ -7,5 +7,3 @@ obj-y := buttons.o irq.o lcd.o led.o reset.o rtc.o serial.o setup.o time.o
obj-$(CONFIG_PCI) += pci.o
obj-$(CONFIG_EARLY_PRINTK) += console.o
obj-$(CONFIG_MTD_PHYSMAP) += mtd.o
-
-EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/cobalt/Platform b/arch/mips/cobalt/Platform
new file mode 100644
index 0000000..34123ef
--- /dev/null
+++ b/arch/mips/cobalt/Platform
@@ -0,0 +1,6 @@
+#
+# Cobalt Server
+#
+platform-$(CONFIG_MIPS_COBALT) += cobalt/
+cflags-$(CONFIG_MIPS_COBALT) += -I$(srctree)/arch/mips/include/asm/mach-cobalt
+load-$(CONFIG_MIPS_COBALT) += 0xffffffff80080000
--
1.7.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH -queue 2/2] MIPS: Move VR41xx Makefile parts to their own Platform file
2010-06-02 7:51 [PATCH -queue 1/2] MIPS: Move Cobalt Makefile parts to their own Platform file Yoichi Yuasa
@ 2010-06-02 7:52 ` Yoichi Yuasa
2010-06-02 8:08 ` Ralf Baechle
2010-06-02 8:08 ` [PATCH -queue 1/2] MIPS: Move Cobalt " Ralf Baechle
1 sibling, 1 reply; 4+ messages in thread
From: Yoichi Yuasa @ 2010-06-02 7:52 UTC (permalink / raw)
To: Ralf Baechle; +Cc: yuasa, linux-mips
Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
---
arch/mips/Kbuild.platforms | 1 +
arch/mips/Makefile | 33 ---------------------------------
arch/mips/vr41xx/Platform | 32 ++++++++++++++++++++++++++++++++
arch/mips/vr41xx/common/Makefile | 2 --
4 files changed, 33 insertions(+), 35 deletions(-)
create mode 100644 arch/mips/vr41xx/Platform
diff --git a/arch/mips/Kbuild.platforms b/arch/mips/Kbuild.platforms
index 6c163c2..9b6e8d7 100644
--- a/arch/mips/Kbuild.platforms
+++ b/arch/mips/Kbuild.platforms
@@ -6,6 +6,7 @@ platforms += cobalt
platforms += loongson
platforms += mipssim
platforms += sgi-ip27
+platforms += vr41xx
# include the platform specific files
include $(patsubst %, $(srctree)/arch/mips/%/Platform, $(platforms))
diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index 6b6dc42..6997faa 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -243,39 +243,6 @@ core-$(CONFIG_LASAT) += arch/mips/lasat/
cflags-$(CONFIG_LASAT) += -I$(srctree)/arch/mips/include/asm/mach-lasat
load-$(CONFIG_LASAT) += 0xffffffff80000000
-#
-# Common VR41xx
-#
-core-$(CONFIG_MACH_VR41XX) += arch/mips/vr41xx/common/
-cflags-$(CONFIG_MACH_VR41XX) += -I$(srctree)/arch/mips/include/asm/mach-vr41xx
-
-#
-# ZAO Networks Capcella (VR4131)
-#
-load-$(CONFIG_ZAO_CAPCELLA) += 0xffffffff80000000
-
-#
-# Victor MP-C303/304 (VR4122)
-#
-load-$(CONFIG_VICTOR_MPC30X) += 0xffffffff80001000
-
-#
-# IBM WorkPad z50 (VR4121)
-#
-core-$(CONFIG_IBM_WORKPAD) += arch/mips/vr41xx/ibm-workpad/
-load-$(CONFIG_IBM_WORKPAD) += 0xffffffff80004000
-
-#
-# CASIO CASSIPEIA E-55/65 (VR4111)
-#
-core-$(CONFIG_CASIO_E55) += arch/mips/vr41xx/casio-e55/
-load-$(CONFIG_CASIO_E55) += 0xffffffff80004000
-
-#
-# TANBAC VR4131 multichip module(TB0225) and TANBAC VR4131DIMM(TB0229) (VR4131)
-#
-load-$(CONFIG_TANBAC_TB022X) += 0xffffffff80000000
-
# NXP STB225
core-$(CONFIG_SOC_PNX833X) += arch/mips/nxp/pnx833x/common/
cflags-$(CONFIG_SOC_PNX833X) += -Iarch/mips/include/asm/mach-pnx833x
diff --git a/arch/mips/vr41xx/Platform b/arch/mips/vr41xx/Platform
new file mode 100644
index 0000000..b6c8d5c
--- /dev/null
+++ b/arch/mips/vr41xx/Platform
@@ -0,0 +1,32 @@
+#
+# NEC VR4100 series based machines
+#
+platform-$(CONFIG_MACH_VR41XX) += vr41xx/common/
+cflags-$(CONFIG_MACH_VR41XX) += -I$(srctree)/arch/mips/include/asm/mach-vr41xx
+
+#
+# CASIO CASSIPEIA E-55/65 (VR4111)
+#
+platform-$(CONFIG_CASIO_E55) += vr41xx/casio-e55/
+load-$(CONFIG_CASIO_E55) += 0xffffffff80004000
+
+#
+# IBM WorkPad z50 (VR4121)
+#
+platform-$(CONFIG_IBM_WORKPAD) += vr41xx/ibm-workpad/
+load-$(CONFIG_IBM_WORKPAD) += 0xffffffff80004000
+
+#
+# TANBAC VR4131 multichip module(TB0225) and TANBAC VR4131DIMM(TB0229) (VR4131)
+#
+load-$(CONFIG_TANBAC_TB022X) += 0xffffffff80000000
+
+#
+# Victor MP-C303/304 (VR4122)
+#
+load-$(CONFIG_VICTOR_MPC30X) += 0xffffffff80001000
+
+#
+# ZAO Networks Capcella (VR4131)
+#
+load-$(CONFIG_ZAO_CAPCELLA) += 0xffffffff80000000
diff --git a/arch/mips/vr41xx/common/Makefile b/arch/mips/vr41xx/common/Makefile
index 7d5d83b..d0d84ec 100644
--- a/arch/mips/vr41xx/common/Makefile
+++ b/arch/mips/vr41xx/common/Makefile
@@ -3,5 +3,3 @@
#
obj-y += bcu.o cmu.o giu.o icu.o init.o irq.o pmu.o rtc.o siu.o type.o
-
-EXTRA_CFLAGS += -Werror
--
1.7.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH -queue 1/2] MIPS: Move Cobalt Makefile parts to their own Platform file
2010-06-02 7:51 [PATCH -queue 1/2] MIPS: Move Cobalt Makefile parts to their own Platform file Yoichi Yuasa
2010-06-02 7:52 ` [PATCH -queue 2/2] MIPS: Move VR41xx " Yoichi Yuasa
@ 2010-06-02 8:08 ` Ralf Baechle
1 sibling, 0 replies; 4+ messages in thread
From: Ralf Baechle @ 2010-06-02 8:08 UTC (permalink / raw)
To: Yoichi Yuasa; +Cc: linux-mips
Queued for 2.6.36. Thanks Yoichi-San!
Ralf
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH -queue 2/2] MIPS: Move VR41xx Makefile parts to their own Platform file
2010-06-02 7:52 ` [PATCH -queue 2/2] MIPS: Move VR41xx " Yoichi Yuasa
@ 2010-06-02 8:08 ` Ralf Baechle
0 siblings, 0 replies; 4+ messages in thread
From: Ralf Baechle @ 2010-06-02 8:08 UTC (permalink / raw)
To: Yoichi Yuasa; +Cc: linux-mips
Queued for 2.6.36. Thanks Yoichi-San!
Ralf
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-06-02 8:09 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-06-02 7:51 [PATCH -queue 1/2] MIPS: Move Cobalt Makefile parts to their own Platform file Yoichi Yuasa
2010-06-02 7:52 ` [PATCH -queue 2/2] MIPS: Move VR41xx " Yoichi Yuasa
2010-06-02 8:08 ` Ralf Baechle
2010-06-02 8:08 ` [PATCH -queue 1/2] MIPS: Move Cobalt " Ralf Baechle
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).