aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2010-08-05 08:25:55 -0400
committerRalf Baechle <ralf@linux-mips.org>2010-08-05 08:25:55 -0400
commit34f5c1c5787bd13a3fbfc284ff7f719846427b9d (patch)
tree094b0b56de8af5bffbfb1752662745b34882b472
parentf6e1db1b87a9199275694d10713d4baa80030fc7 (diff)
MIPS: Sibyte: Migrate to new platform makefile style.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat
-rw-r--r--arch/mips/Kbuild.platforms1
-rw-r--r--arch/mips/Makefile50
-rw-r--r--arch/mips/sibyte/Makefile27
-rw-r--r--arch/mips/sibyte/Platform43
-rw-r--r--arch/mips/sibyte/bcm1480/Makefile2
-rw-r--r--arch/mips/sibyte/common/Makefile2
-rw-r--r--arch/mips/sibyte/sb1250/Makefile2
7 files changed, 71 insertions, 56 deletions
diff --git a/arch/mips/Kbuild.platforms b/arch/mips/Kbuild.platforms
index 5a45333ecf9..e0fb3700ffd 100644
--- a/arch/mips/Kbuild.platforms
+++ b/arch/mips/Kbuild.platforms
@@ -18,6 +18,7 @@ platforms += rb532
18platforms += sgi-ip22 18platforms += sgi-ip22
19platforms += sgi-ip27 19platforms += sgi-ip27
20platforms += sgi-ip32 20platforms += sgi-ip32
21platforms += sibyte
21platforms += sni 22platforms += sni
22platforms += vr41xx 23platforms += vr41xx
23platforms += wrppmc 24platforms += wrppmc
diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index b62d8323a0b..4cf72586162 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -230,56 +230,6 @@ core-$(CONFIG_NEC_MARKEINS) += arch/mips/emma/markeins/
230load-$(CONFIG_NEC_MARKEINS) += 0xffffffff88100000 230load-$(CONFIG_NEC_MARKEINS) += 0xffffffff88100000
231 231
232# 232#
233# Sibyte SB1250/BCM1480 SOC
234#
235# This is a LIB so that it links at the end, and initcalls are later
236# the sequence; but it is built as an object so that modules don't get
237# removed (as happens, even if they have __initcall/module_init)
238#
239core-$(CONFIG_SIBYTE_BCM112X) += arch/mips/sibyte/sb1250/
240core-$(CONFIG_SIBYTE_BCM112X) += arch/mips/sibyte/common/
241cflags-$(CONFIG_SIBYTE_BCM112X) += -I$(srctree)/arch/mips/include/asm/mach-sibyte \
242 -DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1250_112x_ALL
243
244core-$(CONFIG_SIBYTE_SB1250) += arch/mips/sibyte/sb1250/
245core-$(CONFIG_SIBYTE_SB1250) += arch/mips/sibyte/common/
246cflags-$(CONFIG_SIBYTE_SB1250) += -I$(srctree)/arch/mips/include/asm/mach-sibyte \
247 -DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1250_112x_ALL
248
249core-$(CONFIG_SIBYTE_BCM1x55) += arch/mips/sibyte/bcm1480/
250core-$(CONFIG_SIBYTE_BCM1x55) += arch/mips/sibyte/common/
251cflags-$(CONFIG_SIBYTE_BCM1x55) += -I$(srctree)/arch/mips/include/asm/mach-sibyte \
252 -DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1480_ALL
253
254core-$(CONFIG_SIBYTE_BCM1x80) += arch/mips/sibyte/bcm1480/
255core-$(CONFIG_SIBYTE_BCM1x80) += arch/mips/sibyte/common/
256cflags-$(CONFIG_SIBYTE_BCM1x80) += -I$(srctree)/arch/mips/include/asm/mach-sibyte \
257 -DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1480_ALL
258
259#
260# Sibyte BCM91120x (Carmel) board
261# Sibyte BCM91120C (CRhine) board
262# Sibyte BCM91125C (CRhone) board
263# Sibyte BCM91125E (Rhone) board
264# Sibyte SWARM board
265# Sibyte BCM91x80 (BigSur) board
266#
267core-$(CONFIG_SIBYTE_CARMEL) += arch/mips/sibyte/swarm/
268load-$(CONFIG_SIBYTE_CARMEL) := 0xffffffff80100000
269core-$(CONFIG_SIBYTE_CRHINE) += arch/mips/sibyte/swarm/
270load-$(CONFIG_SIBYTE_CRHINE) := 0xffffffff80100000
271core-$(CONFIG_SIBYTE_CRHONE) += arch/mips/sibyte/swarm/
272load-$(CONFIG_SIBYTE_CRHONE) := 0xffffffff80100000
273core-$(CONFIG_SIBYTE_RHONE) += arch/mips/sibyte/swarm/
274load-$(CONFIG_SIBYTE_RHONE) := 0xffffffff80100000
275core-$(CONFIG_SIBYTE_SENTOSA) += arch/mips/sibyte/swarm/
276load-$(CONFIG_SIBYTE_SENTOSA) := 0xffffffff80100000
277core-$(CONFIG_SIBYTE_SWARM) += arch/mips/sibyte/swarm/
278load-$(CONFIG_SIBYTE_SWARM) := 0xffffffff80100000
279core-$(CONFIG_SIBYTE_BIGSUR) += arch/mips/sibyte/swarm/
280load-$(CONFIG_SIBYTE_BIGSUR) := 0xffffffff80100000
281
282#
283# Common TXx9 233# Common TXx9
284# 234#
285core-$(CONFIG_MACH_TX39XX) += arch/mips/txx9/generic/ 235core-$(CONFIG_MACH_TX39XX) += arch/mips/txx9/generic/
diff --git a/arch/mips/sibyte/Makefile b/arch/mips/sibyte/Makefile
new file mode 100644
index 00000000000..c8ed2c807e6
--- /dev/null
+++ b/arch/mips/sibyte/Makefile
@@ -0,0 +1,27 @@
1#
2# Sibyte SB1250 / BCM1480 family of SOCs
3#
4obj-$(CONFIG_SIBYTE_BCM112X) += sb1250/
5obj-$(CONFIG_SIBYTE_BCM112X) += common/
6obj-$(CONFIG_SIBYTE_SB1250) += sb1250/
7obj-$(CONFIG_SIBYTE_SB1250) += common/
8obj-$(CONFIG_SIBYTE_BCM1x55) += bcm1480/
9obj-$(CONFIG_SIBYTE_BCM1x55) += common/
10obj-$(CONFIG_SIBYTE_BCM1x80) += bcm1480/
11obj-$(CONFIG_SIBYTE_BCM1x80) += common/
12
13#
14# Sibyte BCM91120x (Carmel) board
15# Sibyte BCM91120C (CRhine) board
16# Sibyte BCM91125C (CRhone) board
17# Sibyte BCM91125E (Rhone) board
18# Sibyte SWARM board
19# Sibyte BCM91x80 (BigSur) board
20#
21obj-$(CONFIG_SIBYTE_CARMEL) += swarm/
22obj-$(CONFIG_SIBYTE_CRHINE) += swarm/
23obj-$(CONFIG_SIBYTE_CRHONE) += swarm/
24obj-$(CONFIG_SIBYTE_RHONE) += swarm/
25obj-$(CONFIG_SIBYTE_SENTOSA) += swarm/
26obj-$(CONFIG_SIBYTE_SWARM) += swarm/
27obj-$(CONFIG_SIBYTE_BIGSUR) += swarm/
diff --git a/arch/mips/sibyte/Platform b/arch/mips/sibyte/Platform
new file mode 100644
index 00000000000..911dfe39c63
--- /dev/null
+++ b/arch/mips/sibyte/Platform
@@ -0,0 +1,43 @@
1#
2# These are all rather similar so we consider them a single platform
3#
4platform-$(CONFIG_SIBYTE_BCM112X) += sibyte/
5platform-$(CONFIG_SIBYTE_SB1250) += sibyte/
6platform-$(CONFIG_SIBYTE_BCM1x55) += sibyte/
7platform-$(CONFIG_SIBYTE_BCM1x80) += sibyte/
8
9#
10# Sibyte SB1250 / BCM1480 family of SOCs
11#
12cflags-$(CONFIG_SIBYTE_BCM112X) += \
13 -I$(srctree)/arch/mips/include/asm/mach-sibyte \
14 -DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1250_112x_ALL
15
16platform-$(CONFIG_SIBYTE_SB1250) += sibyte/
17cflags-$(CONFIG_SIBYTE_SB1250) += \
18 -I$(srctree)/arch/mips/include/asm/mach-sibyte \
19 -DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1250_112x_ALL
20
21cflags-$(CONFIG_SIBYTE_BCM1x55) += \
22 -I$(srctree)/arch/mips/include/asm/mach-sibyte \
23 -DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1480_ALL
24
25cflags-$(CONFIG_SIBYTE_BCM1x80) += \
26 -I$(srctree)/arch/mips/include/asm/mach-sibyte \
27 -DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1480_ALL
28
29#
30# Sibyte BCM91120x (Carmel) board
31# Sibyte BCM91120C (CRhine) board
32# Sibyte BCM91125C (CRhone) board
33# Sibyte BCM91125E (Rhone) board
34# Sibyte SWARM board
35# Sibyte BCM91x80 (BigSur) board
36#
37load-$(CONFIG_SIBYTE_CARMEL) := 0xffffffff80100000
38load-$(CONFIG_SIBYTE_CRHINE) := 0xffffffff80100000
39load-$(CONFIG_SIBYTE_CRHONE) := 0xffffffff80100000
40load-$(CONFIG_SIBYTE_RHONE) := 0xffffffff80100000
41load-$(CONFIG_SIBYTE_SENTOSA) := 0xffffffff80100000
42load-$(CONFIG_SIBYTE_SWARM) := 0xffffffff80100000
43load-$(CONFIG_SIBYTE_BIGSUR) := 0xffffffff80100000
diff --git a/arch/mips/sibyte/bcm1480/Makefile b/arch/mips/sibyte/bcm1480/Makefile
index f292f7df0cf..cdc4c56c3e2 100644
--- a/arch/mips/sibyte/bcm1480/Makefile
+++ b/arch/mips/sibyte/bcm1480/Makefile
@@ -1,5 +1,3 @@
1obj-y := setup.o irq.o time.o 1obj-y := setup.o irq.o time.o
2 2
3obj-$(CONFIG_SMP) += smp.o 3obj-$(CONFIG_SMP) += smp.o
4
5EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/sibyte/common/Makefile b/arch/mips/sibyte/common/Makefile
index 4f659837c7c..36aa700cc40 100644
--- a/arch/mips/sibyte/common/Makefile
+++ b/arch/mips/sibyte/common/Makefile
@@ -1,5 +1,3 @@
1obj-y := cfe.o 1obj-y := cfe.o
2obj-$(CONFIG_SIBYTE_CFE_CONSOLE) += cfe_console.o 2obj-$(CONFIG_SIBYTE_CFE_CONSOLE) += cfe_console.o
3obj-$(CONFIG_SIBYTE_TBPROF) += sb_tbprof.o 3obj-$(CONFIG_SIBYTE_TBPROF) += sb_tbprof.o
4
5EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/sibyte/sb1250/Makefile b/arch/mips/sibyte/sb1250/Makefile
index 1896f4e77a3..d3d969de407 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
2 2
3obj-$(CONFIG_SMP) += smp.o 3obj-$(CONFIG_SMP) += smp.o
4obj-$(CONFIG_SIBYTE_BUS_WATCHER) += bus_watcher.o 4obj-$(CONFIG_SIBYTE_BUS_WATCHER) += bus_watcher.o
5
6EXTRA_CFLAGS += -Werror
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-22 03:22:24 -0400