ar71xx: remove the built-in MTD map of the PB92 board

Pass the mtd_layout via the kernel command line instead

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31111 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-pb92.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-pb92.c
index ff01f72..76715a5 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-pb92.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-pb92.c
@@ -10,9 +10,6 @@
  *  by the Free Software Foundation.
  */
 
  *  by the Free Software Foundation.
  */
 

-#include <linux/mtd/mtd.h>
-#include <linux/mtd/partitions.h>
-

 #include <asm/mach-ath79/ath79.h>
 
 #include "dev-eth.h"
 #include <asm/mach-ath79/ath79.h>
 
 #include "dev-eth.h"


@@ -22,37 +19,6 @@
 #include "machtypes.h"
 #include "pci.h"
 
 #include "machtypes.h"
 #include "pci.h"
 

-static struct mtd_partition pb92_partitions[] = {
-       {
-               .name           = "u-boot",
-               .offset         = 0,
-               .size           = 0x040000,
-               .mask_flags     = MTD_WRITEABLE,
-       }, {
-               .name           = "u-boot-env",
-               .offset         = 0x040000,
-               .size           = 0x010000,
-       }, {
-               .name           = "rootfs",
-               .offset         = 0x050000,
-               .size           = 0x2b0000,
-       }, {
-               .name           = "uImage",
-               .offset         = 0x300000,
-               .size           = 0x0e0000,
-       }, {
-               .name           = "ART",
-               .offset         = 0x3e0000,
-               .size           = 0x020000,
-               .mask_flags     = MTD_WRITEABLE,
-       }
-};
-
-static struct flash_platform_data pb92_flash_data = {
-       .parts          = pb92_partitions,
-       .nr_parts       = ARRAY_SIZE(pb92_partitions),
-};
-

 #define PB92_KEYS_POLL_INTERVAL                20      /* msecs */
 #define PB92_KEYS_DEBOUNCE_INTERVAL    (3 * PB92_KEYS_POLL_INTERVAL)
 
 #define PB92_KEYS_POLL_INTERVAL                20      /* msecs */
 #define PB92_KEYS_DEBOUNCE_INTERVAL    (3 * PB92_KEYS_POLL_INTERVAL)
 


@@ -81,7 +47,7 @@ static void __init pb92_init(void)
 {
        u8 *mac = (u8 *) KSEG1ADDR(0x1fff0000);
 
 {
        u8 *mac = (u8 *) KSEG1ADDR(0x1fff0000);
 

-       ath79_register_m25p80(&pb92_flash_data);
+       ath79_register_m25p80(NULL);

 
        ath79_register_mdio(0, ~BIT(0));
        ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0);
 
        ath79_register_mdio(0, ~BIT(0));
        ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0);

diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
index d6fc008..2203bec 100644 (file)
--- a/target/linux/ar71xx/image/Makefile
+++ b/target/linux/ar71xx/image/Makefile
@@ -679,8 +679,9 @@ define Image/Build/Profile/PB44
 endef
 
 pb92_cmdline=board=PB92 console=ttyS0,115200
 endef
 
 pb92_cmdline=board=PB92 console=ttyS0,115200

+pb92_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,2752k(rootfs),896k(kernel),64k(nvram),64k(art)ro,3648k@0x50000(firmware)

 define Image/Build/Profile/PB92
 define Image/Build/Profile/PB92

-       $(call Image/Build/Template/$(fs_64k)/$(1),AthLzma,pb92,$(pb92_cmdline),,917504,2818048,KRuImage)
+       $(call Image/Build/Template/$(fs_64k)/$(1),AthLzma,pb92,$(pb92_cmdline),$(pb92_mtdlayout),917504,2818048,KRuImage)

 endef
 
 wp543_cmdline=console=ttyS0,115200
 endef
 
 wp543_cmdline=console=ttyS0,115200