MIPS: Sibyte: Migrate to new platform makefile style.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/arch/mips/Kbuild.platforms b/arch/mips/Kbuild.platforms
index 5a45333ecf9212d6e249d3f03b8863838277b8b8..e0fb3700ffd89c905c2d0e75c158f2fba3624231 100644 (file)
--- a/arch/mips/Kbuild.platforms
+++ b/arch/mips/Kbuild.platforms
@@ -18,6 +18,7 @@ platforms += rb532
 platforms += sgi-ip22
 platforms += sgi-ip27
 platforms += sgi-ip32
+platforms += sibyte
 platforms += sni
 platforms += vr41xx
 platforms += wrppmc

diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index b62d8323a0b77f4e7e554a4125400d1feaffb8e0..4cf72586162beeb28d0b8f988d33d5268870b601 100644 (file)
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -229,56 +229,6 @@ cflags-$(CONFIG_SOC_EMMA2RH)       += -I$(srctree)/arch/mips/include/asm/mach-emma2rh
 core-$(CONFIG_NEC_MARKEINS)    += arch/mips/emma/markeins/
 load-$(CONFIG_NEC_MARKEINS)    += 0xffffffff88100000
 
-#
-# Sibyte SB1250/BCM1480 SOC
-#
-# This is a LIB so that it links at the end, and initcalls are later
-# the sequence; but it is built as an object so that modules don't get
-# removed (as happens, even if they have __initcall/module_init)
-#
-core-$(CONFIG_SIBYTE_BCM112X)  += arch/mips/sibyte/sb1250/
-core-$(CONFIG_SIBYTE_BCM112X)  += arch/mips/sibyte/common/
-cflags-$(CONFIG_SIBYTE_BCM112X)        += -I$(srctree)/arch/mips/include/asm/mach-sibyte \
-                       -DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1250_112x_ALL
-
-core-$(CONFIG_SIBYTE_SB1250)   += arch/mips/sibyte/sb1250/
-core-$(CONFIG_SIBYTE_SB1250)   += arch/mips/sibyte/common/
-cflags-$(CONFIG_SIBYTE_SB1250) += -I$(srctree)/arch/mips/include/asm/mach-sibyte \
-                       -DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1250_112x_ALL
-
-core-$(CONFIG_SIBYTE_BCM1x55)  += arch/mips/sibyte/bcm1480/
-core-$(CONFIG_SIBYTE_BCM1x55)  += arch/mips/sibyte/common/
-cflags-$(CONFIG_SIBYTE_BCM1x55)        += -I$(srctree)/arch/mips/include/asm/mach-sibyte \
-                       -DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1480_ALL
-
-core-$(CONFIG_SIBYTE_BCM1x80)  += arch/mips/sibyte/bcm1480/
-core-$(CONFIG_SIBYTE_BCM1x80)  += arch/mips/sibyte/common/
-cflags-$(CONFIG_SIBYTE_BCM1x80)        += -I$(srctree)/arch/mips/include/asm/mach-sibyte \
-                       -DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1480_ALL
-
-#
-# Sibyte BCM91120x (Carmel) board
-# Sibyte BCM91120C (CRhine) board
-# Sibyte BCM91125C (CRhone) board
-# Sibyte BCM91125E (Rhone) board
-# Sibyte SWARM board
-# Sibyte BCM91x80 (BigSur) board
-#
-core-$(CONFIG_SIBYTE_CARMEL)   += arch/mips/sibyte/swarm/
-load-$(CONFIG_SIBYTE_CARMEL)   := 0xffffffff80100000
-core-$(CONFIG_SIBYTE_CRHINE)   += arch/mips/sibyte/swarm/
-load-$(CONFIG_SIBYTE_CRHINE)   := 0xffffffff80100000
-core-$(CONFIG_SIBYTE_CRHONE)   += arch/mips/sibyte/swarm/
-load-$(CONFIG_SIBYTE_CRHONE)   := 0xffffffff80100000
-core-$(CONFIG_SIBYTE_RHONE)    += arch/mips/sibyte/swarm/
-load-$(CONFIG_SIBYTE_RHONE)    := 0xffffffff80100000
-core-$(CONFIG_SIBYTE_SENTOSA)  += arch/mips/sibyte/swarm/
-load-$(CONFIG_SIBYTE_SENTOSA)  := 0xffffffff80100000
-core-$(CONFIG_SIBYTE_SWARM)    += arch/mips/sibyte/swarm/
-load-$(CONFIG_SIBYTE_SWARM)    := 0xffffffff80100000
-core-$(CONFIG_SIBYTE_BIGSUR)   += arch/mips/sibyte/swarm/
-load-$(CONFIG_SIBYTE_BIGSUR)   := 0xffffffff80100000
-
 #
 # Common TXx9
 #

diff --git a/arch/mips/sibyte/Makefile b/arch/mips/sibyte/Makefile
new file mode 100644 (file)
index 0000000..c8ed2c8
--- /dev/null
+++ b/arch/mips/sibyte/Makefile
@@ -0,0 +1,27 @@
+#
+# Sibyte SB1250 / BCM1480 family of SOCs
+#
+obj-$(CONFIG_SIBYTE_BCM112X)   += sb1250/
+obj-$(CONFIG_SIBYTE_BCM112X)   += common/
+obj-$(CONFIG_SIBYTE_SB1250)    += sb1250/
+obj-$(CONFIG_SIBYTE_SB1250)    += common/
+obj-$(CONFIG_SIBYTE_BCM1x55)   += bcm1480/
+obj-$(CONFIG_SIBYTE_BCM1x55)   += common/
+obj-$(CONFIG_SIBYTE_BCM1x80)   += bcm1480/
+obj-$(CONFIG_SIBYTE_BCM1x80)   += common/
+
+#
+# Sibyte BCM91120x (Carmel) board
+# Sibyte BCM91120C (CRhine) board
+# Sibyte BCM91125C (CRhone) board
+# Sibyte BCM91125E (Rhone) board
+# Sibyte SWARM board
+# Sibyte BCM91x80 (BigSur) board
+#
+obj-$(CONFIG_SIBYTE_CARMEL)    += swarm/
+obj-$(CONFIG_SIBYTE_CRHINE)    += swarm/
+obj-$(CONFIG_SIBYTE_CRHONE)    += swarm/
+obj-$(CONFIG_SIBYTE_RHONE)     += swarm/
+obj-$(CONFIG_SIBYTE_SENTOSA)   += swarm/
+obj-$(CONFIG_SIBYTE_SWARM)     += swarm/
+obj-$(CONFIG_SIBYTE_BIGSUR)    += swarm/

diff --git a/arch/mips/sibyte/Platform b/arch/mips/sibyte/Platform
new file mode 100644 (file)
index 0000000..911dfe3
--- /dev/null
+++ b/arch/mips/sibyte/Platform
@@ -0,0 +1,43 @@
+#
+# These are all rather similar so we consider them a single platform
+#
+platform-$(CONFIG_SIBYTE_BCM112X)      += sibyte/
+platform-$(CONFIG_SIBYTE_SB1250)       += sibyte/
+platform-$(CONFIG_SIBYTE_BCM1x55)      += sibyte/
+platform-$(CONFIG_SIBYTE_BCM1x80)      += sibyte/
+
+#
+# Sibyte SB1250 / BCM1480 family of SOCs
+#
+cflags-$(CONFIG_SIBYTE_BCM112X)        +=                                      \
+               -I$(srctree)/arch/mips/include/asm/mach-sibyte          \
+               -DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1250_112x_ALL
+
+platform-$(CONFIG_SIBYTE_SB1250)       += sibyte/
+cflags-$(CONFIG_SIBYTE_SB1250) +=                                      \
+               -I$(srctree)/arch/mips/include/asm/mach-sibyte          \
+               -DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1250_112x_ALL
+
+cflags-$(CONFIG_SIBYTE_BCM1x55)        +=                                      \
+               -I$(srctree)/arch/mips/include/asm/mach-sibyte          \
+               -DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1480_ALL
+
+cflags-$(CONFIG_SIBYTE_BCM1x80)        +=                                      \
+               -I$(srctree)/arch/mips/include/asm/mach-sibyte          \
+               -DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1480_ALL
+
+#
+# Sibyte BCM91120x (Carmel) board
+# Sibyte BCM91120C (CRhine) board
+# Sibyte BCM91125C (CRhone) board
+# Sibyte BCM91125E (Rhone) board
+# Sibyte SWARM board
+# Sibyte BCM91x80 (BigSur) board
+#
+load-$(CONFIG_SIBYTE_CARMEL)   := 0xffffffff80100000
+load-$(CONFIG_SIBYTE_CRHINE)   := 0xffffffff80100000
+load-$(CONFIG_SIBYTE_CRHONE)   := 0xffffffff80100000
+load-$(CONFIG_SIBYTE_RHONE)    := 0xffffffff80100000
+load-$(CONFIG_SIBYTE_SENTOSA)  := 0xffffffff80100000
+load-$(CONFIG_SIBYTE_SWARM)    := 0xffffffff80100000
+load-$(CONFIG_SIBYTE_BIGSUR)   := 0xffffffff80100000

diff --git a/arch/mips/sibyte/bcm1480/Makefile b/arch/mips/sibyte/bcm1480/Makefile
index f292f7df0cfb115043c9e250a8be5b493c1aa5b7..cdc4c56c3e29238158cafa0e09422780e46af1ac 100644 (file)
--- a/arch/mips/sibyte/bcm1480/Makefile
+++ b/arch/mips/sibyte/bcm1480/Makefile
@@ -1,5 +1,3 @@
 obj-y := setup.o irq.o time.o
 
 obj-$(CONFIG_SMP)                      += smp.o
-
-EXTRA_CFLAGS += -Werror

diff --git a/arch/mips/sibyte/common/Makefile b/arch/mips/sibyte/common/Makefile
index 4f659837c7c6c441cd8f0a894d5201bded85fc37..36aa700cc40c6773954306ac6ba49e8f77f0019d 100644 (file)
--- a/arch/mips/sibyte/common/Makefile
+++ b/arch/mips/sibyte/common/Makefile
@@ -1,5 +1,3 @@
 obj-y := cfe.o
 obj-$(CONFIG_SIBYTE_CFE_CONSOLE)       += cfe_console.o
 obj-$(CONFIG_SIBYTE_TBPROF)            += sb_tbprof.o
-
-EXTRA_CFLAGS += -Werror

diff --git a/arch/mips/sibyte/sb1250/Makefile b/arch/mips/sibyte/sb1250/Makefile
index 1896f4e77a300e0c2ce3f092605310c9a8e9202c..d3d969de407ba6be81175085a1577f566c94b088 100644 (file)
--- a/arch/mips/sibyte/sb1250/Makefile
+++ b/arch/mips/sibyte/sb1250/Makefile
@@ -2,5 +2,3 @@ obj-y := setup.o irq.o time.o
 
 obj-$(CONFIG_SMP)                      += smp.o
 obj-$(CONFIG_SIBYTE_BUS_WATCHER)       += bus_watcher.o
-
-EXTRA_CFLAGS += -Werror