optimize cuboot wrappers

[openwrt/staging/chunkeey.git] / target / linux / ppc40x / patches-2.6.30 / 005-openrb.patch

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 0ad6740195db943918f5c736caa876aadf65146c..9ad8ea3d825ca5935beeddca744d7b17d60fc916 100644 (file)
--- a/target/linux/ppc40x/patches-2.6.30/005-openrb.patch
+++ b/target/linux/ppc40x/patches-2.6.30/005-openrb.patch
@@ -353,7 +353,15 @@
 +};
 --- a/arch/powerpc/boot/Makefile
 +++ b/arch/powerpc/boot/Makefile
-@@ -75,7 +75,8 @@ src-plat := of.c cuboot-52xx.c cuboot-82
+@@ -43,6 +43,7 @@ $(obj)/cuboot-taishan.o: BOOTCFLAGS += -
+ $(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=405
+ $(obj)/cuboot-acadia.o: BOOTCFLAGS += -mcpu=405
+ $(obj)/cuboot-magicbox.o: BOOTCFLAGS += -mcpu=405
++$(obj)/cuboot-openrb.o: BOOTCFLAGS += -mcpu=405
+ $(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405
+ $(obj)/virtex405-head.o: BOOTAFLAGS += -mcpu=405
+ 
+@@ -76,7 +77,8 @@ src-plat := of.c cuboot-52xx.c cuboot-82
                cuboot-katmai.c cuboot-rainier.c redboot-8xx.c ep8248e.c \
                cuboot-warp.c cuboot-85xx-cpm2.c cuboot-yosemite.c simpleboot.c \
                virtex405-head.S virtex.c redboot-83xx.c cuboot-sam440ep.c \
@@ -363,7 +371,7 @@
  src-boot := $(src-wlib) $(src-plat) empty.c
  
  src-boot := $(addprefix $(obj)/, $(src-boot))
-@@ -193,6 +194,7 @@ image-$(CONFIG_EP405)                      += dtbImage.ep40
+@@ -194,6 +196,7 @@ image-$(CONFIG_EP405)                      += dtbImage.ep40
  image-$(CONFIG_WALNUT)                        += treeImage.walnut
  image-$(CONFIG_ACADIA)                        += cuImage.acadia
  image-$(CONFIG_MAGICBOX)              += cuImage.magicbox
@@ -373,7 +381,7 @@
  image-$(CONFIG_EBONY)                 += treeImage.ebony cuImage.ebony
 --- a/arch/powerpc/platforms/40x/Kconfig
 +++ b/arch/powerpc/platforms/40x/Kconfig
-@@ -59,6 +59,16 @@ config MAGICBOX
+@@ -60,6 +60,16 @@ config MAGICBOX
        help
          This option enables support for the Magicbox boards.
  
@@ -392,10 +400,10 @@
        depends on 40x
 --- a/arch/powerpc/platforms/40x/ppc40x_simple.c
 +++ b/arch/powerpc/platforms/40x/ppc40x_simple.c
-@@ -52,7 +52,8 @@ machine_device_initcall(ppc40x_simple, p
-  */
- static char *board[] __initdata = {
-       "amcc,acadia",
+@@ -55,7 +55,8 @@ static char *board[] __initdata = {
+       "amcc,haleakala",
+       "amcc,kilauea",
+       "amcc,makalu",
 -      "magicbox"
 +      "magicbox",
 +      "openrb"