Re-added WDR2200 and tweaked TPE-R**00 platforms.

diff --git a/trunk/target/linux/ar71xx/base-files/lib/ar71xx.sh b/trunk/target/linux/ar71xx/base-files/lib/ar71xx.sh
index 3bbf20c9d31e68a21514e54ae342c27cdd8b82a0..3f0a61c46ef16316cbb1bce26be3390ea9d17551 100755 (executable)
--- a/trunk/target/linux/ar71xx/base-files/lib/ar71xx.sh
+++ b/trunk/target/linux/ar71xx/base-files/lib/ar71xx.sh
@@ -805,9 +805,12 @@ ar71xx_board_detect() {
        *"TL-MR13U v1")
                name="tl-mr13u"
                ;;
-       *"TPE-R3300")
-               name="tpe-r3300"
-               ;;
+       *"Think Penguin Mini TPE-R1100")
+                name="tpe-r1100"
+                ;;
+        *"Think Penguin Pro TPE-R3300")
+                name="tpe-r3300"
+                ;;
        *"Tube2H")
                name="tube2h"
                ;;

diff --git a/trunk/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/trunk/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
index aa158bdafed4b6a1a42ebaf2ff5a7f7f85c656b0..8ef4fce6cb91de9f2f78e9f407562f8f1f48d318 100755 (executable)
--- a/trunk/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+++ b/trunk/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
@@ -210,6 +210,9 @@ platform_check_image() {
        dlan-pro-500-wp | \
        dlan-pro-1200-ac | \
        dragino2 | \
+       tpe-r1100 | \
+       tpe-r3300 | \
+       domino | \
        epg5000 | \
        esr1750 | \
        esr900 | \
@@ -381,8 +384,7 @@ platform_check_image() {
 
                return 0
                ;;
-       tpe-r3300 | \
-       tpe-r1100 | \
+
        tube2h)
                alfa_check_image "$1" && return 0
                return 1

diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tpe-r1100.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tpe-r1100.c
index f437a8435a99c948af3eb0bf2d51144159a5e09b..c64e47558d96725e678f8ef71b1637efda73e72a 100644 (file)
--- a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tpe-r1100.c
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tpe-r1100.c
@@ -110,14 +110,14 @@ static void __init tpe_r1100_setup(void)
        ath79_register_usb();
 
        /* register eth0 as WAN, eth1 as LAN */
-       ath79_init_mac(ath79_eth0_data.mac_addr, art+TPE_R1100_MAC0_OFFSET, 0);
        ath79_init_mac(ath79_eth1_data.mac_addr, art+TPE_R1100_MAC1_OFFSET, 0);
+       ath79_init_mac(ath79_eth0_data.mac_addr, art+TPE_R1100_MAC0_OFFSET, 0);
        ath79_register_mdio(0, 0x0);
-       ath79_register_eth(0);
        ath79_register_eth(1);
+       ath79_register_eth(0);
 
        /* register wireless mac with cal data */
        ath79_register_wmac(art + TPE_R1100_CALDATA_OFFSET, art + TPE_R1100_WMAC_MAC_OFFSET);
 }
 
-MIPS_MACHINE(ATH79_MACH_TPE_R1100, "TPE_R1100", "tpe_r1100 board",tpe_r1100_setup);
+MIPS_MACHINE(ATH79_MACH_TPE_R1100, "TPE-R1100", "Think Penguin Mini TPE-R1100",tpe_r1100_setup);

diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tpe-r3300.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tpe-r3300.c
index 3d3922a0290252f6c2f0cfc0ffb0a11a79d68f4e..d1ab4468052bd3e6686e7d2bb97ced7ae51d7ca3 100644 (file)
--- a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tpe-r3300.c
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tpe-r3300.c
@@ -108,4 +108,4 @@ static void __init tpe_r3300_setup(void)
        ath79_register_wmac(art + TPE_R3300_CALDATA_OFFSET, art + TPE_R3300_WMAC_MAC_OFFSET);
 }
 
-MIPS_MACHINE(ATH79_MACH_TPE_R3300, "TPE-R3300", "TPE-R3300", tpe_r3300_setup);
+MIPS_MACHINE(ATH79_MACH_TPE_R3300, "TPE-R3300", "Think Penguin Pro TPE-R3300", tpe_r3300_setup);

diff --git a/trunk/target/linux/ar71xx/generic/profiles/netgear.mk b/trunk/target/linux/ar71xx/generic/profiles/netgear.mk
index 9c83c70e58dc71caf33e7ed9c7e5360b98214639..90e93d7efcc1b451bccc165037c841558159c9d9 100644 (file)
--- a/trunk/target/linux/ar71xx/generic/profiles/netgear.mk
+++ b/trunk/target/linux/ar71xx/generic/profiles/netgear.mk
@@ -71,3 +71,13 @@ define Profile/WNR1000V2/Description
 endef
 
 $(eval $(call Profile,WNR1000V2))
+
+define Profile/WNR2200
+       NAME:=NETGEAR WNR2200
+endef
+
+define Profile/WNR2200/Description
+       Package set optimized for the NETGEAR WNR2200
+endef
+
+$(eval $(call Profile,WNR2200))

diff --git a/trunk/target/linux/ar71xx/image/Makefile b/trunk/target/linux/ar71xx/image/Makefile
index 65dec36787943eba7c9e67142fb6d21c1af57479..69f33c4fcbc408ab27ec7b70a9633b74ddcec114 100644 (file)
--- a/trunk/target/linux/ar71xx/image/Makefile
+++ b/trunk/target/linux/ar71xx/image/Makefile
@@ -994,6 +994,7 @@ wpj344_mtdlayout_16M=mtdparts=spi0.0:192k(u-boot)ro,16128k(firmware),64k(art)ro
 wpj531_mtdlayout_16M=mtdparts=spi0.0:192k(u-boot)ro,16128k(firmware),64k(art)ro
 wpj558_mtdlayout_16M=mtdparts=spi0.0:192k(u-boot)ro,16128k(firmware),64k(art)ro
 wndap360_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,1728k(kernel),6016k(rootfs),64k(nvram)ro,64k(art)ro,7744k@0x50000(firmware)
+wnr2200_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,7808k(firmware),64k(art)ro
 wnr2000v3_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,3712k(firmware),64k(art)ro
 wnr2000v4_mtdlayout=mtdparts=spi0.0:192k(u-boot)ro,64k(u-boot-env)ro,3776k(firmware),64k(art)ro
 r6100_mtdlayout=mtdparts=ar934x-nfc:128k(u-boot)ro,256k(caldata),256k(caldata-backup),512k(config),512k(pot),2048k(kernel),122240k(ubi),25600k@0x1a0000(firmware),2048k(language),3072k(traffic_meter)
@@ -1934,6 +1935,7 @@ $(eval $(call SingleProfile,MyLoader,64k,WPE72_16M,wpe72,,ttyS0,115200,0x1000000
 
 $(eval $(call SingleProfile,Netgear,64kraw,WNR2000V3,wnr2000v3,WNR2000V3,ttyS0,115200,$$(wnr2000v3_mtdlayout),0x32303033,WNR2000V3,"" NA,-H 29763551+04+32))
 $(eval $(call SingleProfile,NetgearLzma,64kraw,WNR2000V4,wnr2000v4,WNR2000V4,ttyS0,115200,$$(wnr2000v4_mtdlayout),0x32303034,WNR2000V4,"" NA,))
+$(eval $(call SingleProfile,Netgear,64kraw,WNR2200,wnr2200,WNR2200,ttyS0,115200,$$(wnr2200_mtdlayout),0x32323030,WNR2200,"" NA,))
 $(eval $(call SingleProfile,Netgear,64kraw,REALWNR612V2,wnr612v2,WNR612V2,ttyS0,115200,$$(wnr2000v3_mtdlayout),0x32303631,WNR612V2,"",))
 $(eval $(call SingleProfile,Netgear,64kraw,N150R,n150r,WNR612V2,ttyS0,115200,$$(wnr2000v3_mtdlayout),0x32303631,N150R,"",))
 $(eval $(call SingleProfile,Netgear,64kraw,REALWNR1000V2,wnr1000v2,WNR1000V2,ttyS0,115200,$$(wnr2000v3_mtdlayout),0x31303031,WNR1000V2,"",))
@@ -2156,6 +2158,7 @@ $(eval $(call SingleProfile,MyLoader,64k,WPE72_16M,wpe72,,ttyS0,115200,0x1000000
 
 $(eval $(call SingleProfile,Netgear,64kraw,WNR2000V3,wnr2000v3,WNR2000V3,ttyS0,115200,$$(wnr2000v3_mtdlayout),0x32303033,WNR2000V3,"" NA,-H 29763551+04+32))
 $(eval $(call SingleProfile,NetgearLzma,64kraw,WNR2000V4,wnr2000v4,WNR2000V4,ttyS0,115200,$$(wnr2000v4_mtdlayout),0x32303034,WNR2000V4,"" NA,))
+$(eval $(call SingleProfile,Netgear,64kraw,WNR2200,wnr2200,WNR2200,ttyS0,115200,$$(wnr2200_mtdlayout),0x32323030,WNR2200,"" NA,))
 $(eval $(call SingleProfile,Netgear,64kraw,REALWNR612V2,wnr612v2,WNR612V2,ttyS0,115200,$$(wnr2000v3_mtdlayout),0x32303631,WNR612V2,"",))
 $(eval $(call SingleProfile,Netgear,64kraw,N150R,n150r,WNR612V2,ttyS0,115200,$$(wnr2000v3_mtdlayout),0x32303631,N150R,"",))
 $(eval $(call SingleProfile,Netgear,64kraw,REALWNR1000V2,wnr1000v2,WNR1000V2,ttyS0,115200,$$(wnr2000v3_mtdlayout),0x31303031,WNR1000V2,"",))

diff --git a/trunk/target/linux/ar71xx/luci/profiles/netgear.mk b/trunk/target/linux/ar71xx/luci/profiles/netgear.mk
index 5bd0c351c2d48a7507e94243e40b15e703d21925..f04f4696957b49d55d4520ac6b476b0e32c49402 100644 (file)
--- a/trunk/target/linux/ar71xx/luci/profiles/netgear.mk
+++ b/trunk/target/linux/ar71xx/luci/profiles/netgear.mk
@@ -71,3 +71,13 @@ define Profile/WNR1000V2/Description
 endef
 
 $(eval $(call Profile,WNR1000V2))
+
+define Profile/WNR2200
+       NAME:=NETGEAR WNR2200
+endef
+
+define Profile/WNR2200/Description
+       Package set optimized for the NETGEAR WNR2200
+endef
+
+$(eval $(call Profile,WNR2200))