diff options
author | Manuel Lauss <manuel.lauss@googlemail.com> | 2010-06-01 16:30:37 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2010-08-05 08:25:46 -0400 |
commit | baf3eb233df301081b66637a257ce0e9f6f84706 (patch) | |
tree | 3c8fc19901140f6403fbac7cee55a9131ffd1acf /arch | |
parent | 25c8f83864878e1ec95c0bd8273405ab415eb0a4 (diff) |
MIPS: Move Alchemy Makefile parts to their own Platform file.
[Ralf: Remove a forgotten -Werror in Pb1200 Makefile.]
Signed-off-by: Manuel Lauss <manuel.lauss@googlemail.com>
To: Linux-MIPS <linux-mips@linux-mips.org>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Manuel Lauss <manuel.lauss@googlemail.com>
Patchwork: https://patchwork.linux-mips.org/patch/1319/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/mips/Kbuild.platforms | 1 | ||||
-rw-r--r-- | arch/mips/Makefile | 105 | ||||
-rw-r--r-- | arch/mips/alchemy/Platform | 109 | ||||
-rw-r--r-- | arch/mips/alchemy/common/Makefile | 2 | ||||
-rw-r--r-- | arch/mips/alchemy/devboards/Makefile | 2 | ||||
-rw-r--r-- | arch/mips/alchemy/devboards/pb1200/Makefile | 2 | ||||
-rw-r--r-- | arch/mips/alchemy/mtx-1/Makefile | 2 | ||||
-rw-r--r-- | arch/mips/alchemy/xxs1500/Makefile | 2 |
8 files changed, 110 insertions, 115 deletions
diff --git a/arch/mips/Kbuild.platforms b/arch/mips/Kbuild.platforms index 13244f326fff..68794bb9ac3a 100644 --- a/arch/mips/Kbuild.platforms +++ b/arch/mips/Kbuild.platforms | |||
@@ -1,5 +1,6 @@ | |||
1 | # All platforms listed in alphabetic order | 1 | # All platforms listed in alphabetic order |
2 | 2 | ||
3 | platforms += alchemy | ||
3 | platforms += ar7 | 4 | platforms += ar7 |
4 | platforms += loongson | 5 | platforms += loongson |
5 | platforms += mipssim | 6 | platforms += mipssim |
diff --git a/arch/mips/Makefile b/arch/mips/Makefile index 72f4357f782c..57ca331fb880 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile | |||
@@ -199,111 +199,6 @@ cflags-$(CONFIG_MACH_JAZZ) += -I$(srctree)/arch/mips/include/asm/mach-jazz | |||
199 | load-$(CONFIG_MACH_JAZZ) += 0xffffffff80080000 | 199 | load-$(CONFIG_MACH_JAZZ) += 0xffffffff80080000 |
200 | 200 | ||
201 | # | 201 | # |
202 | # Common Alchemy Au1x00 stuff | ||
203 | # | ||
204 | core-$(CONFIG_SOC_AU1X00) += arch/mips/alchemy/common/ | ||
205 | |||
206 | # | ||
207 | # AMD Alchemy Pb1000 eval board | ||
208 | # | ||
209 | core-$(CONFIG_MIPS_PB1000) += arch/mips/alchemy/devboards/ | ||
210 | cflags-$(CONFIG_MIPS_PB1000) += -I$(srctree)/arch/mips/include/asm/mach-pb1x00 | ||
211 | load-$(CONFIG_MIPS_PB1000) += 0xffffffff80100000 | ||
212 | |||
213 | # | ||
214 | # AMD Alchemy Pb1100 eval board | ||
215 | # | ||
216 | core-$(CONFIG_MIPS_PB1100) += arch/mips/alchemy/devboards/ | ||
217 | cflags-$(CONFIG_MIPS_PB1100) += -I$(srctree)/arch/mips/include/asm/mach-pb1x00 | ||
218 | load-$(CONFIG_MIPS_PB1100) += 0xffffffff80100000 | ||
219 | |||
220 | # | ||
221 | # AMD Alchemy Pb1500 eval board | ||
222 | # | ||
223 | core-$(CONFIG_MIPS_PB1500) += arch/mips/alchemy/devboards/ | ||
224 | cflags-$(CONFIG_MIPS_PB1500) += -I$(srctree)/arch/mips/include/asm/mach-pb1x00 | ||
225 | load-$(CONFIG_MIPS_PB1500) += 0xffffffff80100000 | ||
226 | |||
227 | # | ||
228 | # AMD Alchemy Pb1550 eval board | ||
229 | # | ||
230 | core-$(CONFIG_MIPS_PB1550) += arch/mips/alchemy/devboards/ | ||
231 | cflags-$(CONFIG_MIPS_PB1550) += -I$(srctree)/arch/mips/include/asm/mach-pb1x00 | ||
232 | load-$(CONFIG_MIPS_PB1550) += 0xffffffff80100000 | ||
233 | |||
234 | # | ||
235 | # AMD Alchemy Pb1200 eval board | ||
236 | # | ||
237 | core-$(CONFIG_MIPS_PB1200) += arch/mips/alchemy/devboards/ | ||
238 | cflags-$(CONFIG_MIPS_PB1200) += -I$(srctree)/arch/mips/include/asm/mach-pb1x00 | ||
239 | load-$(CONFIG_MIPS_PB1200) += 0xffffffff80100000 | ||
240 | |||
241 | # | ||
242 | # AMD Alchemy Db1000 eval board | ||
243 | # | ||
244 | core-$(CONFIG_MIPS_DB1000) += arch/mips/alchemy/devboards/ | ||
245 | cflags-$(CONFIG_MIPS_DB1000) += -I$(srctree)/arch/mips/include/asm/mach-db1x00 | ||
246 | load-$(CONFIG_MIPS_DB1000) += 0xffffffff80100000 | ||
247 | |||
248 | # | ||
249 | # AMD Alchemy Db1100 eval board | ||
250 | # | ||
251 | core-$(CONFIG_MIPS_DB1100) += arch/mips/alchemy/devboards/ | ||
252 | cflags-$(CONFIG_MIPS_DB1100) += -I$(srctree)/arch/mips/include/asm/mach-db1x00 | ||
253 | load-$(CONFIG_MIPS_DB1100) += 0xffffffff80100000 | ||
254 | |||
255 | # | ||
256 | # AMD Alchemy Db1500 eval board | ||
257 | # | ||
258 | core-$(CONFIG_MIPS_DB1500) += arch/mips/alchemy/devboards/ | ||
259 | cflags-$(CONFIG_MIPS_DB1500) += -I$(srctree)/arch/mips/include/asm/mach-db1x00 | ||
260 | load-$(CONFIG_MIPS_DB1500) += 0xffffffff80100000 | ||
261 | |||
262 | # | ||
263 | # AMD Alchemy Db1550 eval board | ||
264 | # | ||
265 | core-$(CONFIG_MIPS_DB1550) += arch/mips/alchemy/devboards/ | ||
266 | cflags-$(CONFIG_MIPS_DB1550) += -I$(srctree)/arch/mips/include/asm/mach-db1x00 | ||
267 | load-$(CONFIG_MIPS_DB1550) += 0xffffffff80100000 | ||
268 | |||
269 | # | ||
270 | # AMD Alchemy Db1200 eval board | ||
271 | # | ||
272 | core-$(CONFIG_MIPS_DB1200) += arch/mips/alchemy/devboards/ | ||
273 | cflags-$(CONFIG_MIPS_DB1200) += -I$(srctree)/arch/mips/include/asm/mach-db1x00 | ||
274 | load-$(CONFIG_MIPS_DB1200) += 0xffffffff80100000 | ||
275 | |||
276 | # | ||
277 | # AMD Alchemy Bosporus eval board | ||
278 | # | ||
279 | core-$(CONFIG_MIPS_BOSPORUS) += arch/mips/alchemy/devboards/ | ||
280 | cflags-$(CONFIG_MIPS_BOSPORUS) += -I$(srctree)/arch/mips/include/asm/mach-db1x00 | ||
281 | load-$(CONFIG_MIPS_BOSPORUS) += 0xffffffff80100000 | ||
282 | |||
283 | # | ||
284 | # AMD Alchemy Mirage eval board | ||
285 | # | ||
286 | core-$(CONFIG_MIPS_MIRAGE) += arch/mips/alchemy/devboards/ | ||
287 | cflags-$(CONFIG_MIPS_MIRAGE) += -I$(srctree)/arch/mips/include/asm/mach-db1x00 | ||
288 | load-$(CONFIG_MIPS_MIRAGE) += 0xffffffff80100000 | ||
289 | |||
290 | # | ||
291 | # 4G-Systems eval board | ||
292 | # | ||
293 | core-$(CONFIG_MIPS_MTX1) += arch/mips/alchemy/mtx-1/ | ||
294 | load-$(CONFIG_MIPS_MTX1) += 0xffffffff80100000 | ||
295 | |||
296 | # | ||
297 | # MyCable eval board | ||
298 | # | ||
299 | core-$(CONFIG_MIPS_XXS1500) += arch/mips/alchemy/xxs1500/ | ||
300 | load-$(CONFIG_MIPS_XXS1500) += 0xffffffff80100000 | ||
301 | |||
302 | # must be last for Alchemy systems for GPIO to work properly | ||
303 | cflags-$(CONFIG_SOC_AU1X00) += -I$(srctree)/arch/mips/include/asm/mach-au1x00 | ||
304 | |||
305 | |||
306 | # | ||
307 | # Cobalt Server | 202 | # Cobalt Server |
308 | # | 203 | # |
309 | core-$(CONFIG_MIPS_COBALT) += arch/mips/cobalt/ | 204 | core-$(CONFIG_MIPS_COBALT) += arch/mips/cobalt/ |
diff --git a/arch/mips/alchemy/Platform b/arch/mips/alchemy/Platform new file mode 100644 index 000000000000..495cc9a2a3b1 --- /dev/null +++ b/arch/mips/alchemy/Platform | |||
@@ -0,0 +1,109 @@ | |||
1 | # | ||
2 | # Core Alchemy code | ||
3 | # | ||
4 | platform-$(CONFIG_MACH_ALCHEMY) += alchemy/common/ | ||
5 | |||
6 | |||
7 | # | ||
8 | # AMD Alchemy Pb1000 eval board | ||
9 | # | ||
10 | platform-$(CONFIG_MIPS_PB1000) += alchemy/devboards/ | ||
11 | cflags-$(CONFIG_MIPS_PB1000) += -I$(srctree)/arch/mips/include/asm/mach-pb1x00 | ||
12 | load-$(CONFIG_MIPS_PB1000) += 0xffffffff80100000 | ||
13 | |||
14 | # | ||
15 | # AMD Alchemy Pb1100 eval board | ||
16 | # | ||
17 | platform-$(CONFIG_MIPS_PB1100) += alchemy/devboards/ | ||
18 | cflags-$(CONFIG_MIPS_PB1100) += -I$(srctree)/arch/mips/include/asm/mach-pb1x00 | ||
19 | load-$(CONFIG_MIPS_PB1100) += 0xffffffff80100000 | ||
20 | |||
21 | # | ||
22 | # AMD Alchemy Pb1500 eval board | ||
23 | # | ||
24 | platform-$(CONFIG_MIPS_PB1500) += alchemy/devboards/ | ||
25 | cflags-$(CONFIG_MIPS_PB1500) += -I$(srctree)/arch/mips/include/asm/mach-pb1x00 | ||
26 | load-$(CONFIG_MIPS_PB1500) += 0xffffffff80100000 | ||
27 | |||
28 | # | ||
29 | # AMD Alchemy Pb1550 eval board | ||
30 | # | ||
31 | platform-$(CONFIG_MIPS_PB1550) += alchemy/devboards/ | ||
32 | cflags-$(CONFIG_MIPS_PB1550) += -I$(srctree)/arch/mips/include/asm/mach-pb1x00 | ||
33 | load-$(CONFIG_MIPS_PB1550) += 0xffffffff80100000 | ||
34 | |||
35 | # | ||
36 | # AMD Alchemy Pb1200 eval board | ||
37 | # | ||
38 | platform-$(CONFIG_MIPS_PB1200) += alchemy/devboards/ | ||
39 | cflags-$(CONFIG_MIPS_PB1200) += -I$(srctree)/arch/mips/include/asm/mach-pb1x00 | ||
40 | load-$(CONFIG_MIPS_PB1200) += 0xffffffff80100000 | ||
41 | |||
42 | # | ||
43 | # AMD Alchemy Db1000 eval board | ||
44 | # | ||
45 | platform-$(CONFIG_MIPS_DB1000) += alchemy/devboards/ | ||
46 | cflags-$(CONFIG_MIPS_DB1000) += -I$(srctree)/arch/mips/include/asm/mach-db1x00 | ||
47 | load-$(CONFIG_MIPS_DB1000) += 0xffffffff80100000 | ||
48 | |||
49 | # | ||
50 | # AMD Alchemy Db1100 eval board | ||
51 | # | ||
52 | platform-$(CONFIG_MIPS_DB1100) += alchemy/devboards/ | ||
53 | cflags-$(CONFIG_MIPS_DB1100) += -I$(srctree)/arch/mips/include/asm/mach-db1x00 | ||
54 | load-$(CONFIG_MIPS_DB1100) += 0xffffffff80100000 | ||
55 | |||
56 | # | ||
57 | # AMD Alchemy Db1500 eval board | ||
58 | # | ||
59 | platform-$(CONFIG_MIPS_DB1500) += alchemy/devboards/ | ||
60 | cflags-$(CONFIG_MIPS_DB1500) += -I$(srctree)/arch/mips/include/asm/mach-db1x00 | ||
61 | load-$(CONFIG_MIPS_DB1500) += 0xffffffff80100000 | ||
62 | |||
63 | # | ||
64 | # AMD Alchemy Db1550 eval board | ||
65 | # | ||
66 | platform-$(CONFIG_MIPS_DB1550) += alchemy/devboards/ | ||
67 | cflags-$(CONFIG_MIPS_DB1550) += -I$(srctree)/arch/mips/include/asm/mach-db1x00 | ||
68 | load-$(CONFIG_MIPS_DB1550) += 0xffffffff80100000 | ||
69 | |||
70 | # | ||
71 | # AMD Alchemy Db1200 eval board | ||
72 | # | ||
73 | platform-$(CONFIG_MIPS_DB1200) += alchemy/devboards/ | ||
74 | cflags-$(CONFIG_MIPS_DB1200) += -I$(srctree)/arch/mips/include/asm/mach-db1x00 | ||
75 | load-$(CONFIG_MIPS_DB1200) += 0xffffffff80100000 | ||
76 | |||
77 | # | ||
78 | # AMD Alchemy Bosporus eval board | ||
79 | # | ||
80 | platform-$(CONFIG_MIPS_BOSPORUS) += alchemy/devboards/ | ||
81 | cflags-$(CONFIG_MIPS_BOSPORUS) += -I$(srctree)/arch/mips/include/asm/mach-db1x00 | ||
82 | load-$(CONFIG_MIPS_BOSPORUS) += 0xffffffff80100000 | ||
83 | |||
84 | # | ||
85 | # AMD Alchemy Mirage eval board | ||
86 | # | ||
87 | platform-$(CONFIG_MIPS_MIRAGE) += alchemy/devboards/ | ||
88 | cflags-$(CONFIG_MIPS_MIRAGE) += -I$(srctree)/arch/mips/include/asm/mach-db1x00 | ||
89 | load-$(CONFIG_MIPS_MIRAGE) += 0xffffffff80100000 | ||
90 | |||
91 | # | ||
92 | # 4G-Systems eval board | ||
93 | # | ||
94 | platform-$(CONFIG_MIPS_MTX1) += alchemy/mtx-1/ | ||
95 | load-$(CONFIG_MIPS_MTX1) += 0xffffffff80100000 | ||
96 | |||
97 | # | ||
98 | # MyCable eval board | ||
99 | # | ||
100 | platform-$(CONFIG_MIPS_XXS1500) += alchemy/xxs1500/ | ||
101 | load-$(CONFIG_MIPS_XXS1500) += 0xffffffff80100000 | ||
102 | |||
103 | |||
104 | # boards can specify their own <gpio.h> in one of their include dirs. | ||
105 | # If they do, placing this line here at the end will make sure the | ||
106 | # compiler picks the board one. If they don't, it will make sure | ||
107 | # the alchemy generic gpio header is picked up. | ||
108 | |||
109 | cflags-$(CONFIG_MACH_ALCHEMY) += -I$(srctree)/arch/mips/include/asm/mach-au1x00 | ||
diff --git a/arch/mips/alchemy/common/Makefile b/arch/mips/alchemy/common/Makefile index 06c0e65a54b5..27811fe341d6 100644 --- a/arch/mips/alchemy/common/Makefile +++ b/arch/mips/alchemy/common/Makefile | |||
@@ -18,5 +18,3 @@ ifeq ($(CONFIG_ALCHEMY_GPIO_INDIRECT),) | |||
18 | endif | 18 | endif |
19 | 19 | ||
20 | obj-$(CONFIG_PCI) += pci.o | 20 | obj-$(CONFIG_PCI) += pci.o |
21 | |||
22 | EXTRA_CFLAGS += -Werror | ||
diff --git a/arch/mips/alchemy/devboards/Makefile b/arch/mips/alchemy/devboards/Makefile index ecbd37f9ee87..826449c817c3 100644 --- a/arch/mips/alchemy/devboards/Makefile +++ b/arch/mips/alchemy/devboards/Makefile | |||
@@ -16,5 +16,3 @@ obj-$(CONFIG_MIPS_DB1500) += db1x00/ | |||
16 | obj-$(CONFIG_MIPS_DB1550) += db1x00/ | 16 | obj-$(CONFIG_MIPS_DB1550) += db1x00/ |
17 | obj-$(CONFIG_MIPS_BOSPORUS) += db1x00/ | 17 | obj-$(CONFIG_MIPS_BOSPORUS) += db1x00/ |
18 | obj-$(CONFIG_MIPS_MIRAGE) += db1x00/ | 18 | obj-$(CONFIG_MIPS_MIRAGE) += db1x00/ |
19 | |||
20 | EXTRA_CFLAGS += -Werror | ||
diff --git a/arch/mips/alchemy/devboards/pb1200/Makefile b/arch/mips/alchemy/devboards/pb1200/Makefile index 2ea9b02ef09f..18c1bd53e4c0 100644 --- a/arch/mips/alchemy/devboards/pb1200/Makefile +++ b/arch/mips/alchemy/devboards/pb1200/Makefile | |||
@@ -3,5 +3,3 @@ | |||
3 | # | 3 | # |
4 | 4 | ||
5 | obj-y := board_setup.o platform.o | 5 | obj-y := board_setup.o platform.o |
6 | |||
7 | EXTRA_CFLAGS += -Werror | ||
diff --git a/arch/mips/alchemy/mtx-1/Makefile b/arch/mips/alchemy/mtx-1/Makefile index f912022557ae..81b540ceaf88 100644 --- a/arch/mips/alchemy/mtx-1/Makefile +++ b/arch/mips/alchemy/mtx-1/Makefile | |||
@@ -7,5 +7,3 @@ | |||
7 | # | 7 | # |
8 | 8 | ||
9 | obj-y += init.o board_setup.o platform.o | 9 | obj-y += init.o board_setup.o platform.o |
10 | |||
11 | EXTRA_CFLAGS += -Werror | ||
diff --git a/arch/mips/alchemy/xxs1500/Makefile b/arch/mips/alchemy/xxs1500/Makefile index 81c516e3f073..91defcf4f335 100644 --- a/arch/mips/alchemy/xxs1500/Makefile +++ b/arch/mips/alchemy/xxs1500/Makefile | |||
@@ -6,5 +6,3 @@ | |||
6 | # | 6 | # |
7 | 7 | ||
8 | obj-y += init.o board_setup.o platform.o | 8 | obj-y += init.o board_setup.o platform.o |
9 | |||
10 | EXTRA_CFLAGS += -Werror | ||