diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2010-08-05 08:25:57 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2010-08-05 08:25:57 -0400 |
commit | ad5f2635578a19ff8885bff1ef4d5adf7193cb02 (patch) | |
tree | 6139b0792dc92b8fce623887b0c0979aadca9fcf /arch/mips | |
parent | 91a548d57e9c95bb47b66d9d3ac0bf381619a6e7 (diff) |
MIPS: PNX8550: Migrate to new platform makefile style.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips')
-rw-r--r-- | arch/mips/Kbuild.platforms | 1 | ||||
-rw-r--r-- | arch/mips/Makefile | 18 | ||||
-rw-r--r-- | arch/mips/pnx8550/Makefile | 3 | ||||
-rw-r--r-- | arch/mips/pnx8550/Platform | 7 | ||||
-rw-r--r-- | arch/mips/pnx8550/common/Makefile | 2 |
5 files changed, 11 insertions, 20 deletions
diff --git a/arch/mips/Kbuild.platforms b/arch/mips/Kbuild.platforms index 6f007c30bfb8..ea3b96cf2673 100644 --- a/arch/mips/Kbuild.platforms +++ b/arch/mips/Kbuild.platforms | |||
@@ -15,6 +15,7 @@ platforms += mipssim | |||
15 | platforms += mti-malta | 15 | platforms += mti-malta |
16 | platforms += pmc-sierra | 16 | platforms += pmc-sierra |
17 | platforms += pnx833x | 17 | platforms += pnx833x |
18 | platforms += pnx8550 | ||
18 | platforms += powertv | 19 | platforms += powertv |
19 | platforms += rb532 | 20 | platforms += rb532 |
20 | platforms += sgi-ip22 | 21 | platforms += sgi-ip22 |
diff --git a/arch/mips/Makefile b/arch/mips/Makefile index 17f93314b94e..50f780aa8323 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile | |||
@@ -191,24 +191,6 @@ endif | |||
191 | # | 191 | # |
192 | include $(srctree)/arch/mips/Kbuild.platforms | 192 | include $(srctree)/arch/mips/Kbuild.platforms |
193 | 193 | ||
194 | # | ||
195 | # Common NXP PNX8550 | ||
196 | # | ||
197 | core-$(CONFIG_SOC_PNX8550) += arch/mips/pnx8550/common/ | ||
198 | cflags-$(CONFIG_SOC_PNX8550) += -I$(srctree)/arch/mips/include/asm/mach-pnx8550 | ||
199 | |||
200 | # | ||
201 | # NXP PNX8550 JBS board | ||
202 | # | ||
203 | core-$(CONFIG_PNX8550_JBS) += arch/mips/pnx8550/jbs/ | ||
204 | #cflags-$(CONFIG_PNX8550_JBS) += -I$(srctree)/arch/mips/include/asm/mach-pnx8550 | ||
205 | load-$(CONFIG_PNX8550_JBS) += 0xffffffff80060000 | ||
206 | |||
207 | # NXP PNX8550 STB810 board | ||
208 | # | ||
209 | core-$(CONFIG_PNX8550_STB810) += arch/mips/pnx8550/stb810/ | ||
210 | load-$(CONFIG_PNX8550_STB810) += 0xffffffff80060000 | ||
211 | |||
212 | cflags-y += -I$(srctree)/arch/mips/include/asm/mach-generic | 194 | cflags-y += -I$(srctree)/arch/mips/include/asm/mach-generic |
213 | drivers-$(CONFIG_PCI) += arch/mips/pci/ | 195 | drivers-$(CONFIG_PCI) += arch/mips/pci/ |
214 | 196 | ||
diff --git a/arch/mips/pnx8550/Makefile b/arch/mips/pnx8550/Makefile new file mode 100644 index 000000000000..3f7e8561437b --- /dev/null +++ b/arch/mips/pnx8550/Makefile | |||
@@ -0,0 +1,3 @@ | |||
1 | obj-$(CONFIG_SOC_PNX8550) += common/ | ||
2 | obj-$(CONFIG_PNX8550_JBS) += jbs/ | ||
3 | obj-$(CONFIG_PNX8550_STB810) += stb810/ | ||
diff --git a/arch/mips/pnx8550/Platform b/arch/mips/pnx8550/Platform new file mode 100644 index 000000000000..0e7fbde768d5 --- /dev/null +++ b/arch/mips/pnx8550/Platform | |||
@@ -0,0 +1,7 @@ | |||
1 | platform-$(CONFIG_SOC_PNX8550) += pnx8550/ | ||
2 | |||
3 | cflags-$(CONFIG_SOC_PNX8550) += \ | ||
4 | -I$(srctree)/arch/mips/include/asm/mach-pnx8550 | ||
5 | |||
6 | load-$(CONFIG_PNX8550_JBS) += 0xffffffff80060000 | ||
7 | load-$(CONFIG_PNX8550_STB810) += 0xffffffff80060000 | ||
diff --git a/arch/mips/pnx8550/common/Makefile b/arch/mips/pnx8550/common/Makefile index dd9e7b1f7fd3..f8ce695dc54f 100644 --- a/arch/mips/pnx8550/common/Makefile +++ b/arch/mips/pnx8550/common/Makefile | |||
@@ -24,5 +24,3 @@ | |||
24 | 24 | ||
25 | obj-y := setup.o prom.o int.o reset.o time.o proc.o platform.o | 25 | obj-y := setup.o prom.o int.o reset.o time.o proc.o platform.o |
26 | obj-$(CONFIG_PCI) += pci.o | 26 | obj-$(CONFIG_PCI) += pci.o |
27 | |||
28 | EXTRA_CFLAGS += -Werror | ||