aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2011-11-24 20:09:38 +0000
committerGabor Juhos <juhosg@openwrt.org>2011-11-24 20:09:38 +0000
commitc20d7378e5fda249b2723850937056a0c92a1f21 (patch)
tree213428c6597cd8954b3b1a47d6e85dddf4532157
parent600b6efc41a2ae61a48335f86238349eb4918019 (diff)
downloadupstream-c20d7378e5fda249b2723850937056a0c92a1f21.tar.gz
upstream-c20d7378e5fda249b2723850937056a0c92a1f21.tar.bz2
upstream-c20d7378e5fda249b2723850937056a0c92a1f21.zip
ar71xx: fix wndr3800 machine name
This fixes the machine name in /proc/cpuinfo and luci status page machine name. Signed-off-by: Petri Rosenström <petri.rosenstrom@gmail.com> SVN-Revision: 29326
-rwxr-xr-xtarget/linux/ar71xx/base-files/lib/ar71xx.sh3
-rwxr-xr-xtarget/linux/ar71xx/base-files/lib/upgrade/platform.sh2
-rw-r--r--target/linux/ar71xx/files/arch/mips/ar71xx/mach-wndr3700.c2
-rw-r--r--target/linux/ar71xx/files/arch/mips/ar71xx/machtype.h1
-rw-r--r--target/linux/ar71xx/image/Makefile3
5 files changed, 9 insertions, 2 deletions
diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
index 6ea97eda9c..513f0d2f75 100755
--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
@@ -169,6 +169,9 @@ ar71xx_board_name() {
*WNDR3700v2)
name="wndr3700v2"
;;
+ *WNDR3800)
+ name="wndr3800"
+ ;;
*WNR2000)
name="wnr2000"
;;
diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
index fd11366288..cc327e6a1c 100755
--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
@@ -133,7 +133,7 @@ platform_check_image() {
}
return 0
;;
- wndr3700v2)
+ wndr3700v2|wndr3800)
[ "$magic_long" != "33373031" ] && {
echo "Invalid image type."
return 1
diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wndr3700.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wndr3700.c
index 0df9c7f024..358f1a9f38 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wndr3700.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wndr3700.c
@@ -288,3 +288,5 @@ static void __init wndr3700v2_setup(void)
MIPS_MACHINE(AR71XX_MACH_WNDR3700V2, "WNDR3700v2", "NETGEAR WNDR3700v2",
wndr3700v2_setup);
+MIPS_MACHINE(AR71XX_MACH_WNDR3800, "WNDR3800", "NETGEAR WNDR3800",
+ wndr3700v2_setup);
diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/machtype.h b/target/linux/ar71xx/files/arch/mips/ar71xx/machtype.h
index 78d8bdd687..be7df85d4a 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/machtype.h
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/machtype.h
@@ -70,6 +70,7 @@ enum ar71xx_mach_type {
AR71XX_MACH_WHR_HP_GN, /* Buffalo WHR-HP-GN */
AR71XX_MACH_WNDR3700, /* NETGEAR WNDR3700 */
AR71XX_MACH_WNDR3700V2, /* NETGEAR WNDR3700v2 */
+ AR71XX_MACH_WNDR3800, /* NETGEAR WNDR3800 */
AR71XX_MACH_WNR2000, /* NETGEAR WNR2000 */
AR71XX_MACH_WP543, /* Compex WP543 */
AR71XX_MACH_WRT160NL, /* Linksys WRT160NL */
diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
index febbfb96cb..790dfda0e1 100644
--- a/target/linux/ar71xx/image/Makefile
+++ b/target/linux/ar71xx/image/Makefile
@@ -689,10 +689,11 @@ wndr3700_cmdline=board=WNDR3700 console=ttyS0,115200
wndr3700_mtdlayout=mtdparts=spi0.0:320k(u-boot)ro,128k(u-boot-env)ro,1024k(kernel),6656k(rootfs),64k(art)ro,7680k@0x70000(firmware)
wndr3700v2_cmdline=board=WNDR3700v2 console=ttyS0,115200
wndr3700v2_mtdlayout=mtdparts=spi0.0:320k(u-boot)ro,128k(u-boot-env)ro,1024k(kernel),14848k(rootfs),64k(art)ro,15872k@0x70000(firmware)
+wndr3800_cmdline=board=WNDR3800 console=ttyS0,115200
define Image/Build/Profile/WNDR3700
$(call Image/Build/Template/$(fs_64k)/$(1),Netgear,wndr3700,$(wndr3700_cmdline),wndr3700_mtdlayout,3700,WNDR3700,"" NA,)
$(call Image/Build/Template/$(fs_64k)/$(1),Netgear,wndr3700v2,$(wndr3700v2_cmdline),wndr3700v2_mtdlayout,3701,WNDR3700v2,"",-H 29763654+16+64)
- $(call Image/Build/Template/$(fs_64k)/$(1),Netgear,wndr3800,$(wndr3700v2_cmdline),wndr3700v2_mtdlayout,3701,WNDR3800,"",-H 29763654+16+128)
+ $(call Image/Build/Template/$(fs_64k)/$(1),Netgear,wndr3800,$(wndr3800_cmdline),wndr3700v2_mtdlayout,3701,WNDR3800,"",-H 29763654+16+128)
endef
wr400n_cmdline=board=WRT400N console=ttyS0,115200