kernel: check return code of nla_parse in pcomp_lzma on 2.6.31

[openwrt.git] / target / linux / ppc40x / patches / 005-magicboxv1.patch

diff --git a/target/linux/ppc40x/patches/005-magicboxv1.patch b/target/linux/ppc40x/patches/005-magicboxv1.patch
index 159e4f8..7c2abd3 100644 (file)
--- a/target/linux/ppc40x/patches/005-magicboxv1.patch
+++ b/target/linux/ppc40x/patches/005-magicboxv1.patch
@@ -31,7 +31,7 @@
 +      ibm4xx_sdram_fixup_memsize();
 +      dt_fixup_mac_addresses(&bd.bi_enetaddr);
 +}
 +      ibm4xx_sdram_fixup_memsize();
 +      dt_fixup_mac_addresses(&bd.bi_enetaddr);
 +}

-+      
++

 +void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
 +              unsigned long r6, unsigned long r7)
 +{
 +void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
 +              unsigned long r6, unsigned long r7)
 +{


@@ -203,11 +203,11 @@
 +                              #size-cells = <1>;
 +                              partition@0 {
 +                                      label = "linux";
 +                              #size-cells = <1>;
 +                              partition@0 {
 +                                      label = "linux";

-+                                      reg = <0x0 0x3c0000>;
++                                      reg = <0x0 0x120000>;

 +                              };
 +                              };

-+                              partition@100000 {
++                              partition@120000 {

 +                                      label = "rootfs";
 +                                      label = "rootfs";

-+                                      reg = <0x100000 0x2c0000>;
++                                      reg = <0x120000 0x2a0000>;

 +                              };
 +                              partition@3c0000 {
 +                                      label = "u-boot";
 +                              };
 +                              partition@3c0000 {
 +                                      label = "u-boot";


@@ -263,7 +263,7 @@
 +};
 --- a/arch/powerpc/boot/Makefile
 +++ b/arch/powerpc/boot/Makefile
 +};
 --- a/arch/powerpc/boot/Makefile
 +++ b/arch/powerpc/boot/Makefile

-@@ -69,7 +69,7 @@ src-plat := of.c cuboot-52xx.c cuboot-82
+@@ -70,7 +70,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 \
                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 \


@@ -272,7 +272,7 @@
  src-boot := $(src-wlib) $(src-plat) empty.c
  
  src-boot := $(addprefix $(obj)/, $(src-boot))
  src-boot := $(src-wlib) $(src-plat) empty.c
  
  src-boot := $(addprefix $(obj)/, $(src-boot))

-@@ -213,6 +213,7 @@ image-$(CONFIG_DEFAULT_UIMAGE)             += uImag
+@@ -214,6 +214,7 @@ image-$(CONFIG_DEFAULT_UIMAGE)             += uImag

  image-$(CONFIG_EP405)                 += dtbImage.ep405
  image-$(CONFIG_WALNUT)                        += treeImage.walnut
  image-$(CONFIG_ACADIA)                        += cuImage.acadia
  image-$(CONFIG_EP405)                 += dtbImage.ep405
  image-$(CONFIG_WALNUT)                        += treeImage.walnut
  image-$(CONFIG_ACADIA)                        += cuImage.acadia


@@ -282,7 +282,7 @@
  image-$(CONFIG_EBONY)                 += treeImage.ebony cuImage.ebony
 --- a/arch/powerpc/platforms/40x/Kconfig
 +++ b/arch/powerpc/platforms/40x/Kconfig
  image-$(CONFIG_EBONY)                 += treeImage.ebony cuImage.ebony
 --- a/arch/powerpc/platforms/40x/Kconfig
 +++ b/arch/powerpc/platforms/40x/Kconfig

-@@ -41,6 +41,16 @@ config KILAUEA
+@@ -49,6 +49,16 @@ config KILAUEA

        help
          This option enables support for the AMCC PPC405EX evaluation board.
  
        help
          This option enables support for the AMCC PPC405EX evaluation board.