diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2012-03-27 19:38:07 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2012-03-27 19:38:07 +0000 |
| commit | 6cd5fb7001902a47088303c1fd228ee0253c9255 (patch) | |
| tree | 5fde57c560fd28a44198b709a2d280eabe8a93d4 | |
| parent | 61ee283899fb0a5df92787302e80f84b4d4aa755 (diff) | |
| download | upstream-6cd5fb7001902a47088303c1fd228ee0253c9255.tar.gz upstream-6cd5fb7001902a47088303c1fd228ee0253c9255.tar.bz2 upstream-6cd5fb7001902a47088303c1fd228ee0253c9255.zip | |
ar71xx: remove the built-in MTD map of the AP96 board
Pass the mtd_layout via the kernel command line instead.
SVN-Revision: 31112
| -rw-r--r-- | target/linux/ar71xx/files/arch/mips/ath79/mach-ap96.c | 36 | ||||
| -rw-r--r-- | target/linux/ar71xx/image/Makefile | 1 |
2 files changed, 2 insertions, 35 deletions
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-ap96.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-ap96.c index 9ab36cc1cb..35120d3e2e 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/mach-ap96.c +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-ap96.c @@ -11,8 +11,6 @@ */ #include <linux/platform_device.h> -#include <linux/mtd/mtd.h> -#include <linux/mtd/partitions.h> #include <linux/delay.h> #include <asm/mach-ath79/ath79.h> @@ -45,38 +43,6 @@ #define AP96_CALDATA0_OFFSET 0x1000 #define AP96_CALDATA1_OFFSET 0x5000 -static struct mtd_partition ap96_partitions[] = { - { - .name = "uboot", - .offset = 0, - .size = 0x030000, - .mask_flags = MTD_WRITEABLE, - }, { - .name = "env", - .offset = 0x030000, - .size = 0x010000, - .mask_flags = MTD_WRITEABLE, - }, { - .name = "rootfs", - .offset = 0x040000, - .size = 0x600000, - }, { - .name = "uImage", - .offset = 0x640000, - .size = 0x1b0000, - }, { - .name = "caldata", - .offset = 0x7f0000, - .size = 0x010000, - .mask_flags = MTD_WRITEABLE, - } -}; - -static struct flash_platform_data ap96_flash_data = { - .parts = ap96_partitions, - .nr_parts = ARRAY_SIZE(ap96_partitions), -}; - /* * AP96 has 12 unlabeled leds in the front; these are numbered from 1 to 12 * below (from left to right on the board). Led 1 seems to be on whenever the @@ -158,7 +124,7 @@ static void __init ap96_setup(void) ath79_register_usb(); - ath79_register_m25p80(&ap96_flash_data); + ath79_register_m25p80(NULL); ath79_register_leds_gpio(-1, ARRAY_SIZE(ap96_leds_gpio), ap96_leds_gpio); diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile index 2203bec2e5..0790e25e1a 100644 --- a/target/linux/ar71xx/image/Makefile +++ b/target/linux/ar71xx/image/Makefile @@ -658,6 +658,7 @@ define Image/Build/Profile/AP83 endef ap96_cmdline=board=AP96 console=ttyS0,115200 +ap96_mtdlayout=mtdparts=spi0.0:192k(u-boot)ro,64k(u-boot-env)ro,6144k(rootfs),1728k(kernel),64k(art)ro,7872k@0x40000(firmware) define Image/Build/Profile/AP96 $(call Image/Build/Template/$(fs_64k)/$(1),AthGzip,ap96,$(ap96_cmdline),ap96_mtdlayout,1769472,6291456,RKuImage) endef |