From 7d8a1bf239dcd7c1db00bdd4ab19db85b94b61b0 Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Tue, 8 Dec 2009 12:46:30 +0000 Subject: [PATCH] ar71xx: TL-WR1043ND support cleanup SVN-Revision: 18697 --- target/linux/ar71xx/base-files/etc/diag.sh | 3 +++ target/linux/ar71xx/base-files/lib/ar71xx.sh | 3 +++ .../linux/ar71xx/base-files/lib/upgrade/platform.sh | 2 +- target/linux/ar71xx/config-2.6.28 | 1 + target/linux/ar71xx/config-2.6.32 | 1 + .../ar71xx/files/arch/mips/ar71xx/mach-tl-wr1043nd.c | 12 ++++++------ .../files/arch/mips/include/asm/mach-ar71xx/ar71xx.h | 2 +- target/linux/ar71xx/profiles/tp-link.mk | 2 +- tools/firmware-utils/src/mktplinkfw.c | 2 +- 9 files changed, 18 insertions(+), 10 deletions(-) diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh index 9178b0a9e6..3a640fa4b3 100755 --- a/target/linux/ar71xx/base-files/etc/diag.sh +++ b/target/linux/ar71xx/base-files/etc/diag.sh @@ -63,6 +63,9 @@ get_status_led() { tew-632brp) status_led="tew-632brp:green:status" ;; + tl-wr1043nd) + status_led="tl-wr1043nd:green:system" + ;; tl-wr741nd) status_led="tl-wr741nd:green:system" ;; diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh index 1c2e060067..9eea471b32 100755 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh @@ -67,6 +67,9 @@ ar71xx_board_name() { *TEW-632BRP) name="tew-632brp" ;; + *TL-WR1043ND) + name="tl-wr1043nd" + ;; *TL-WR741ND) name="tl-wr741nd" ;; diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh index b7e003a81d..728019969b 100755 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh @@ -75,7 +75,7 @@ platform_check_image() { } return 0 ;; - tl-wr741nd | tl-wr941nd) + tl-wr741nd | tl-wr941nd | tl-wr1043nd) [ "$magic" != "0100" ] && { echo "Invalid image type." return 1 diff --git a/target/linux/ar71xx/config-2.6.28 b/target/linux/ar71xx/config-2.6.28 index 83587906ee..fc17341d5d 100644 --- a/target/linux/ar71xx/config-2.6.28 +++ b/target/linux/ar71xx/config-2.6.28 @@ -15,6 +15,7 @@ CONFIG_AR71XX_MACH_PB42=y CONFIG_AR71XX_MACH_PB44=y CONFIG_AR71XX_MACH_RB_4XX=y CONFIG_AR71XX_MACH_TEW_632BRP=y +CONFIG_AR71XX_MACH_TL_WR1043ND=y CONFIG_AR71XX_MACH_TL_WR741ND=y CONFIG_AR71XX_MACH_TL_WR941ND=y CONFIG_AR71XX_MACH_UBNT=y diff --git a/target/linux/ar71xx/config-2.6.32 b/target/linux/ar71xx/config-2.6.32 index f1a69bc0bc..671002f8dd 100644 --- a/target/linux/ar71xx/config-2.6.32 +++ b/target/linux/ar71xx/config-2.6.32 @@ -16,6 +16,7 @@ CONFIG_AR71XX_MACH_PB42=y CONFIG_AR71XX_MACH_PB44=y CONFIG_AR71XX_MACH_RB_4XX=y CONFIG_AR71XX_MACH_TEW_632BRP=y +CONFIG_AR71XX_MACH_TL_WR1043ND=y CONFIG_AR71XX_MACH_TL_WR741ND=y CONFIG_AR71XX_MACH_TL_WR941ND=y CONFIG_AR71XX_MACH_UBNT=y diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr1043nd.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr1043nd.c index e67282e6da..d4dcd5a333 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr1043nd.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr1043nd.c @@ -50,7 +50,7 @@ static struct mtd_partition tl_wr1043nd_partitions[] = { .size = 0x010000, .mask_flags = MTD_WRITEABLE, } , { - .name = "firmware", + .name = "firmware", .offset = 0x020000, .size = 0x7d0000, } @@ -59,8 +59,8 @@ static struct mtd_partition tl_wr1043nd_partitions[] = { static struct flash_platform_data tl_wr1043nd_flash_data = { #ifdef CONFIG_MTD_PARTITIONS - .parts = tl_wr1043nd_partitions, - .nr_parts = ARRAY_SIZE(tl_wr1043nd_partitions), + .parts = tl_wr1043nd_partitions, + .nr_parts = ARRAY_SIZE(tl_wr1043nd_partitions), #endif }; @@ -116,11 +116,11 @@ static void __init tl_wr1043nd_setup(void) ar71xx_eth0_data.phy_mask = 0x0; ar71xx_eth0_data.speed = SPEED_1000; ar71xx_eth0_data.duplex = DUPLEX_FULL; - + ar71xx_add_device_eth(0); - + ar71xx_add_device_usb(); - + ar71xx_add_device_spi(NULL, tl_wr1043nd_spi_info, ARRAY_SIZE(tl_wr1043nd_spi_info)); diff --git a/target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/ar71xx.h b/target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/ar71xx.h index 575d1819cf..48f6e0a654 100644 --- a/target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/ar71xx.h +++ b/target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/ar71xx.h @@ -139,7 +139,7 @@ enum ar71xx_mach_type { AR71XX_MACH_TEW_632BRP, /* TRENDnet TEW-632BRP */ AR71XX_MACH_TL_WR741ND, /* TP-LINK TL-WR741ND */ AR71XX_MACH_TL_WR941ND, /* TP-LINK TL-WR941ND */ - AR71XX_MACH_TL_WR1043ND,/* TP-LINK TL-WR1041ND */ + AR71XX_MACH_TL_WR1043ND, /* TP-LINK TL-WR1041ND */ AR71XX_MACH_UBNT_LSSR71, /* Ubiquiti LS-SR71 */ AR71XX_MACH_UBNT_LSX, /* Ubiquiti LSX */ AR71XX_MACH_UBNT_RS, /* Ubiquiti RouterStation */ diff --git a/target/linux/ar71xx/profiles/tp-link.mk b/target/linux/ar71xx/profiles/tp-link.mk index d62ab8a7c6..8df005075b 100644 --- a/target/linux/ar71xx/profiles/tp-link.mk +++ b/target/linux/ar71xx/profiles/tp-link.mk @@ -50,7 +50,7 @@ $(eval $(call Profile,TLWR941NDV2)) define Profile/TLWR1043NDV1 NAME:=TP-LINK TL-WR1043ND v1 - PACKAGES:=kmod-ath9k hostapd-mini + PACKAGES:=kmod-ath9k hostapd-mini kmod-usb-core kmod-usb2 endef define Profile/TLWR1043NDV1/Description diff --git a/tools/firmware-utils/src/mktplinkfw.c b/tools/firmware-utils/src/mktplinkfw.c index 08f345e7f5..7bb877cffc 100644 --- a/tools/firmware-utils/src/mktplinkfw.c +++ b/tools/firmware-utils/src/mktplinkfw.c @@ -37,7 +37,7 @@ #define HWID_TL_WR841ND_V3 0x08410003 #define HWID_TL_WR841ND_V5 0x08410005 #define HWID_TL_WR941ND_V2 0x09410002 -#define HWID_TL_WR1043ND_V1 0x10430001 +#define HWID_TL_WR1043ND_V1 0x10430001 #define MD5SUM_LEN 16