[ppc40x] Magicbox CF driver cleanup

[openwrt.git] / target / linux / ppc40x / patches-2.6.30 / 006-magicboxv2.patch

diff --git a/target/linux/ppc40x/patches-2.6.30/006-magicboxv2.patch b/target/linux/ppc40x/patches-2.6.30/006-magicboxv2.patch
index e658895..1a92321 100644 (file)
--- a/target/linux/ppc40x/patches-2.6.30/006-magicboxv2.patch
+++ b/target/linux/ppc40x/patches-2.6.30/006-magicboxv2.patch
@@ -1,6 +1,6 @@
 --- /dev/null
 +++ b/arch/powerpc/boot/cuboot-magicboxv2.c
-@@ -0,0 +1,40 @@
+@@ -0,0 +1,41 @@
 +/*
 + * Old U-boot compatibility for Magicbox v2
 + *
@@ -31,7 +31,7 @@
 +      ibm4xx_sdram_fixup_memsize();
 +      dt_fixup_mac_addresses(&bd.bi_enetaddr, &bd.bi_enet1addr);
 +}
-+      
++
 +void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
 +              unsigned long r6, unsigned long r7)
 +{
@@ -41,6 +41,7 @@
 +      fdt_init(_dtb_start);
 +      serial_console_init();
 +}
++
 --- /dev/null
 +++ b/arch/powerpc/boot/dts/magicboxv2.dts
 @@ -0,0 +1,250 @@
@@ -237,11 +238,11 @@
 +                              #size-cells = <1>;
 +                              partition@0 {
 +                                      label = "linux";
-+                                      reg = <0x0 0x3c0000>;
++                                      reg = <0x0 0x120000>;
 +                              };
-+                              partition@100000 {
++                              partition@120000 {
 +                                      label = "rootfs";
-+                                      reg = <0x100000 0x2c0000>;
++                                      reg = <0x120000 0x2a0000>;
 +                              };
 +                              partition@3c0000 {
 +                                      label = "u-boot";
@@ -335,12 +336,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
-  */
+@@ -53,6 +53,7 @@ machine_device_initcall(ppc40x_simple, p
  static char *board[] __initdata = {
        "amcc,acadia",
--      "magicboxv1"
-+      "magicboxv1",
+       "magicboxv1",
 +      "magicboxv2",
  };