diff --git a/arch/arm/mach-mx5/mx51_efikamx_nor.c b/arch/arm/mach-mx5/mx51_efikamx_nor.c index 8c4d4e5a0b3..82ef785be7c 100644 --- a/arch/arm/mach-mx5/mx51_efikamx_nor.c +++ b/arch/arm/mach-mx5/mx51_efikamx_nor.c @@ -37,12 +37,17 @@ static struct mtd_partition mx51_efikamx_spi_nor_partitions[] = { { .name = "u-boot", .offset = 0x0, - .size = 0x00040000, /* 256KB */ + .size = SZ_256K, }, { .name = "config", - .offset = 0x00040000, - .size = 0x00010000, /* 64KB */ + .offset = MTDPART_OFS_APPEND, + .size = SZ_64K, + }, + { + .name = "spare", + .offset = MTDPART_OFS_APPEND, + .size = MTDPART_SIZ_FULL, }, }; @@ -67,4 +72,4 @@ void mx51_efikamx_init_nor(void) { (void)spi_register_board_info(mx51_efikamx_spi_board_info, ARRAY_SIZE(mx51_efikamx_spi_board_info)); -} \ No newline at end of file +} diff --git a/arch/arm/mach-mx5/mx51_efikasb.c b/arch/arm/mach-mx5/mx51_efikasb.c index 1e97951b25f..fb82a801005 100644 --- a/arch/arm/mach-mx5/mx51_efikasb.c +++ b/arch/arm/mach-mx5/mx51_efikasb.c @@ -388,29 +388,22 @@ static struct i2c_board_info mxc_i2c1_board_info[] __initdata = { #endif #if defined(CONFIG_MTD) || defined(CONFIG_MTD_MODULE) + static struct mtd_partition mxc_spi_flash_partitions[] = { { - .name = "redboot", - .offset = 0, - .size = 0x00040000, - .mask_flags = MTD_CAP_ROM, + .name = "u-boot", + .offset = 0x0, + .size = SZ_256K, }, { - .name = "fis-dir", - .offset = MTDPART_OFS_APPEND, - .size = 0x0000F000, - .mask_flags = MTD_CAP_ROM, + .name = "config", + .offset = MTDPART_OFS_APPEND, + .size = SZ_64K, }, { - .name = "rb-config", - .offset = MTDPART_OFS_APPEND, - .size = 0x00001000, - .mask_flags = MTD_CAP_ROM, - }, - { - .name = "kernel", - .offset = 0x00100000, - .size = MTDPART_SIZ_FULL, + .name = "spare", + .offset = MTDPART_OFS_APPEND, + .size = MTDPART_SIZ_FULL, }, };