Merge branch 'kbuild/rc-fixes' into kbuild/kconfig

We need to revert the temporary hack in 71ebc01, hence the merge.

5 files changed, 70 insertions, 6 deletions

diff --git a/arch/mips/sibyte/Makefile b/arch/mips/sibyte/Makefile
new file mode 100644
index 000000000000..c8ed2c807e69
--- /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
index 000000000000..911dfe39c631
--- /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 f292f7df0cfb..cdc4c56c3e29 100644
--- 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 4f659837c7c6..36aa700cc40c 100644
--- 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 1896f4e77a30..d3d969de407b 100644
--- 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