aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-03-27 19:38:05 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-03-27 19:38:05 +0000
commit61ee283899fb0a5df92787302e80f84b4d4aa755 (patch)
tree3f7a213cedd5344978b9bb9423729fe0dc8d2237
parent1094dc19962dae9c5181ebbbc2922688cb843e67 (diff)
downloadupstream-61ee283899fb0a5df92787302e80f84b4d4aa755.tar.gz
upstream-61ee283899fb0a5df92787302e80f84b4d4aa755.tar.bz2
upstream-61ee283899fb0a5df92787302e80f84b4d4aa755.zip
ar71xx: remove the built-in MTD map of the PB92 board
Pass the mtd_layout via the kernel command line instead SVN-Revision: 31111
-rw-r--r--target/linux/ar71xx/files/arch/mips/ath79/mach-pb92.c36
-rw-r--r--target/linux/ar71xx/image/Makefile3
2 files changed, 3 insertions, 36 deletions
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 ff01f72869..76715a517e 100644
--- 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.
*/
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/partitions.h>
-
#include <asm/mach-ath79/ath79.h>
#include "dev-eth.h"
@@ -22,37 +19,6 @@
#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)
@@ -81,7 +47,7 @@ static void __init pb92_init(void)
{
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);
diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
index d6fc008954..2203bec2e5 100644
--- 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
+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
- $(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