ar71xx: remove the built-in MTD map of the Zcomax devices

Pass the mtd_layout via the kernel command line instead.

SVN-Revision: 31110

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-zcn-1523h.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-zcn-1523h.c
index af6db6ad60220d84ce8dcce64fbdc870a7c67213..3a6fe21ed223704dc641075169db7a1a46e3886c 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-zcn-1523h.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-zcn-1523h.c
@@ -8,9 +8,6 @@
  *  by the Free Software Foundation.
  */
 
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/partitions.h>
-
 #include <asm/mach-ath79/ath79.h>
 #include <asm/mach-ath79/ar71xx_regs.h>
 
@@ -39,52 +36,6 @@
 #define ZCN_1523H_KEYS_POLL_INTERVAL   20      /* msecs */
 #define ZCN_1523H_KEYS_DEBOUNCE_INTERVAL (3 * ZCN_1523H_KEYS_POLL_INTERVAL)
 
-static struct mtd_partition zcn_1523h_partitions[] = {
-       {
-               .name           = "u-boot",
-               .offset         = 0,
-               .size           = 0x040000,
-               .mask_flags     = MTD_WRITEABLE,
-       }, {
-               .name           = "u-boot-env",
-               .offset         = 0x040000,
-               .size           = 0x010000,
-               .mask_flags     = MTD_WRITEABLE,
-       }, {
-               .name           = "rootfs",
-               .offset         = 0x050000,
-               .size           = 0x610000,
-       }, {
-               .name           = "kernel",
-               .offset         = 0x660000,
-               .size           = 0x170000,
-       }, {
-               .name           = "configure",
-               .offset         = 0x7d0000,
-               .size           = 0x010000,
-               .mask_flags     = MTD_WRITEABLE,
-       }, {
-               .name           = "mfg",
-               .offset         = 0x7e0000,
-               .size           = 0x010000,
-               .mask_flags     = MTD_WRITEABLE,
-       }, {
-               .name           = "eeprom",
-               .offset         = 0x7f0000,
-               .size           = 0x010000,
-               .mask_flags     = MTD_WRITEABLE,
-       }, {
-               .name           = "firmware",
-               .offset         = 0x050000,
-               .size           = 0x780000,
-       }
-};
-
-static struct flash_platform_data zcn_1523h_flash_data = {
-       .parts          = zcn_1523h_partitions,
-       .nr_parts       = ARRAY_SIZE(zcn_1523h_partitions),
-};
-
 static struct gpio_keys_button zcn_1523h_gpio_keys[] __initdata = {
        {
                .desc           = "reset",
@@ -158,7 +109,7 @@ static void __init zcn_1523h_generic_setup(void)
                                    AR724X_GPIO_FUNC_ETH_SWITCH_LED3_EN |
                                    AR724X_GPIO_FUNC_ETH_SWITCH_LED4_EN);
 
-       ath79_register_m25p80(&zcn_1523h_flash_data);
+       ath79_register_m25p80(NULL);
 
        ath79_register_leds_gpio(0, ARRAY_SIZE(zcn_1523h_leds_gpio),
                                        zcn_1523h_leds_gpio);

diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
index cfffb896190f46817da1b9c087d1d50d65d526c1..d6fc0089543771acabfcc96a517da037eac41b91 100644 (file)
--- a/target/linux/ar71xx/image/Makefile
+++ b/target/linux/ar71xx/image/Makefile
@@ -995,12 +995,13 @@ define Image/Build/Profile/WZRHPG450H
        $(call Image/Build/Template/$(fs_64k)/$(1),WZRHPG30XNH,wzr-hp-g450h,$(wzrhpg450h_cmdline),WZR-HP-AG450H)
 endef
 
-zcn1523h28_cmdline=board=ZCN-1523H-2 console=ttyS0,115200
+zcn1523h_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,6208k(rootfs),1472k(kernel),64k(configure)ro,64k(mfg)ro,64k(art)ro,7680k@0x50000(firmware)
+zcn1523h28_cmdline=board=ZCN-1523H-2 console=ttyS0,115200 $(zcn1523h_mtdlayout)
 define Image/Build/Profile/ZCN1523H28
        $(call Image/Build/Template/$(fs_64k)/$(1),Zcomax,zcn-1523h-2-8,$(zcn1523h28_cmdline))
 endef
 
-zcn1523h516_cmdline=board=ZCN-1523H-5 console=ttyS0,115200
+zcn1523h516_cmdline=board=ZCN-1523H-5 console=ttyS0,115200 $(zcn1523h_mtdlayout)
 define Image/Build/Profile/ZCN1523H516
        $(call Image/Build/Template/$(fs_64k)/$(1),Zcomax,zcn-1523h-5-16,$(zcn1523h516_cmdline))
 endef