[adm5120] board specific fixes

 * fix detection of RB-133C, thanks to Christophe Lucas
 * fix detection of RB-153
 * add support for WP54G-WRT to the lzma-loader
 * fix adm5120_mtd.c for WP54G-WRT in 7.07
 * now it's ready for the release of 7.07

SVN-Revision: 8128

diff --git a/target/linux/adm5120-2.6/files/arch/mips/adm5120/adm5120_info.c b/target/linux/adm5120-2.6/files/arch/mips/adm5120/adm5120_info.c
index c34dbd00951efd260d0c70da6f87cc9786f09b7b..1f8b87ec944ae962041eb32e53204e4fe83ace92 100644 (file)
--- a/target/linux/adm5120-2.6/files/arch/mips/adm5120/adm5120_info.c
+++ b/target/linux/adm5120-2.6/files/arch/mips/adm5120/adm5120_info.c
@@ -427,8 +427,10 @@ static struct routerboard routerboards[] __initdata = {
        ROUTERBOARD("112", MACH_ADM5120_RB_112),
        ROUTERBOARD("133", MACH_ADM5120_RB_133),
        ROUTERBOARD("133C", MACH_ADM5120_RB_133C),
+       ROUTERBOARD("133C3", MACH_ADM5120_RB_133C),
+       ROUTERBOARD("150", MACH_ADM5120_RB_153), /* it's intentional */
+       ROUTERBOARD("153", MACH_ADM5120_RB_153),
        ROUTERBOARD("miniROUTER", MACH_ADM5120_RB_150),
-       ROUTERBOARD("153", MACH_ADM5120_RB_150),
        DUMMY_BOARD()
 };
 

diff --git a/target/linux/adm5120-2.6/files/drivers/mtd/maps/adm5120_mtd.c b/target/linux/adm5120-2.6/files/drivers/mtd/maps/adm5120_mtd.c
index 6251fa47f253938297ecca24c4d1dd16c2af8e62..1c4680fc24c83e2b47e518fab78069aadd75dd34 100644 (file)
--- a/target/linux/adm5120-2.6/files/drivers/mtd/maps/adm5120_mtd.c
+++ b/target/linux/adm5120-2.6/files/drivers/mtd/maps/adm5120_mtd.c
@@ -51,6 +51,7 @@
 #include <linux/jffs2.h>
 #include <linux/crc32.h>
 #include <asm/io.h>
+#include <asm/bootinfo.h>
 #include <asm/mach-adm5120/myloader.h>
 #include <asm/mach-adm5120/adm5120_info.h>
 
@@ -431,8 +432,7 @@ int __init init_adm5120_map(void)
        printk(KERN_NOTICE "Flash device: 0x%x at 0x%x\n", size, WINDOW_ADDR);
 
 #ifdef CONFIG_MTD_PARTITIONS
-
-       if (adm5120_boot_loader == BOOT_LOADER_CFE)
+       if (mips_machtype == MACH_ADM5120_WP54G_WRT)
        {
                printk(KERN_NOTICE "adm5120 : using CFE flash mapping\n");
                parts = init_mtd_partitions(adm5120_mtd, size);

diff --git a/target/linux/adm5120-2.6/image/lzma-loader/src/config.h b/target/linux/adm5120-2.6/image/lzma-loader/src/config.h
index 5002b18192bd27a6530929fd0d8bac317d28a32c..668a4d7442615b1aee17cbc41d255b2a3abdb8a2 100644 (file)
--- a/target/linux/adm5120-2.6/image/lzma-loader/src/config.h
+++ b/target/linux/adm5120-2.6/image/lzma-loader/src/config.h
@@ -34,6 +34,13 @@
 #  define CONFIG_BOARD_NAME    "NFS-202U"
 #endif
 
+/*
+ * Compex boards
+ */
+#if defined(CONFIG_BOARD_WP54GWRT)
+#  define CONFIG_BOARD_NAME    "WP54G-WRT"
+#endif
+
 /*
  * Edimax boards
  */