From e27017a7280e64c09b8e74e702610e7a6688a130 Mon Sep 17 00:00:00 2001
From: juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 27 Mar 2012 19:38:01 +0000
Subject: ar71xx: remove the built-in MTD maps of several boards

We are passing the MTD layout via the kernel command line, so
it makes no sense to duplicate it in mach-* files. The patch
removes the built-in MTD maps of the following boards:

 * AP113
 * ALFA N2/N5
 * DIR-600
 * DIR-615
 * DIR-825
 * TEW-6{3,5}2BRP
 * TEW-673GRU
 * WHR-G301N
 * WHR-HP-GN
 * WHR-HP-G300N

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31108 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 .../ar71xx/files/arch/mips/ath79/mach-dir-615-c1.c | 40 +---------------------
 1 file changed, 1 insertion(+), 39 deletions(-)

(limited to 'target/linux/ar71xx/files/arch/mips/ath79/mach-dir-615-c1.c')

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-dir-615-c1.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-dir-615-c1.c
index b15fc6814..425be301e 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-dir-615-c1.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-dir-615-c1.c
@@ -9,9 +9,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"
@@ -41,41 +38,6 @@
 #define DIR_615C1_CONFIG_ADDR		0x1f020000
 #define DIR_615C1_CONFIG_SIZE		0x10000
 
-static struct mtd_partition dir_615c1_partitions[] = {
-	{
-		.name		= "u-boot",
-		.offset		= 0,
-		.size		= 0x020000,
-		.mask_flags	= MTD_WRITEABLE,
-	}, {
-		.name		= "config",
-		.offset		= 0x020000,
-		.size		= 0x010000,
-	}, {
-		.name		= "kernel",
-		.offset		= 0x030000,
-		.size		= 0x0e0000,
-	}, {
-		.name		= "rootfs",
-		.offset		= 0x110000,
-		.size		= 0x2e0000,
-	}, {
-		.name		= "art",
-		.offset		= 0x3f0000,
-		.size		= 0x010000,
-		.mask_flags	= MTD_WRITEABLE,
-	}, {
-		.name		= "firmware",
-		.offset		= 0x030000,
-		.size		= 0x3c0000,
-	}
-};
-
-static struct flash_platform_data dir_615c1_flash_data = {
-	.parts		= dir_615c1_partitions,
-	.nr_parts	= ARRAY_SIZE(dir_615c1_partitions),
-};
-
 static struct gpio_led dir_615c1_leds_gpio[] __initdata = {
 	{
 		.name		= "d-link:orange:status",
@@ -155,7 +117,7 @@ static void __init dir_615c1_setup(void)
 	ath79_register_eth(0);
 	ath79_register_eth(1);
 
-	ath79_register_m25p80(&dir_615c1_flash_data);
+	ath79_register_m25p80(NULL);
 
 	ath79_register_leds_gpio(-1, ARRAY_SIZE(dir_615c1_leds_gpio),
 				 dir_615c1_leds_gpio);
-- 
cgit v1.2.3