aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-11-22 19:43:26 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-11-22 19:43:26 +0000
commitc27b9bf6db7c1a9ac0593ff8ffcbff10816b9fd0 (patch)
tree6e34d46327c73875edd7c2de7d08d7c66b99d48e
parent6113df909539729a6da81f6054bfcec8e5cba89b (diff)
downloadupstream-c27b9bf6db7c1a9ac0593ff8ffcbff10816b9fd0.tar.gz
upstream-c27b9bf6db7c1a9ac0593ff8ffcbff10816b9fd0.tar.bz2
upstream-c27b9bf6db7c1a9ac0593ff8ffcbff10816b9fd0.zip
enable MyLoader partition parser
SVN-Revision: 13317
-rw-r--r--target/linux/atheros/config-2.6.261
-rw-r--r--target/linux/atheros/config-2.6.271
-rw-r--r--target/linux/atheros/files/drivers/mtd/devices/spiflash.c2
-rw-r--r--target/linux/generic-2.6/patches-2.6.26/081-mtd_myloader_partition_parser.patch2
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/081-mtd_myloader_partition_parser.patch2
5 files changed, 5 insertions, 3 deletions
diff --git a/target/linux/atheros/config-2.6.26 b/target/linux/atheros/config-2.6.26
index a1ac8b11ca..1ad539e16b 100644
--- a/target/linux/atheros/config-2.6.26
+++ b/target/linux/atheros/config-2.6.26
@@ -146,6 +146,7 @@ CONFIG_MTD_MAP_BANK_WIDTH_2=y
CONFIG_MTD_MAP_BANK_WIDTH_4=y
# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
# CONFIG_MTD_MTDRAM is not set
+CONFIG_MTD_MYLOADER_PARTS=y
# CONFIG_MTD_ONENAND is not set
# CONFIG_MTD_OTP is not set
CONFIG_MTD_PARTITIONS=y
diff --git a/target/linux/atheros/config-2.6.27 b/target/linux/atheros/config-2.6.27
index e93ea77bab..e4453807c7 100644
--- a/target/linux/atheros/config-2.6.27
+++ b/target/linux/atheros/config-2.6.27
@@ -145,6 +145,7 @@ CONFIG_MTD_MAP_BANK_WIDTH_2=y
CONFIG_MTD_MAP_BANK_WIDTH_4=y
# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
# CONFIG_MTD_MTDRAM is not set
+CONFIG_MTD_MYLOADER_PARTS=y
# CONFIG_MTD_ONENAND is not set
# CONFIG_MTD_OTP is not set
CONFIG_MTD_PARTITIONS=y
diff --git a/target/linux/atheros/files/drivers/mtd/devices/spiflash.c b/target/linux/atheros/files/drivers/mtd/devices/spiflash.c
index c4c2016d8b..92d4fff997 100644
--- a/target/linux/atheros/files/drivers/mtd/devices/spiflash.c
+++ b/target/linux/atheros/files/drivers/mtd/devices/spiflash.c
@@ -425,7 +425,7 @@ spiflash_write (struct mtd_info *mtd,loff_t to,size_t len,size_t *retlen,const u
#ifdef CONFIG_MTD_PARTITIONS
-static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", NULL };
+static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", "MyLoader", NULL };
#endif
diff --git a/target/linux/generic-2.6/patches-2.6.26/081-mtd_myloader_partition_parser.patch b/target/linux/generic-2.6/patches-2.6.26/081-mtd_myloader_partition_parser.patch
index 3095393e53..dcf243a482 100644
--- a/target/linux/generic-2.6/patches-2.6.26/081-mtd_myloader_partition_parser.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/081-mtd_myloader_partition_parser.patch
@@ -6,7 +6,7 @@
+config MTD_MYLOADER_PARTS
+ tristate "MyLoader partition parsing"
-+ depends on MTD_PARTITIONS && (ADM5120 || ATHEROS_AR71XX)
++ depends on MTD_PARTITIONS && (ADM5120 || ATHEROS || ATHEROS_AR71XX)
+ ---help---
+ MyLoader is a bootloader which allows the user to define partitions
+ in flash devices, by putting a table in the second erase block
diff --git a/target/linux/generic-2.6/patches-2.6.27/081-mtd_myloader_partition_parser.patch b/target/linux/generic-2.6/patches-2.6.27/081-mtd_myloader_partition_parser.patch
index e2305089ea..7a5addd63c 100644
--- a/target/linux/generic-2.6/patches-2.6.27/081-mtd_myloader_partition_parser.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/081-mtd_myloader_partition_parser.patch
@@ -6,7 +6,7 @@
+config MTD_MYLOADER_PARTS
+ tristate "MyLoader partition parsing"
-+ depends on MTD_PARTITIONS && (ADM5120 || ATHEROS_AR71XX)
++ depends on MTD_PARTITIONS && (ADM5120 || ATHEROS || ATHEROS_AR71XX)
+ ---help---
+ MyLoader is a bootloader which allows the user to define partitions
+ in flash devices, by putting a table in the second erase block