Fix up TPE-R1100 target

diff --git a/target/linux/ar71xx/base-files/etc/board.d/02_network b/target/linux/ar71xx/base-files/etc/board.d/02_network
index d9451c82ffb568fb4dce9532289a7cdc9bcfe76d..595e6735fa15c71c230e099d6237dd1e4067d3ef 100755 (executable)
--- a/target/linux/ar71xx/base-files/etc/board.d/02_network
+++ b/target/linux/ar71xx/base-files/etc/board.d/02_network
@@ -112,7 +112,6 @@ ar71xx_setup_interfaces()
        tl-wa901nd-v4|\
        tl-wr703n|\
        tl-wr802n-v1|\
-       tpe-r1100|\
        tube2h|\
        unifiac-lite|\
        wndap360|\
@@ -126,6 +125,7 @@ ar71xx_setup_interfaces()
        dr344|\
        gl-ar150|\
        gl-ar300m|\
+       tpe-r1100|\
        tpe-r1200|\
        gl-domino|\
        gl-inet|\

diff --git a/target/linux/ar71xx/config-4.4 b/target/linux/ar71xx/config-4.4
index bd14388f75e0e13aae66c1d3a7b7a766ca8d30c7..997838f24fc9421b824cf3607f8998c2cb3dbf29 100644 (file)
--- a/target/linux/ar71xx/config-4.4
+++ b/target/linux/ar71xx/config-4.4
@@ -161,6 +161,7 @@ CONFIG_ATH79_MACH_TEW_673GRU=y
 CONFIG_ATH79_MACH_TEW_712BR=y
 CONFIG_ATH79_MACH_TEW_732BR=y
 CONFIG_ATH79_MACH_TEW_823DRU=y
+CONFIG_ATH79_MACH_TPE_R1100=y
 CONFIG_ATH79_MACH_TPE_R1200=y
 CONFIG_ATH79_MACH_TL_MR11U=y
 CONFIG_ATH79_MACH_TL_MR13U=y

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
index ef23fa3ddcc9672954dd7b087155e3ac520a40cd..139d49b36d98f84a5e1e6d74c835a98699543b53 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
+++ b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
@@ -1254,6 +1254,16 @@ config ATH79_MACH_BSB
        select ATH79_DEV_USB
        select ATH79_DEV_WMAC
 
+config ATH79_MACH_TPE_R1100
+        bool "TPE-R1100 support"
+        select SOC_AR933X
+        select ATH79_DEV_ETH
+        select ATH79_DEV_GPIO_BUTTONS
+        select ATH79_DEV_LEDS_GPIO
+        select ATH79_DEV_M25P80
+        select ATH79_DEV_USB
+        select ATH79_DEV_WMAC
+
 config ATH79_MACH_TPE_R1200
         bool "TPE-R1200 Support"
         select SOC_QCA953X

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar150.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar150.c
index e0d1ea4381396b138a435f2f8b9e480a11787607..fdbec760eba9585e4b956e6016c8901f2a3bbd07 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar150.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar150.c
@@ -123,3 +123,5 @@ static void __init gl_ar150_setup(void)
 }
 
 MIPS_MACHINE(ATH79_MACH_GL_AR150, "GL-AR150", "GL AR150",gl_ar150_setup);
+MIPS_MACHINE(ATH79_MACH_TPE_R1100, "TPE-R1100", "TPE-R1100 Think Penguin Mini Router",gl_ar150_setup);
+

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
index 68e28535d61addb9d0187495cd87585924cef292..fef3fc21a657debcf8b7c25584ead945216de8fc 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
+++ b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
@@ -185,6 +185,7 @@ enum ath79_mach_type {
        ATH79_MACH_TEW_712BR,                   /* TRENDnet TEW-712BR */
        ATH79_MACH_TEW_732BR,                   /* TRENDnet TEW-732BR */
        ATH79_MACH_TEW_823DRU,                  /* TRENDnet TEW-823DRU */
+       ATH79_MACH_TPE_R1100,                   /* ThinkPenguin TPE-R1100 */
        ATH79_MACH_TPE_R1200,                   /* ThinkPenguin TPE-R1200 */
        ATH79_MACH_TL_MR10U,                    /* TP-LINK TL-MR10U */
        ATH79_MACH_TL_MR11U,                    /* TP-LINK TL-MR11U */

diff --git a/target/linux/ar71xx/image/generic.mk b/target/linux/ar71xx/image/generic.mk
index 8243648955dd0b97a4215e040a9851d401542fe6..594af4cf6c30ca8976162d98a8d02e3091746af1 100644 (file)
--- a/target/linux/ar71xx/image/generic.mk
+++ b/target/linux/ar71xx/image/generic.mk
@@ -129,7 +129,16 @@ define Device/gl-ar150
   CONSOLE = ttyATH0,115200
   MTDPARTS = spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,16000k(firmware),64k(art)ro
 endef
-TARGET_DEVICES += gl-ar150
+
+define Device/tpe-r1100
+  $(Device/gl-ar150)
+  DEVICE_TITLE := TPE-R1100 Think Penguin Mini Router
+  BOARDNAME = TPE-R1100
+endef
+
+TARGET_DEVICES += gl-ar150 tpe-r1100
+
+
 
 define Device/gl-usb150
   DEVICE_TITLE := GL.iNet GL-USB150
@@ -144,13 +153,6 @@ define Device/gl-usb150
 endef
 TARGET_DEVICES += gl-usb150
 
-define Device/tpe-r1100
-  $(Device/gl-ar150)
-  DEVICE_TITLE := TPE-R1100 Think Penguin Mini Router
-endef
-
-TARGET_DEVICES += tpe-r1100
-
 define Device/gl-ar300
   DEVICE_TITLE := GL AR300
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2