From 76be4e4455a0a5aa3dbb3da8ad2e95b7077eac31 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Thu, 5 Aug 2010 13:25:52 +0100 Subject: [PATCH] --- yaml --- r: 204508 b: refs/heads/master c: 026dab3c51d3d6129cf66f24bc592e9315856fdb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/mips/Kbuild.platforms | 1 + trunk/arch/mips/Makefile | 7 ------- trunk/arch/mips/powertv/Makefile | 2 +- trunk/arch/mips/powertv/Platform | 7 +++++++ 5 files changed, 10 insertions(+), 9 deletions(-) create mode 100644 trunk/arch/mips/powertv/Platform diff --git a/[refs] b/[refs] index f0f5d3f76722..074ae2133a6d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f70a974dd04619575723331a4f767254b76e3c8e +refs/heads/master: 026dab3c51d3d6129cf66f24bc592e9315856fdb diff --git a/trunk/arch/mips/Kbuild.platforms b/trunk/arch/mips/Kbuild.platforms index ad35f7bb8cd0..31bba5b095de 100644 --- a/trunk/arch/mips/Kbuild.platforms +++ b/trunk/arch/mips/Kbuild.platforms @@ -9,6 +9,7 @@ platforms += loongson platforms += mipssim platforms += mti-malta platforms += pmc-sierra +platforms += powertv platforms += rb532 platforms += sgi-ip22 platforms += sgi-ip27 diff --git a/trunk/arch/mips/Makefile b/trunk/arch/mips/Makefile index ff681502f6df..c983a8777b06 100644 --- a/trunk/arch/mips/Makefile +++ b/trunk/arch/mips/Makefile @@ -236,13 +236,6 @@ cflags-$(CONFIG_SOC_EMMA2RH) += -I$(srctree)/arch/mips/include/asm/mach-emma2rh core-$(CONFIG_NEC_MARKEINS) += arch/mips/emma/markeins/ load-$(CONFIG_NEC_MARKEINS) += 0xffffffff88100000 -# -# Cisco PowerTV Platform -# -core-$(CONFIG_POWERTV) += arch/mips/powertv/ -cflags-$(CONFIG_POWERTV) += -I$(srctree)/arch/mips/include/asm/mach-powertv -load-$(CONFIG_POWERTV) += 0xffffffff90800000 - # # Sibyte SB1250/BCM1480 SOC # diff --git a/trunk/arch/mips/powertv/Makefile b/trunk/arch/mips/powertv/Makefile index e9fe1c6efe16..506c4ca9d44a 100644 --- a/trunk/arch/mips/powertv/Makefile +++ b/trunk/arch/mips/powertv/Makefile @@ -26,4 +26,4 @@ obj-y += init.o ioremap.o memory.o powertv_setup.o reset.o time.o \ asic/ pci/ -EXTRA_CFLAGS += -Wall -Werror +EXTRA_CFLAGS += -Wall diff --git a/trunk/arch/mips/powertv/Platform b/trunk/arch/mips/powertv/Platform new file mode 100644 index 000000000000..4eb5af1d8eea --- /dev/null +++ b/trunk/arch/mips/powertv/Platform @@ -0,0 +1,7 @@ +# +# Cisco PowerTV Platform +# +platform-$(CONFIG_POWERTV) += powertv/ +cflags-$(CONFIG_POWERTV) += \ + -I$(srctree)/arch/mips/include/asm/mach-powertv +load-$(CONFIG_POWERTV) += 0xffffffff90800000