aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2010-08-05 08:25:49 -0400
committerRalf Baechle <ralf@linux-mips.org>2010-08-05 08:25:49 -0400
commitb9dbdce11b0c961d5cf22488ee059f2f9d930431 (patch)
treed99397702b3e968fd2ad7425d2f2f4dec1f25eb0 /arch
parent655f40e4870a46551a4510695765913d2c0518ce (diff)
MIPS: IP22, IP28: Migrate to new platform makefile style.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/mips/Kbuild.platforms1
-rw-r--r--arch/mips/Makefile35
-rw-r--r--arch/mips/sgi-ip22/Makefile2
-rw-r--r--arch/mips/sgi-ip22/Platform34
4 files changed, 35 insertions, 37 deletions
diff --git a/arch/mips/Kbuild.platforms b/arch/mips/Kbuild.platforms
index e391b6d473e3..acc3dc8080e2 100644
--- a/arch/mips/Kbuild.platforms
+++ b/arch/mips/Kbuild.platforms
@@ -8,6 +8,7 @@ platforms += jazz
8platforms += loongson 8platforms += loongson
9platforms += mipssim 9platforms += mipssim
10platforms += pmc-sierra 10platforms += pmc-sierra
11platforms += sgi-ip22
11platforms += sgi-ip27 12platforms += sgi-ip27
12platforms += sni 13platforms += sni
13platforms += vr41xx 14platforms += vr41xx
diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index ccbb367b5bf1..3c89ccb89b16 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -259,41 +259,6 @@ cflags-$(CONFIG_POWERTV) += -I$(srctree)/arch/mips/include/asm/mach-power
259load-$(CONFIG_POWERTV) += 0xffffffff90800000 259load-$(CONFIG_POWERTV) += 0xffffffff90800000
260 260
261# 261#
262# SGI IP22 (Indy/Indigo2)
263#
264# Set the load address to >= 0xffffffff88069000 if you want to leave space for
265# symmon, 0xffffffff80002000 for production kernels. Note that the value must
266# be aligned to a multiple of the kernel stack size or the handling of the
267# current variable will break so for 64-bit kernels we have to raise the start
268# address by 8kb.
269#
270core-$(CONFIG_SGI_IP22) += arch/mips/sgi-ip22/
271cflags-$(CONFIG_SGI_IP22) += -I$(srctree)/arch/mips/include/asm/mach-ip22
272ifdef CONFIG_32BIT
273load-$(CONFIG_SGI_IP22) += 0xffffffff88002000
274endif
275ifdef CONFIG_64BIT
276load-$(CONFIG_SGI_IP22) += 0xffffffff88004000
277endif
278
279#
280# SGI IP28 (Indigo2 R10k)
281#
282# Set the load address to >= 0xa800000020080000 if you want to leave space for
283# symmon, 0xa800000020004000 for production kernels ? Note that the value must
284# be 16kb aligned or the handling of the current variable will break.
285# Simplified: what IP22 does at 128MB+ in ksegN, IP28 does at 512MB+ in xkphys
286#
287ifdef CONFIG_SGI_IP28
288 ifeq ($(call cc-option-yn,-mr10k-cache-barrier=store), n)
289 $(error gcc doesn't support needed option -mr10k-cache-barrier=store)
290 endif
291endif
292core-$(CONFIG_SGI_IP28) += arch/mips/sgi-ip22/
293cflags-$(CONFIG_SGI_IP28) += -mr10k-cache-barrier=store -I$(srctree)/arch/mips/include/asm/mach-ip28
294load-$(CONFIG_SGI_IP28) += 0xa800000020004000
295
296#
297# SGI-IP32 (O2) 262# SGI-IP32 (O2)
298# 263#
299# Set the load address to >= 80069000 if you want to leave space for symmon, 264# Set the load address to >= 80069000 if you want to leave space for symmon,
diff --git a/arch/mips/sgi-ip22/Makefile b/arch/mips/sgi-ip22/Makefile
index 416b18f9fa72..cc538493cae1 100644
--- a/arch/mips/sgi-ip22/Makefile
+++ b/arch/mips/sgi-ip22/Makefile
@@ -9,5 +9,3 @@ obj-y += ip22-mc.o ip22-hpc.o ip22-int.o ip22-time.o ip22-nvram.o \
9obj-$(CONFIG_SGI_IP22) += ip22-berr.o 9obj-$(CONFIG_SGI_IP22) += ip22-berr.o
10obj-$(CONFIG_SGI_IP28) += ip28-berr.o 10obj-$(CONFIG_SGI_IP28) += ip28-berr.o
11obj-$(CONFIG_EISA) += ip22-eisa.o 11obj-$(CONFIG_EISA) += ip22-eisa.o
12
13EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/sgi-ip22/Platform b/arch/mips/sgi-ip22/Platform
new file mode 100644
index 000000000000..b7a4b7e04c38
--- /dev/null
+++ b/arch/mips/sgi-ip22/Platform
@@ -0,0 +1,34 @@
1#
2# SGI IP22 (Indy/Indigo2)
3#
4# Set the load address to >= 0xffffffff88069000 if you want to leave space for
5# symmon, 0xffffffff80002000 for production kernels. Note that the value must
6# be aligned to a multiple of the kernel stack size or the handling of the
7# current variable will break so for 64-bit kernels we have to raise the start
8# address by 8kb.
9#
10platform-$(CONFIG_SGI_IP22) += sgi-ip22/
11cflags-$(CONFIG_SGI_IP22) += -I$(srctree)/arch/mips/include/asm/mach-ip22
12ifdef CONFIG_32BIT
13load-$(CONFIG_SGI_IP22) += 0xffffffff88002000
14endif
15ifdef CONFIG_64BIT
16load-$(CONFIG_SGI_IP22) += 0xffffffff88004000
17endif
18
19#
20# SGI IP28 (Indigo2 R10k)
21#
22# Set the load address to >= 0xa800000020080000 if you want to leave space for
23# symmon, 0xa800000020004000 for production kernels ? Note that the value must
24# be 16kb aligned or the handling of the current variable will break.
25# Simplified: what IP22 does at 128MB+ in ksegN, IP28 does at 512MB+ in xkphys
26#
27ifdef CONFIG_SGI_IP28
28 ifeq ($(call cc-option-yn,-mr10k-cache-barrier=store), n)
29 $(error gcc doesn't support needed option -mr10k-cache-barrier=store)
30 endif
31endif
32platform-$(CONFIG_SGI_IP28) += sgi-ip22/
33cflags-$(CONFIG_SGI_IP28) += -mr10k-cache-barrier=store -I$(srctree)/arch/mips/include/asm/mach-ip28
34load-$(CONFIG_SGI_IP28) += 0xa800000020004000