diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2011-05-30 09:59:47 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2011-07-20 18:12:11 -0400 |
commit | bf45e583715eae15e0adecb6f55d97878e127d7d (patch) | |
tree | ef34baf464ef9de2446a4f3ea657b3e9dce111d2 /arch/mips | |
parent | 852fe3105e94ca26d1b3df7e2cb6878ebdd67608 (diff) |
MIPS: XLR, XLS: Move makefile bits to were they belong.
This patch combines linux-mips.org patches
637d69600fb1773da56487271ec2a79c33d237ed [MIPS: Netlogic: Yank out crap.]
and 5e3c263b9658a4b1c6c5577793e9347efb44854e [MIPS: XLR, XLS: Add Kbuild
files for platform.]
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Jayachandran C <jayachandranc@netlogicmicro.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2415/
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 | 12 | ||||
-rw-r--r-- | arch/mips/netlogic/Platform | 11 |
3 files changed, 12 insertions, 12 deletions
diff --git a/arch/mips/Kbuild.platforms b/arch/mips/Kbuild.platforms index aef6c917b45a..5ce8029f558b 100644 --- a/arch/mips/Kbuild.platforms +++ b/arch/mips/Kbuild.platforms | |||
@@ -16,6 +16,7 @@ platforms += lasat | |||
16 | platforms += loongson | 16 | platforms += loongson |
17 | platforms += mipssim | 17 | platforms += mipssim |
18 | platforms += mti-malta | 18 | platforms += mti-malta |
19 | platforms += netlogic | ||
19 | platforms += pmc-sierra | 20 | platforms += pmc-sierra |
20 | platforms += pnx833x | 21 | platforms += pnx833x |
21 | platforms += pnx8550 | 22 | platforms += pnx8550 |
diff --git a/arch/mips/Makefile b/arch/mips/Makefile index 884819cd0607..53e3514ba10e 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile | |||
@@ -191,18 +191,6 @@ endif | |||
191 | # | 191 | # |
192 | include $(srctree)/arch/mips/Kbuild.platforms | 192 | include $(srctree)/arch/mips/Kbuild.platforms |
193 | 193 | ||
194 | # | ||
195 | # NETLOGIC SOC Common (common) | ||
196 | # | ||
197 | cflags-$(CONFIG_NLM_COMMON) += -I$(srctree)/arch/mips/include/asm/mach-netlogic | ||
198 | cflags-$(CONFIG_NLM_COMMON) += -I$(srctree)/arch/mips/include/asm/netlogic | ||
199 | |||
200 | # | ||
201 | # NETLOGIC XLR/XLS SoC, Simulator and boards | ||
202 | # | ||
203 | core-$(CONFIG_NLM_XLR) += arch/mips/netlogic/xlr/ | ||
204 | load-$(CONFIG_NLM_XLR_BOARD) += 0xffffffff84000000 | ||
205 | |||
206 | cflags-y += -I$(srctree)/arch/mips/include/asm/mach-generic | 194 | cflags-y += -I$(srctree)/arch/mips/include/asm/mach-generic |
207 | drivers-$(CONFIG_PCI) += arch/mips/pci/ | 195 | drivers-$(CONFIG_PCI) += arch/mips/pci/ |
208 | 196 | ||
diff --git a/arch/mips/netlogic/Platform b/arch/mips/netlogic/Platform new file mode 100644 index 000000000000..f87c1640abb5 --- /dev/null +++ b/arch/mips/netlogic/Platform | |||
@@ -0,0 +1,11 @@ | |||
1 | # | ||
2 | # NETLOGIC includes | ||
3 | # | ||
4 | cflags-$(CONFIG_NLM_COMMON) += -I$(srctree)/arch/mips/include/asm/mach-netlogic | ||
5 | cflags-$(CONFIG_NLM_COMMON) += -I$(srctree)/arch/mips/include/asm/netlogic | ||
6 | |||
7 | # | ||
8 | # NETLOGIC XLR/XLS SoC, Simulator and boards | ||
9 | # | ||
10 | core-$(CONFIG_NLM_XLR) += arch/mips/netlogic/xlr/ | ||
11 | load-$(CONFIG_NLM_XLR_BOARD) += 0xffffffff84000000 | ||