From 91a548d57e9c95bb47b66d9d3ac0bf381619a6e7 Mon Sep 17 00:00:00 2001 From: Ralf Baechle <ralf@linux-mips.org> Date: Thu, 5 Aug 2010 13:25:56 +0100 Subject: [PATCH] MIPS: PNX833x: Migrate to new platform makefile style. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> --- arch/mips/Kbuild.platforms | 1 + arch/mips/Makefile | 8 -------- arch/mips/pnx833x/Makefile | 3 +++ arch/mips/pnx833x/Platform | 5 +++++ arch/mips/pnx833x/common/Makefile | 2 -- arch/mips/pnx833x/stb22x/Makefile | 2 -- 6 files changed, 9 insertions(+), 12 deletions(-) create mode 100644 arch/mips/pnx833x/Makefile create mode 100644 arch/mips/pnx833x/Platform diff --git a/arch/mips/Kbuild.platforms b/arch/mips/Kbuild.platforms index 8985487b3def..6f007c30bfb8 100644 --- a/arch/mips/Kbuild.platforms +++ b/arch/mips/Kbuild.platforms @@ -14,6 +14,7 @@ platforms += loongson platforms += mipssim platforms += mti-malta platforms += pmc-sierra +platforms += pnx833x platforms += powertv platforms += rb532 platforms += sgi-ip22 diff --git a/arch/mips/Makefile b/arch/mips/Makefile index 4ba8070ef4f2..17f93314b94e 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile @@ -191,14 +191,6 @@ endif # include $(srctree)/arch/mips/Kbuild.platforms -# NXP STB225 -core-$(CONFIG_SOC_PNX833X) += arch/mips/pnx833x/common/ -cflags-$(CONFIG_SOC_PNX833X) += -Iarch/mips/include/asm/mach-pnx833x -core-$(CONFIG_NXP_STB220) += arch/mips/pnx833x/stb22x/ -load-$(CONFIG_NXP_STB220) += 0xffffffff80001000 -core-$(CONFIG_NXP_STB225) += arch/mips/pnx833x/stb22x/ -load-$(CONFIG_NXP_STB225) += 0xffffffff80001000 - # # Common NXP PNX8550 # diff --git a/arch/mips/pnx833x/Makefile b/arch/mips/pnx833x/Makefile new file mode 100644 index 000000000000..02c4698cab05 --- /dev/null +++ b/arch/mips/pnx833x/Makefile @@ -0,0 +1,3 @@ +obj-$(CONFIG_SOC_PNX833X) += common/ +obj-$(CONFIG_NXP_STB220) += stb22x/ +obj-$(CONFIG_NXP_STB225) += stb22x/ diff --git a/arch/mips/pnx833x/Platform b/arch/mips/pnx833x/Platform new file mode 100644 index 000000000000..7e6ec4dbc8dd --- /dev/null +++ b/arch/mips/pnx833x/Platform @@ -0,0 +1,5 @@ +# NXP STB225 +platform-$(CONFIG_SOC_PNX833X) += pnx833x/ +cflags-$(CONFIG_SOC_PNX833X) += -Iarch/mips/include/asm/mach-pnx833x +load-$(CONFIG_NXP_STB220) += 0xffffffff80001000 +load-$(CONFIG_NXP_STB225) += 0xffffffff80001000 diff --git a/arch/mips/pnx833x/common/Makefile b/arch/mips/pnx833x/common/Makefile index 4a16f3b503b5..1a46dd291b16 100644 --- a/arch/mips/pnx833x/common/Makefile +++ b/arch/mips/pnx833x/common/Makefile @@ -1,3 +1 @@ obj-y := interrupts.o platform.o prom.o setup.o reset.o - -EXTRA_CFLAGS += -Werror diff --git a/arch/mips/pnx833x/stb22x/Makefile b/arch/mips/pnx833x/stb22x/Makefile index 0c4df9f22098..7b580060de50 100644 --- a/arch/mips/pnx833x/stb22x/Makefile +++ b/arch/mips/pnx833x/stb22x/Makefile @@ -1,3 +1 @@ obj-y := board.o - -EXTRA_CFLAGS += -Werror -- GitLab