[ARM] 5257/2: [AT91] Use SZ_ definitions and MTDPART_OFS_NXTBLK instead of hex-values

In the various AT91 board files, replace hard-coded size values (eg,
0x800000) with the SZ_ size definitions (eg, SZ_8M) from sizes.h
Also replace MTD partition offsets with MTDPART_OFS_NXTBLK.

Signed-off-by: Andrew Victor <linux@maxim.org.za>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 3 insertions, 3 deletions

diff --git a/arch/arm/mach-at91/board-sam9260ek.c b/arch/arm/mach-at91/board-sam9260ek.c
index 0a53c038b518..e22433d5dfb6 100644
--- a/arch/arm/mach-at91/board-sam9260ek.c
+++ b/arch/arm/mach-at91/board-sam9260ek.c
@@ -29,7 +29,6 @@
 #include <linux/clk.h>
 #include <linux/i2c/at24.h>
 
-#include <mach/hardware.h>
 #include <asm/setup.h>
 #include <asm/mach-types.h>
 #include <asm/irq.h>
@@ -38,6 +37,7 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
+#include <mach/hardware.h>
 #include <mach/board.h>
 #include <mach/gpio.h>
 
@@ -164,11 +164,11 @@ static struct mtd_partition __initdata ek_nand_partition[] = {
         {
                 .name   = "Partition 1",
                 .offset = 0,
-                .size   = 256 * 1024,
+                .size   = SZ_256K,
         },
         {
                 .name   = "Partition 2",
-                .offset = 256 * 1024,
+                .offset = MTDPART_OFS_NXTBLK,
                 .size   = MTDPART_SIZ_FULL,
         },
 };