kernel: update bcma with most patches from wireless-drivers-next

[oweals/openwrt.git] / target / linux / avr32 / patches-3.10 / 110-openwrt_flashmap.patch

diff --git a/target/linux/avr32/patches-3.10/110-openwrt_flashmap.patch b/target/linux/avr32/patches-3.10/110-openwrt_flashmap.patch
index 3f87699b04bd13f3d5d3aa4174245ae54dc7466e..876eb71c4949304556cdd94f95a61cf0111a84cf 100644 (file)
--- a/target/linux/avr32/patches-3.10/110-openwrt_flashmap.patch
+++ b/target/linux/avr32/patches-3.10/110-openwrt_flashmap.patch
@@ -1,31 +1,11 @@
 --- a/arch/avr32/boards/atngw100/flash.c
 +++ b/arch/avr32/boards/atngw100/flash.c
-@@ -45,9 +45,14 @@ static struct mtd_partition flash_parts[
+@@ -45,7 +45,7 @@ static struct mtd_partition flash_parts[
                .mask_flags     = MTD_WRITEABLE,
        },
        {
 -              .name           = "root",
-+              .name           = "kernel",
++              .name           = "firmware",
                .offset         = 0x00020000,
--              .size           = 0x007d0000,
-+              .size           = 0x00100000,
-+      },
-+      {
-+              .name           = "rootfs",
-+              .offset         = 0x00120000,
-+              .size           = 0x006d0000,
+               .size           = 0x007d0000,
        },
-       {
-               .name           = "env",
-@@ -55,6 +60,11 @@ static struct mtd_partition flash_parts[
-               .size           = 0x00010000,
-               .mask_flags     = MTD_WRITEABLE,
-       },
-+      {
-+              .name           = "firmware",
-+              .offset         = 0x00020000,
-+              .size           = 0x007d0000,
-+      },
- };
- 
- static struct physmap_flash_data flash_data = {