From 79b3d01792000959a8e580e022c9c028ee22a5a4 Mon Sep 17 00:00:00 2001
From: kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 29 Jul 2009 14:52:31 +0000
Subject: [PATCH] ppc4xx optimizations

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17040 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 .../991-ppc4xx_optimization.patch             | 30 +++++++++++++++++++
 target/linux/ppc40x/Makefile                  |  1 +
 .../ppc40x/patches-2.6.30/004-magicbox.patch  |  6 ++--
 .../ppc40x/patches-2.6.30/005-openrb.patch    |  2 +-
 target/linux/ppc44x/Makefile                  |  1 +
 5 files changed, 36 insertions(+), 4 deletions(-)
 create mode 100644 target/linux/generic-2.6/patches-2.6.30/991-ppc4xx_optimization.patch

diff --git a/target/linux/generic-2.6/patches-2.6.30/991-ppc4xx_optimization.patch b/target/linux/generic-2.6/patches-2.6.30/991-ppc4xx_optimization.patch
new file mode 100644
index 000000000..39d5fb0d0
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.30/991-ppc4xx_optimization.patch
@@ -0,0 +1,30 @@
+Upstream doesn't optimize the kernel and bootwrappers for ppc44x because
+they still want to support gcc 3.3 -- well, we don't.
+
+--- a/arch/powerpc/Makefile
++++ b/arch/powerpc/Makefile
+@@ -123,7 +123,8 @@ ifeq ($(CONFIG_FUNCTION_TRACER),y)
+ KBUILD_CFLAGS		+= -mno-sched-epilog
+ endif
+ 
+-cpu-as-$(CONFIG_4xx)		+= -Wa,-m405
++cpu-as-$(CONFIG_40x)		+= -Wa,-m405
++cpu-as-$(CONFIG_44x)		+= -Wa,-m440
+ cpu-as-$(CONFIG_6xx)		+= -Wa,-maltivec
+ cpu-as-$(CONFIG_POWER4)		+= -Wa,-maltivec
+ cpu-as-$(CONFIG_E500)		+= -Wa,-me500
+--- a/arch/powerpc/boot/Makefile
++++ b/arch/powerpc/boot/Makefile
+@@ -38,9 +38,9 @@ BOOTCFLAGS	+= -I$(obj) -I$(srctree)/$(ob
+ DTS_FLAGS	?= -p 1024
+ 
+ $(obj)/4xx.o: BOOTCFLAGS += -mcpu=405
+-$(obj)/ebony.o: BOOTCFLAGS += -mcpu=405
+-$(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=405
+-$(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=405
++$(obj)/ebony.o: BOOTCFLAGS += -mcpu=440
++$(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=440
++$(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=440
+ $(obj)/cuboot-acadia.o: BOOTCFLAGS += -mcpu=405
+ $(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405
+ $(obj)/virtex405-head.o: BOOTAFLAGS += -mcpu=405
diff --git a/target/linux/ppc40x/Makefile b/target/linux/ppc40x/Makefile
index 00a566910..f4423391a 100644
--- a/target/linux/ppc40x/Makefile
+++ b/target/linux/ppc40x/Makefile
@@ -10,6 +10,7 @@ ARCH:=powerpc
 BOARD:=ppc40x
 BOARDNAME:=AMCC/IBM PPC40x
 FEATURES:=squashfs usb
+CFLAGS:=-Os -pipe -funit-at-a-time -mcpu=440
 
 LINUX_VERSION:=2.6.30.3
 LINUX_KARCH:=powerpc
diff --git a/target/linux/ppc40x/patches-2.6.30/004-magicbox.patch b/target/linux/ppc40x/patches-2.6.30/004-magicbox.patch
index 72ca542c1..d6ce22d4a 100644
--- a/target/linux/ppc40x/patches-2.6.30/004-magicbox.patch
+++ b/target/linux/ppc40x/patches-2.6.30/004-magicbox.patch
@@ -377,9 +377,9 @@
 +};
 --- a/arch/powerpc/boot/Makefile
 +++ b/arch/powerpc/boot/Makefile
-@@ -42,6 +42,7 @@ $(obj)/ebony.o: BOOTCFLAGS += -mcpu=405
- $(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=405
- $(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=405
+@@ -42,6 +42,7 @@ $(obj)/ebony.o: BOOTCFLAGS += -mcpu=440
+ $(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=440
+ $(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=440
  $(obj)/cuboot-acadia.o: BOOTCFLAGS += -mcpu=405
 +$(obj)/cuboot-magicbox.o: BOOTCFLAGS += -mcpu=405
  $(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405
diff --git a/target/linux/ppc40x/patches-2.6.30/005-openrb.patch b/target/linux/ppc40x/patches-2.6.30/005-openrb.patch
index 87de8777a..43407c202 100644
--- a/target/linux/ppc40x/patches-2.6.30/005-openrb.patch
+++ b/target/linux/ppc40x/patches-2.6.30/005-openrb.patch
@@ -354,7 +354,7 @@
 --- a/arch/powerpc/boot/Makefile
 +++ b/arch/powerpc/boot/Makefile
 @@ -43,6 +43,7 @@ $(obj)/cuboot-taishan.o: BOOTCFLAGS += -
- $(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=405
+ $(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=440
  $(obj)/cuboot-acadia.o: BOOTCFLAGS += -mcpu=405
  $(obj)/cuboot-magicbox.o: BOOTCFLAGS += -mcpu=405
 +$(obj)/cuboot-openrb.o: BOOTCFLAGS += -mcpu=405
diff --git a/target/linux/ppc44x/Makefile b/target/linux/ppc44x/Makefile
index 47926de0e..7d5864339 100644
--- a/target/linux/ppc44x/Makefile
+++ b/target/linux/ppc44x/Makefile
@@ -10,6 +10,7 @@ ARCH:=powerpc
 BOARD:=ppc44x
 BOARDNAME:=AMCC/IBM PPC44x
 FEATURES:=squashfs
+CFLAGS:=-Os -pipe -funit-at-a-time -mcpu=440
 
 LINUX_VERSION:=2.6.30.3
 LINUX_KARCH:=powerpc
-- 
2.20.1