From ba06bbe662827eae889dcf82fbc159f62bb02d81 Mon Sep 17 00:00:00 2001
From: Gabor Juhos <juhosg@openwrt.org>
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-alfa-nx.c    | 46 +---------------------
 1 file changed, 1 insertion(+), 45 deletions(-)

(limited to 'target/linux/ar71xx/files/arch/mips/ath79/mach-alfa-nx.c')

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-alfa-nx.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-alfa-nx.c
index d37e63fe12..a515f4f540 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-alfa-nx.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-alfa-nx.c
@@ -8,9 +8,6 @@
  *  by the Free Software Foundation.
  */
 
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/partitions.h>
-
 #include <asm/mach-ath79/ar71xx_regs.h>
 #include <asm/mach-ath79/ath79.h>
 
@@ -38,47 +35,6 @@
 #define ALFA_NX_MAC1_OFFSET		6
 #define ALFA_NX_CALDATA_OFFSET		0x1000
 
-static struct mtd_partition alfa_nx_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		= 0x600000,
-	}, {
-		.name		= "kernel",
-		.offset		= 0x650000,
-		.size		= 0x190000,
-	}, {
-		.name		= "nvram",
-		.offset		= 0x7e0000,
-		.size		= 0x010000,
-		.mask_flags	= MTD_WRITEABLE,
-	}, {
-		.name		= "art",
-		.offset		= 0x7f0000,
-		.size		= 0x010000,
-		.mask_flags	= MTD_WRITEABLE,
-	}, {
-		.name		= "firmware",
-		.offset		= 0x050000,
-		.size		= 0x780000,
-	}
-};
-
-static struct flash_platform_data alfa_nx_flash_data = {
-	.parts		= alfa_nx_partitions,
-	.nr_parts	= ARRAY_SIZE(alfa_nx_partitions),
-};
-
 static struct gpio_keys_button alfa_nx_gpio_keys[] __initdata = {
 	{
 		.desc		= "Reset button",
@@ -129,7 +85,7 @@ static void __init alfa_nx_setup(void)
 				  AR724X_GPIO_FUNC_ETH_SWITCH_LED3_EN |
 				  AR724X_GPIO_FUNC_ETH_SWITCH_LED4_EN);
 
-	ath79_register_m25p80(&alfa_nx_flash_data);
+	ath79_register_m25p80(NULL);
 
 	ath79_register_leds_gpio(0, ARRAY_SIZE(alfa_nx_leds_gpio),
 				 alfa_nx_leds_gpio);
-- 
cgit v1.2.3