Browse Source

Merge branch 'master' of RISCI_ATOM/libreCMC into master

RISCI_ATOM 6 years ago
parent
commit
5f3fea88b1

+ 1 - 0
target/linux/ar71xx/base-files/etc/board.d/01_leds

@@ -276,6 +276,7 @@ dlan-pro-1200-ac)
 	ucidef_set_led_gpio "plcr" "dLAN" "devolo:error:dlan" "16" "0"
 	;;
 gl-ar150|\
+gl-usb150|\
 gl-ar300|\
 gl-ar300m|\
 gl-mifi)

+ 3 - 0
target/linux/ar71xx/base-files/etc/board.d/02_network

@@ -124,6 +124,9 @@ ar71xx_setup_interfaces()
 	alfa-ap96|\
 	alfa-nx|\
 	gl-ar150|\
+	gl-usb150)
+		ucidef_set_interface_lan "eth0"
+		;;
 	gl-ar300m|\
 	gl-domino|\
 	gl-inet|\

+ 4 - 1
target/linux/ar71xx/base-files/lib/ar71xx.sh

@@ -620,6 +620,9 @@ ar71xx_board_detect() {
 	*"GL AR150")
 		name="gl-ar150"
 		;;
+	*"GL USB150")
+		name="gl-usb150"
+		;;
 	*"GL AR300")
 		name="gl-ar300"
 		;;
@@ -1088,7 +1091,7 @@ ar71xx_board_detect() {
 	*"TL-MR13U v1")
 		name="tl-mr13u"
 		;;
-	*"Think Penguin Mini Router")
+	*"TPE-R1100 Think Penguin Mini Router")
                 name="tpe-r1100"
                 ;;
 	*"Tube2H")

+ 1 - 0
target/linux/ar71xx/base-files/lib/upgrade/platform.sh

@@ -237,6 +237,7 @@ platform_check_image() {
 	ew-dorin-router|\
 	ew-dorin|\
 	gl-ar150|\
+	gl-usb150|\
 	gl-ar300m|\
 	gl-ar300|\
 	gl-domino|\

+ 7 - 3
target/linux/ar71xx/image/generic.mk

@@ -117,14 +117,18 @@ define Device/gl-ar150
   MTDPARTS = spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,16000k(firmware),64k(art)ro
 endef
 
-TARGET_DEVICES += gl-ar150
+define Device/gl-usb150
+$(Device/gl-ar150)
+  DEVICE_TITLE := GL USB150
+  DEVICE_PACKAGES += kmod-usb-serial kmod-usb-serial-pl2303 kmod-usb-net
+endef
 
 define Device/tpe-r1100
   $(Device/gl-ar150)
-  DEVICE_TITLE := Think Penguin Mini Router
+  DEVICE_TITLE := TPE-R1100 Think Penguin Mini Router
 endef
 
-TARGET_DEVICES += tpe-r1100
+TARGET_DEVICES += gl-ar150 gl-usb150 tpe-r1100
 
 define Device/gl-ar300
   DEVICE_TITLE := GL AR300