diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 17:21:38 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 17:21:38 -0800 |
| commit | 200d018eff4be3a1fb9823441cfcebb7de86a677 (patch) | |
| tree | 76dc7b8643da0fc19208067c44e3f346f11f6cc8 /arch/mips/Makefile | |
| parent | eb991b39385c7b04923d701764a34694ec54b53d (diff) | |
| parent | f0647a52974daccbe20990fb6341f07792445fe0 (diff) | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[PATCH] add STB810 support (Philips PNX8550-based)
[MIPS] Qemu now has an ELF loader.
[MIPS] Add GENERIC_HARDIRQS_NO__DO_IRQ for i8259 users
[MIPS] Optimize csum_partial for 64bit kernel
[MIPS] Optimize flow of csum_partial
[MIPS] Make csum_partial more readable
[MIPS] Rename SNI_RM200_PCI to just SNI_RM preparing for more RM machines
Diffstat (limited to 'arch/mips/Makefile')
| -rw-r--r-- | arch/mips/Makefile | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/arch/mips/Makefile b/arch/mips/Makefile index 641aa30b363..d1b026a0337 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile @@ -463,6 +463,11 @@ libs-$(CONFIG_PNX8550_JBS) += arch/mips/philips/pnx8550/jbs/ #cflags-$(CONFIG_PNX8550_JBS) += -Iinclude/asm-mips/mach-pnx8550 load-$(CONFIG_PNX8550_JBS) += 0xffffffff80060000 +# Philips PNX8550 STB810 board +# +libs-$(CONFIG_PNX8550_STB810) += arch/mips/philips/pnx8550/stb810/ +load-$(CONFIG_PNX8550_STB810) += 0xffffffff80060000 + # NEC EMMA2RH boards # core-$(CONFIG_EMMA2RH) += arch/mips/emma2rh/common/ @@ -569,11 +574,11 @@ libs-$(CONFIG_SIBYTE_BIGSUR) += arch/mips/sibyte/swarm/ load-$(CONFIG_SIBYTE_BIGSUR) := 0xffffffff80100000 # -# SNI RM200 PCI +# SNI RM # -core-$(CONFIG_SNI_RM200_PCI) += arch/mips/sni/ -cflags-$(CONFIG_SNI_RM200_PCI) += -Iinclude/asm-mips/mach-rm200 -load-$(CONFIG_SNI_RM200_PCI) += 0xffffffff80600000 +core-$(CONFIG_SNI_RM) += arch/mips/sni/ +cflags-$(CONFIG_SNI_RM) += -Iinclude/asm-mips/mach-rm +load-$(CONFIG_SNI_RM) += 0xffffffff80600000 # # Toshiba JMR-TX3927 board @@ -695,7 +700,7 @@ ifdef CONFIG_QEMU all: vmlinux.bin endif -ifdef CONFIG_SNI_RM200_PCI +ifdef CONFIG_SNI_RM all: vmlinux.ecoff endif |