upgrade iop32x to 2.6.30

[openwrt.git] / target / linux / ppc40x / patches-2.6.30 / 004-magicbox.patch

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 a1a9da8..d6ce22d 100644 (file)
--- a/target/linux/ppc40x/patches-2.6.30/004-magicbox.patch
+++ b/target/linux/ppc40x/patches-2.6.30/004-magicbox.patch
@@ -377,7 +377,15 @@
 +};
 --- a/arch/powerpc/boot/Makefile
 +++ b/arch/powerpc/boot/Makefile
-@@ -75,7 +75,7 @@ src-plat := of.c cuboot-52xx.c cuboot-82
+@@ -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
+ $(obj)/virtex405-head.o: BOOTAFLAGS += -mcpu=405
+ 
+@@ -75,7 +76,7 @@ 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 \
@@ -386,7 +394,7 @@
  src-boot := $(src-wlib) $(src-plat) empty.c
  
  src-boot := $(addprefix $(obj)/, $(src-boot))
-@@ -192,6 +192,7 @@ image-$(CONFIG_DEFAULT_UIMAGE)             += uImag
+@@ -192,6 +193,7 @@ image-$(CONFIG_DEFAULT_UIMAGE)             += uImag
  image-$(CONFIG_EP405)                 += dtbImage.ep405
  image-$(CONFIG_WALNUT)                        += treeImage.walnut
  image-$(CONFIG_ACADIA)                        += cuImage.acadia
@@ -396,7 +404,7 @@
  image-$(CONFIG_EBONY)                 += treeImage.ebony cuImage.ebony
 --- a/arch/powerpc/platforms/40x/Kconfig
 +++ b/arch/powerpc/platforms/40x/Kconfig
-@@ -49,6 +49,16 @@ config KILAUEA
+@@ -50,6 +50,16 @@ config KILAUEA
        help
          This option enables support for the AMCC PPC405EX evaluation board.
  
@@ -415,12 +423,12 @@
        depends on 40x
 --- a/arch/powerpc/platforms/40x/ppc40x_simple.c
 +++ b/arch/powerpc/platforms/40x/ppc40x_simple.c
-@@ -51,7 +51,8 @@ machine_device_initcall(ppc40x_simple, p
-  * board.c file for it rather than adding it to this list.
-  */
- static char *board[] __initdata = {
--      "amcc,acadia"
-+      "amcc,acadia",
+@@ -54,7 +54,8 @@ static char *board[] __initdata = {
+       "amcc,acadia",
+       "amcc,haleakala",
+       "amcc,kilauea",
+-      "amcc,makalu"
++      "amcc,makalu",
 +      "magicbox"
  };