[Blackfin] arch: fix bug - set right partition size in the board files

 - set default u-boot partition size to 256k
 - modify the offset with the size change
 - use mtd defines (append for offset and full for size)
   where applicable rather than churning constants when we dont have to

Signed-off-by: Grace Pan <grace.pan@analog.com>
Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>

6 files changed, 25 insertions, 25 deletions

diff --git a/arch/blackfin/mach-bf527/boards/ezkit.c b/arch/blackfin/mach-bf527/boards/ezkit.c
index 337515fba612..a28d5df20d71 100644
--- a/arch/blackfin/mach-bf527/boards/ezkit.c
+++ b/arch/blackfin/mach-bf527/boards/ezkit.c
@@ -180,8 +180,8 @@ static struct mtd_partition partition_info[] = {
         },
         {
                 .name = "File System",
-                .offset = 4 * SIZE_1M,
-                .size = (256 - 4) * SIZE_1M,
+                .offset = MTDPART_OFS_APPEND,
+                .size = MTDPART_SIZ_FULL,
         },
 };
 
@@ -422,11 +422,11 @@ static struct mtd_partition bfin_spi_flash_partitions[] = {
         }, {
                 .name = "kernel",
                 .size = 0xe0000,
-                .offset = 0x20000
+                .offset = MTDPART_OFS_APPEND,
         }, {
                 .name = "file system",
-                .size = 0x700000,
-                .offset = 0x00100000,
+                .size = MTDPART_SIZ_FULL,
+                .offset = MTDPART_OFS_APPEND,
         }
 };
 
diff --git a/arch/blackfin/mach-bf533/boards/ezkit.c b/arch/blackfin/mach-bf533/boards/ezkit.c
index 2b09aa39f565..73f76af73e96 100644
--- a/arch/blackfin/mach-bf533/boards/ezkit.c
+++ b/arch/blackfin/mach-bf533/boards/ezkit.c
@@ -99,11 +99,11 @@ static struct mtd_partition bfin_spi_flash_partitions[] = {
         }, {
                 .name = "kernel",
                 .size = 0xe0000,
-                .offset = 0x20000
+                .offset = MTDPART_OFS_APPEND,
         }, {
                 .name = "file system",
-                .size = 0x700000,
-                .offset = 0x00100000,
+                .size = MTDPART_SIZ_FULL,
+                .offset = MTDPART_OFS_APPEND,
         }
 };
 
diff --git a/arch/blackfin/mach-bf533/boards/stamp.c b/arch/blackfin/mach-bf533/boards/stamp.c
index a645f6fd091b..324317a89105 100644
--- a/arch/blackfin/mach-bf533/boards/stamp.c
+++ b/arch/blackfin/mach-bf533/boards/stamp.c
@@ -112,7 +112,7 @@ static struct platform_device net2272_bfin_device = {
 static struct mtd_partition stamp_partitions[] = {
         {
                 .name   = "Bootloader",
-                .size   = 0x20000,
+                .size   = 0x40000,
                 .offset = 0,
         }, {
                 .name   = "Kernel",
@@ -160,17 +160,17 @@ static struct platform_device stamp_flash_device = {
 static struct mtd_partition bfin_spi_flash_partitions[] = {
         {
                 .name = "bootloader",
-                .size = 0x00020000,
+                .size = 0x00040000,
                 .offset = 0,
                 .mask_flags = MTD_CAP_ROM
         }, {
                 .name = "kernel",
                 .size = 0xe0000,
-                .offset = 0x20000
+                .offset = MTDPART_OFS_APPEND,
         }, {
                 .name = "file system",
-                .size = 0x700000,
-                .offset = 0x00100000,
+                .size = MTDPART_SIZ_FULL,
+                .offset = MTDPART_OFS_APPEND,
         }
 };
 
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
index 9e2277e0d25c..9c6fa70c4064 100644
--- a/arch/blackfin/mach-bf537/boards/stamp.c
+++ b/arch/blackfin/mach-bf537/boards/stamp.c
@@ -343,7 +343,7 @@ static struct platform_device net2272_bfin_device = {
 static struct mtd_partition stamp_partitions[] = {
         {
                 .name       = "Bootloader",
-                .size       = 0x20000,
+                .size       = 0x40000,
                 .offset     = 0,
         }, {
                 .name       = "Kernel",
@@ -351,7 +351,7 @@ static struct mtd_partition stamp_partitions[] = {
                 .offset     = MTDPART_OFS_APPEND,
         }, {
                 .name       = "RootFS",
-                .size       = 0x400000 - 0x20000 - 0xE0000 - 0x10000,
+                .size       = 0x400000 - 0x40000 - 0xE0000 - 0x10000,
                 .offset     = MTDPART_OFS_APPEND,
         }, {
                 .name       = "MAC Address",
@@ -391,17 +391,17 @@ static struct platform_device stamp_flash_device = {
 static struct mtd_partition bfin_spi_flash_partitions[] = {
         {
                 .name = "bootloader",
-                .size = 0x00020000,
+                .size = 0x00040000,
                 .offset = 0,
                 .mask_flags = MTD_CAP_ROM
         }, {
                 .name = "kernel",
                 .size = 0xe0000,
-                .offset = 0x20000
+                .offset = MTDPART_OFS_APPEND,
         }, {
                 .name = "file system",
-                .size = 0x700000,
-                .offset = 0x00100000,
+                .size = MTDPART_SIZ_FULL,
+                .offset = MTDPART_OFS_APPEND,
         }
 };
 
diff --git a/arch/blackfin/mach-bf548/boards/ezkit.c b/arch/blackfin/mach-bf548/boards/ezkit.c
index 916e963e83ba..47a4f5547cf5 100644
--- a/arch/blackfin/mach-bf548/boards/ezkit.c
+++ b/arch/blackfin/mach-bf548/boards/ezkit.c
@@ -285,8 +285,8 @@ static struct mtd_partition partition_info[] = {
         },
         {
                 .name = "File System",
-                .offset = 4 * SIZE_1M,
-                .size = (256 - 4) * SIZE_1M,
+                .offset = MTDPART_OFS_APPEND,
+                .size = MTDPART_SIZ_FULL,
         },
 };
 
@@ -333,7 +333,7 @@ static struct platform_device bf54x_sdh_device = {
 static struct mtd_partition ezkit_partitions[] = {
         {
                 .name       = "Bootloader",
-                .size       = 0x20000,
+                .size       = 0x40000,
                 .offset     = 0,
         }, {
                 .name       = "Kernel",
@@ -381,8 +381,8 @@ static struct mtd_partition bfin_spi_flash_partitions[] = {
                 .mask_flags = MTD_CAP_ROM
         }, {
                 .name = "linux kernel",
-                .size = 0x1c0000,
-                .offset = 0x40000
+                .size = MTDPART_SIZ_FULL,
+                .offset = MTDPART_OFS_APPEND,
         }
 };
 
diff --git a/arch/blackfin/mach-bf561/boards/ezkit.c b/arch/blackfin/mach-bf561/boards/ezkit.c
index 43c1b0982819..480b0a91a748 100644
--- a/arch/blackfin/mach-bf561/boards/ezkit.c
+++ b/arch/blackfin/mach-bf561/boards/ezkit.c
@@ -223,7 +223,7 @@ static struct platform_device bfin_uart_device = {
 static struct mtd_partition ezkit_partitions[] = {
         {
                 .name       = "Bootloader",
-                .size       = 0x20000,
+                .size       = 0x40000,
                 .offset     = 0,
         }, {
                 .name       = "Kernel",