--- zzzz-none-000/linux-2.6.28.10/arch/mips/Makefile	2009-05-02 18:54:43.000000000 +0000
+++ puma5-6360-529/linux-2.6.28.10/arch/mips/Makefile	2012-10-09 07:50:22.000000000 +0000
@@ -14,7 +14,12 @@
 
 KBUILD_DEFCONFIG := ip22_defconfig
 
-cflags-y := -ffunction-sections
+ifndef CONFIG_FUNCTION_TRACER
+cflags-y := -ffunction-sections \
+ 			-freorder-blocks-and-partition \
+            -Werror-implicit-function-declaration \
+            -falign-functions=32 -falign-loops=32 -falign-jumps=32
+endif
 
 #
 # Select the object file format to substitute into the linker script.
@@ -112,7 +117,13 @@
 #
 # CPU-dependent compiler/assembler options for optimization.
 #
+
+# Compilation flags for Fusiv MIPS1 LX4189 architecture
+ifdef CONFIG_MACH_FUSIV_MIPS1
+cflags-$(CONFIG_CPU_R3000)	+= $(call cc-option,-march=lx4189,-mcpu=mips1)
+else
 cflags-$(CONFIG_CPU_R3000)	+= -march=r3000
+endif
 cflags-$(CONFIG_CPU_TX39XX)	+= -march=r3900
 cflags-$(CONFIG_CPU_R6000)	+= -march=r6000 -Wa,--trap
 cflags-$(CONFIG_CPU_R4300)	+= -march=r4300 -Wa,--trap
@@ -124,6 +135,13 @@
 			-Wa,-mips32 -Wa,--trap
 cflags-$(CONFIG_CPU_MIPS32_R2)	+= $(call cc-option,-march=mips32r2,-mips32r2 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS32) \
 			-Wa,-mips32r2 -Wa,--trap
+cflags-$(CONFIG_CPU_MIPS_24K)	+= $(call cc-option,-march=24kc -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS32) \
+			-Wa,-march=24kc -Wa,--trap
+cflags-$(CONFIG_CPU_MIPS_34K)	+= $(call cc-option,-march=34kc -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS32) \
+			-Wa,-march=34kc -Wa,--trap
+cflags-$(CONFIG_CPU_MIPS_74K)	+= $(call cc-option,-march=74kc -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS32) \
+			-Wa,-march=74kc -Wa,--trap
+
 cflags-$(CONFIG_CPU_MIPS64_R1)	+= $(call cc-option,-march=mips64,-mips64 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS64) \
 			-Wa,-mips64 -Wa,--trap
 cflags-$(CONFIG_CPU_MIPS64_R2)	+= $(call cc-option,-march=mips64r2,-mips64r2 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS64) \
@@ -169,6 +187,29 @@
 #
 
 #
+# Fusiv MIPS32 core
+#
+core-$(CONFIG_MACH_FUSIV_MIPS32)	+= arch/mips/fusiv/fusiv_mips32/
+cflags-$(CONFIG_MACH_FUSIV_MIPS32)	+= -I$(srctree)/arch/mips/include/asm/mach-fusiv -mno-branch-likely
+load-$(CONFIG_MACH_FUSIV_MIPS32)	+= 0xffffffff80010000
+ifdef CONFIG_MACH_FUSIV_MIPS32
+adiimage: vmlinux
+	$(Q)$(MAKE) $(build)=arch/mips/fusiv/fusiv_mips32/bootimg $@
+endif
+
+#
+# Fusiv MIPS1 LX4189 core
+#
+# core-$(CONFIG_MACH_FUSIV_MIPS1)		+= arch/mips/fusiv/fusiv_mips1_lexra/
+# cflags-$(CONFIG_MACH_FUSIV_MIPS1)	+= -I$(srctree)/arch/mips/include/asm/mach-fusiv
+# load-$(CONFIG_MACH_FUSIV_MIPS1)		+= 0xffffffff80010000
+# ifdef CONFIG_MACH_FUSIV_MIPS1
+# adiimage: vmlinux
+# 	$(Q)$(MAKE) $(build)=arch/mips/fusiv/fusiv_mips1_lexra/bootimg $@
+# endif
+
+
+#
 # Acer PICA 61, Mips Magnum 4000 and Olivetti M700.
 #
 core-$(CONFIG_MACH_JAZZ)	+= arch/mips/jazz/
@@ -315,6 +356,14 @@
 all-$(CONFIG_MIPS_MALTA)	:= vmlinux.bin
 
 #
+# Atheros Virian
+#
+core-$(CONFIG_MACH_AR7240)	+= arch/mips/mach-virian/
+cflags-$(CONFIG_MACH_AR7240)	+= -I$(srctree)/arch/mips/include/asm/mach-virian
+load-$(CONFIG_MACH_AR7240)	+= 0xffffffff80010000
+all-$(CONFIG_MACH_AR7240)	:= vmlinux.bin
+
+#
 # MIPS SIM
 #
 core-$(CONFIG_MIPS_SIM)		+= arch/mips/mipssim/
@@ -515,6 +564,9 @@
 cflags-$(CONFIG_SIBYTE_BCM1x80)	+= -I$(srctree)/arch/mips/include/asm/mach-sibyte \
 			-DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1480_ALL
 
+
+include $(srctree)/arch/mips/Makefile.ifx
+
 #
 # Sibyte BCM91120x (Carmel) board
 # Sibyte BCM91120C (CRhine) board
@@ -586,6 +638,13 @@
 core-$(CONFIG_TOSHIBA_RBTX4938) += arch/mips/txx9/rbtx4938/
 core-$(CONFIG_TOSHIBA_RBTX4939) += arch/mips/txx9/rbtx4939/
 
+#
+# Infineon  Amazon_S
+#
+core-$(CONFIG_AMAZON_S) += arch/mips/mach-amazone_s/
+cflags-$(CONFIG_AMAZON_S) += -I$(srctree)/arch/mips/include/asm/mach-amazone_s -save-temps
+load-$(CONFIG_AMAZON_S) += 0xFFFFFFFF80002000
+
 cflags-y			+= -I$(srctree)/arch/mips/include/asm/mach-generic
 drivers-$(CONFIG_PCI)		+= arch/mips/pci/
 
@@ -719,3 +778,4 @@
 CLEAN_FILES += vmlinux.32 \
 	       vmlinux.64 \
 	       vmlinux.ecoff
+