From be6be6157f84d64d23c5768f8f7dca7dcf1953cd Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Mon, 23 Jul 2007 13:33:56 +0000 Subject: [PATCH] [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 --- .../adm5120-2.6/files/arch/mips/adm5120/adm5120_info.c | 4 +++- .../linux/adm5120-2.6/files/drivers/mtd/maps/adm5120_mtd.c | 4 ++-- target/linux/adm5120-2.6/image/lzma-loader/src/config.h | 7 +++++++ 3 files changed, 12 insertions(+), 3 deletions(-) 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 c34dbd0095..1f8b87ec94 100644 --- 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 6251fa47f2..1c4680fc24 100644 --- 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 #include #include +#include #include #include @@ -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 5002b18192..668a4d7442 100644 --- 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 */ -- 2.30.2