From ad5f2635578a19ff8885bff1ef4d5adf7193cb02 Mon Sep 17 00:00:00 2001 From: Ralf Baechle <ralf@linux-mips.org> Date: Thu, 5 Aug 2010 13:25:57 +0100 Subject: [PATCH] MIPS: PNX8550: Migrate to new platform makefile style. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> --- arch/mips/Kbuild.platforms | 1 + arch/mips/Makefile | 18 ------------------ arch/mips/pnx8550/Makefile | 3 +++ arch/mips/pnx8550/Platform | 7 +++++++ arch/mips/pnx8550/common/Makefile | 2 -- 5 files changed, 11 insertions(+), 20 deletions(-) create mode 100644 arch/mips/pnx8550/Makefile create mode 100644 arch/mips/pnx8550/Platform 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 platforms += mti-malta platforms += pmc-sierra platforms += pnx833x +platforms += pnx8550 platforms += powertv platforms += rb532 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 # include $(srctree)/arch/mips/Kbuild.platforms -# -# Common NXP PNX8550 -# -core-$(CONFIG_SOC_PNX8550) += arch/mips/pnx8550/common/ -cflags-$(CONFIG_SOC_PNX8550) += -I$(srctree)/arch/mips/include/asm/mach-pnx8550 - -# -# NXP PNX8550 JBS board -# -core-$(CONFIG_PNX8550_JBS) += arch/mips/pnx8550/jbs/ -#cflags-$(CONFIG_PNX8550_JBS) += -I$(srctree)/arch/mips/include/asm/mach-pnx8550 -load-$(CONFIG_PNX8550_JBS) += 0xffffffff80060000 - -# NXP PNX8550 STB810 board -# -core-$(CONFIG_PNX8550_STB810) += arch/mips/pnx8550/stb810/ -load-$(CONFIG_PNX8550_STB810) += 0xffffffff80060000 - cflags-y += -I$(srctree)/arch/mips/include/asm/mach-generic drivers-$(CONFIG_PCI) += arch/mips/pci/ 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 @@ +obj-$(CONFIG_SOC_PNX8550) += common/ +obj-$(CONFIG_PNX8550_JBS) += jbs/ +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 @@ +platform-$(CONFIG_SOC_PNX8550) += pnx8550/ + +cflags-$(CONFIG_SOC_PNX8550) += \ + -I$(srctree)/arch/mips/include/asm/mach-pnx8550 + +load-$(CONFIG_PNX8550_JBS) += 0xffffffff80060000 +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 @@ obj-y := setup.o prom.o int.o reset.o time.o proc.o platform.o obj-$(CONFIG_PCI) += pci.o - -EXTRA_CFLAGS += -Werror -- GitLab