1 files changed, 27 insertions, 50 deletions

diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index 69648d01acc0..356453322b49 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -14,7 +14,7 @@
 
 KBUILD_DEFCONFIG := ip22_defconfig
 
-cflags-y :=
+cflags-y := -ffunction-sections
 
 #
 # Select the object file format to substitute into the linker script.
@@ -305,36 +305,14 @@ load-$(CONFIG_LEMOTE_FULONG) +=0xffffffff80100000
 cflags-$(CONFIG_LEMOTE_FULONG) += -Iinclude/asm-mips/mach-lemote
 
 #
-# For all MIPS, Inc. eval boards
-#
-core-$(CONFIG_MIPS_BOARDS_GEN)  += arch/mips/mips-boards/generic/
-
-#
-# MIPS Atlas board
-#
-core-$(CONFIG_MIPS_ATLAS)       += arch/mips/mips-boards/atlas/
-cflags-$(CONFIG_MIPS_ATLAS)     += -Iinclude/asm-mips/mach-atlas
-cflags-$(CONFIG_MIPS_ATLAS)     += -Iinclude/asm-mips/mach-mips
-load-$(CONFIG_MIPS_ATLAS)       += 0xffffffff80100000
-all-$(CONFIG_MIPS_ATLAS)        := vmlinux.bin
-
-#
 # MIPS Malta board
 #
-core-$(CONFIG_MIPS_MALTA)       += arch/mips/mips-boards/malta/
-cflags-$(CONFIG_MIPS_MALTA)     += -Iinclude/asm-mips/mach-mips
+core-$(CONFIG_MIPS_MALTA)       += arch/mips/mti-malta/
+cflags-$(CONFIG_MIPS_MALTA)     += -Iinclude/asm-mips/mach-malta
 load-$(CONFIG_MIPS_MALTA)       += 0xffffffff80100000
 all-$(CONFIG_MIPS_MALTA)        := vmlinux.bin
 
 #
-# MIPS SEAD board
-#
-core-$(CONFIG_MIPS_SEAD)        += arch/mips/mips-boards/sead/
-cflags-$(CONFIG_MIPS_SEAD)      += -Iinclude/asm-mips/mach-mips
-load-$(CONFIG_MIPS_SEAD)        += 0xffffffff80100000
-all-$(CONFIG_MIPS_SEAD)         := vmlinux.srec
-
-#
 # MIPS SIM
 #
 core-$(CONFIG_MIPS_SIM)         += arch/mips/mipssim/
@@ -377,12 +355,6 @@ core-$(CONFIG_MACH_VR41XX)	+= arch/mips/vr41xx/common/
 cflags-$(CONFIG_MACH_VR41XX)    += -Iinclude/asm-mips/mach-vr41xx
 
 #
-# NEC VR4133
-#
-core-$(CONFIG_NEC_CMBVR4133)    += arch/mips/vr41xx/nec-cmbvr4133/
-load-$(CONFIG_NEC_CMBVR4133)    += 0xffffffff80100000
-
-#
 # ZAO Networks Capcella (VR4131)
 #
 load-$(CONFIG_ZAO_CAPCELLA)     += 0xffffffff80000000
@@ -538,19 +510,19 @@ cflags-$(CONFIG_SIBYTE_BCM1x80)	+= -Iinclude/asm-mips/mach-sibyte \
 # Sibyte SWARM board
 # Sibyte BCM91x80 (BigSur) board
 #
-libs-$(CONFIG_SIBYTE_CARMEL)    += arch/mips/sibyte/swarm/
+core-$(CONFIG_SIBYTE_CARMEL)    += arch/mips/sibyte/swarm/
 load-$(CONFIG_SIBYTE_CARMEL)    := 0xffffffff80100000
-libs-$(CONFIG_SIBYTE_CRHINE)    += arch/mips/sibyte/swarm/
+core-$(CONFIG_SIBYTE_CRHINE)    += arch/mips/sibyte/swarm/
 load-$(CONFIG_SIBYTE_CRHINE)    := 0xffffffff80100000
-libs-$(CONFIG_SIBYTE_CRHONE)    += arch/mips/sibyte/swarm/
+core-$(CONFIG_SIBYTE_CRHONE)    += arch/mips/sibyte/swarm/
 load-$(CONFIG_SIBYTE_CRHONE)    := 0xffffffff80100000
-libs-$(CONFIG_SIBYTE_RHONE)     += arch/mips/sibyte/swarm/
+core-$(CONFIG_SIBYTE_RHONE)     += arch/mips/sibyte/swarm/
 load-$(CONFIG_SIBYTE_RHONE)     := 0xffffffff80100000
-libs-$(CONFIG_SIBYTE_SENTOSA)   += arch/mips/sibyte/swarm/
+core-$(CONFIG_SIBYTE_SENTOSA)   += arch/mips/sibyte/swarm/
 load-$(CONFIG_SIBYTE_SENTOSA)   := 0xffffffff80100000
-libs-$(CONFIG_SIBYTE_SWARM)     += arch/mips/sibyte/swarm/
+core-$(CONFIG_SIBYTE_SWARM)     += arch/mips/sibyte/swarm/
 load-$(CONFIG_SIBYTE_SWARM)     := 0xffffffff80100000
-libs-$(CONFIG_SIBYTE_BIGSUR)    += arch/mips/sibyte/swarm/
+core-$(CONFIG_SIBYTE_BIGSUR)    += arch/mips/sibyte/swarm/
 load-$(CONFIG_SIBYTE_BIGSUR)    := 0xffffffff80100000
 
 #
@@ -565,33 +537,38 @@ load-$(CONFIG_BCM47XX)		:= 0xffffffff80001000
 #
 core-$(CONFIG_SNI_RM)           += arch/mips/sni/
 cflags-$(CONFIG_SNI_RM)         += -Iinclude/asm-mips/mach-rm
+ifdef CONFIG_CPU_LITTLE_ENDIAN
 load-$(CONFIG_SNI_RM)           += 0xffffffff80600000
+else
+load-$(CONFIG_SNI_RM)           += 0xffffffff80030000
+endif
 all-$(CONFIG_SNI_RM)            := vmlinux.ecoff
 
 #
+# Common TXx9
+#
+core-$(CONFIG_MACH_TX39XX)      += arch/mips/txx9/generic/
+cflags-$(CONFIG_MACH_TX39XX) += -Iinclude/asm-mips/mach-tx39xx
+load-$(CONFIG_MACH_TX39XX)      += 0xffffffff80050000
+core-$(CONFIG_MACH_TX49XX)      += arch/mips/txx9/generic/
+cflags-$(CONFIG_MACH_TX49XX) += -Iinclude/asm-mips/mach-tx49xx
+load-$(CONFIG_MACH_TX49XX)      += 0xffffffff80100000
+
+#
 # Toshiba JMR-TX3927 board
 #
-core-$(CONFIG_TOSHIBA_JMR3927)  += arch/mips/jmr3927/rbhma3100/ \
-                                   arch/mips/jmr3927/common/
-cflags-$(CONFIG_TOSHIBA_JMR3927) += -Iinclude/asm-mips/mach-jmr3927
-load-$(CONFIG_TOSHIBA_JMR3927)  += 0xffffffff80050000
+core-$(CONFIG_TOSHIBA_JMR3927)  += arch/mips/txx9/jmr3927/
 
 #
 # Toshiba RBTX4927 board or
 # Toshiba RBTX4937 board
 #
-core-$(CONFIG_TOSHIBA_RBTX4927) += arch/mips/tx4927/toshiba_rbtx4927/
-core-$(CONFIG_TOSHIBA_RBTX4927) += arch/mips/tx4927/common/
-cflags-$(CONFIG_TOSHIBA_RBTX4927) += -Iinclude/asm-mips/mach-tx49xx
-load-$(CONFIG_TOSHIBA_RBTX4927) += 0xffffffff80020000
+core-$(CONFIG_TOSHIBA_RBTX4927) += arch/mips/txx9/rbtx4927/
 
 #
 # Toshiba RBTX4938 board
 #
-core-$(CONFIG_TOSHIBA_RBTX4938) += arch/mips/tx4938/toshiba_rbtx4938/
-core-$(CONFIG_TOSHIBA_RBTX4938) += arch/mips/tx4938/common/
-cflags-$(CONFIG_TOSHIBA_RBTX4938) += -Iinclude/asm-mips/mach-tx49xx
-load-$(CONFIG_TOSHIBA_RBTX4938) += 0xffffffff80100000
+core-$(CONFIG_TOSHIBA_RBTX4938) += arch/mips/txx9/rbtx4938/
 
 cflags-y                        += -Iinclude/asm-mips/mach-generic
 drivers-$(CONFIG_PCI)           += arch/mips/pci/