diff --git a/patches/openwrt/0081-ramips-Add-support-for-ZBT-WG3526.patch b/patches/openwrt/0082-Add-support-for-Digineo-AC1200-Pro.patch similarity index 62% rename from patches/openwrt/0081-ramips-Add-support-for-ZBT-WG3526.patch rename to patches/openwrt/0082-Add-support-for-Digineo-AC1200-Pro.patch index a6ff16e8..73ff065d 100644 --- a/patches/openwrt/0081-ramips-Add-support-for-ZBT-WG3526.patch +++ b/patches/openwrt/0082-Add-support-for-Digineo-AC1200-Pro.patch @@ -1,92 +1,72 @@ -From: John Crispin -Date: Thu, 21 Apr 2016 19:47:08 +0000 -Subject: ramips: Add support for ZBT WG3526 - -The WG3526 is the follow-up to the 2626 and is mostly the same, with the -excaption that the mt7602 has been replaced with the mt7603. The internal wifi -setup has also changed slightly. Based on my tests, everything that worked on -the 2626 works on the 3526 and with roughly the same performance. - -v1->v2: -* Remove some references to 2626 that I had missed in the dts. - -v2->v3: -* Update patch to match new file structure. -* Removed SD driver to be consistent with other MT7621 targets. - -Signed-off-by: Kristian Evensen - -git-svn-id: svn://svn.openwrt.org/openwrt/trunk@49213 3c298f89-4303-0410-b956-a3cf2f4a3e73 +From: Julian Kornberger +Date: Sat, 17 Dec 2016 19:47:00 +0100 +Subject: Add support for Digineo AC1200 Pro diff --git a/target/linux/ramips/base-files/etc/board.d/02_network b/target/linux/ramips/base-files/etc/board.d/02_network -index 4e6e507..d287002 100755 +index 4e6e507..453af2c 100755 --- a/target/linux/ramips/base-files/etc/board.d/02_network +++ b/target/linux/ramips/base-files/etc/board.d/02_network -@@ -147,7 +147,8 @@ ramips_setup_interfaces() - wt1520 | \ - xiaomi-miwifi-mini |\ - y1|\ -- zbt-wg2626) -+ zbt-wg2626|\ -+ zbt-wg3526) - ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" - ucidef_add_switch "switch0" "1" "1" - ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 6t" +@@ -128,6 +128,7 @@ ramips_setup_interfaces() + ;; + + 3g-6200n | \ ++ ac1200pro | \ + ai-br100 | \ + dir-610-a1 | \ + dir-300-b7 | \ +@@ -365,6 +366,7 @@ ramips_setup_macs() + wan_mac=$(mtd_get_mac_binary factory 32772) + ;; + ++ ac1200pro | \ + all0239-3g | \ + carambola | \ + freestation5 | \ diff --git a/target/linux/ramips/base-files/etc/diag.sh b/target/linux/ramips/base-files/etc/diag.sh -index 37360a4..90e6561 100644 +index 37360a4..7f93d3f 100644 --- a/target/linux/ramips/base-files/etc/diag.sh +++ b/target/linux/ramips/base-files/etc/diag.sh -@@ -15,6 +15,10 @@ get_status_led() { +@@ -12,6 +12,9 @@ get_status_led() { + 3g150b | 3g300m | w150m) + status_led="tenda:blue:ap" + ;; ++ ac1200pro) ++ status_led="ac1200pro:green:status" ++ ;; ai-br100) status_led="aigale:blue:wlan" ;; -+ zbt-wg2626|\ -+ zbt-wg3526) -+ status_led="zbt:green:status" -+ ;; - ar670w) - status_led="ar670w:green:power" - ;; diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh -index 8dc05b0..8535785 100755 +index 8dc05b0..090831e 100755 --- a/target/linux/ramips/base-files/lib/ramips.sh +++ b/target/linux/ramips/base-files/lib/ramips.sh -@@ -427,6 +427,9 @@ ramips_board_detect() { - *"Mediatek MT7628AN evaluation board") - name="mt7628" +@@ -109,6 +109,9 @@ ramips_board_detect() { + *"DCS-930L B1") + name="dcs-930l-b1" ;; -+ *"ZBT-WG3526") -+ name="zbt-wg3526" ++ *"Digineo AC1200 Pro") ++ name="ac1200pro" + ;; - *"MediaTek LinkIt Smart 7688") - linkit="$(dd bs=1 skip=1024 count=12 if=/dev/mtd2 2> /dev/null)" - if [ "${linkit}" = "LINKITS7688D" ]; then + *"DIR-300 B1") + name="dir-300-b1" + ;; diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh -index a3d0175..084e72a 100755 +index a3d0175..8af8506 100755 --- a/target/linux/ramips/base-files/lib/upgrade/platform.sh +++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh -@@ -14,6 +14,7 @@ platform_check_image() { - [ "$#" -gt 1 ] && return 1 - - case "$board" in -+<<<<<<< HEAD - 3g-6200n | \ - 3g-6200nl | \ +@@ -19,6 +19,7 @@ platform_check_image() { 3g150b | \ -@@ -129,6 +130,8 @@ platform_check_image() { - y1s |\ - zbt-wa05 |\ - zbt-wg2626 |\ -+ zbt-wg3526 |\ -+ zbt-wr8305rt |\ - zte-q7) - [ "$magic" != "27051956" ] && { - echo "Invalid image type." -diff --git a/target/linux/ramips/dts/ZBT-WG3526.dts b/target/linux/ramips/dts/ZBT-WG3526.dts + 3g300m | \ + a5-v11 | \ ++ ac1200pro | \ + air3gii | \ + ai-br100 |\ + all0239-3g | \ +diff --git a/target/linux/ramips/dts/AC1200pro.dts b/target/linux/ramips/dts/AC1200pro.dts new file mode 100644 -index 0000000..b62471b +index 0000000..18b60c6 --- /dev/null -+++ b/target/linux/ramips/dts/ZBT-WG3526.dts ++++ b/target/linux/ramips/dts/AC1200pro.dts @@ -0,0 +1,127 @@ +/dts-v1/; + @@ -141,7 +121,7 @@ index 0000000..b62471b + + partition@50000 { + label = "firmware"; -+ reg = <0x50000 0xfb0000>; ++ reg = <0x50000 0x1fb0000>; + }; + + }; @@ -201,7 +181,7 @@ index 0000000..b62471b + compatible = "gpio-leds"; + + status { -+ label = "zbt-wg3526:green:status"; ++ label = "ac1200pro:green:status"; + gpios = <&gpio0 24 1>; + }; + }; @@ -216,15 +196,24 @@ index 0000000..b62471b + }; +}; diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile -index c4f4028..80c2d8e 100644 +index c4f4028..e28dcf3 100644 --- a/target/linux/ramips/image/Makefile +++ b/target/linux/ramips/image/Makefile +@@ -616,7 +616,7 @@ Image/Build/Profile/WCR150GN=$(call BuildFirmware/Default4M/$(1),$(1),wcr150gn,W + buffalo_whrg300n_mtd_size=3801088 + define BuildFirmware/WHRG300N/squashfs + $(call BuildFirmware/Default4M/$(1),$(1),whr-g300n,WHR-G300N) +- # the following line has a bad argument 3 ... the old Makefile was already broken ++ # the following line has a bad argument 3 ... the old Makefile was already broken + $(call BuildFirmware/Buffalo,$(1),whr-g300n,whr-g300n) + if [ -e "$(call sysupname,$(1),$(2))" ]; then \ + ( \ @@ -956,7 +956,7 @@ endif # ifeq ($(SUBTARGET),mt7621) - TARGET_DEVICES += mt7621 wsr-600 wsr-1166 dir-860l-b1 firewrt pbr-m1 re6500 zbt-wg2626 -+ TARGET_DEVICES += mt7621 wsr-600 wsr-1166 dir-860l-b1 firewrt pbr-m1 re6500 zbt-wg2626 zbt-wg3526 ++ TARGET_DEVICES += mt7621 wsr-600 wsr-1166 dir-860l-b1 firewrt pbr-m1 re6500 zbt-wg2626 ac1200pro endif define Device/mt7621 @@ -232,17 +221,17 @@ index c4f4028..80c2d8e 100644 IMAGE_SIZE := $(ralink_default_fw_size_16M) endef -+define Device/zbt-wg3526 -+ DTS := ZBT-WG3526 -+ IMAGE_SIZE := $(ralink_default_fw_size_16M) ++define Device/ac1200pro ++ DTS := AC1200pro ++ IMAGE_SIZE := $(ralink_default_fw_size_32M) +endef -+TARGET_DEVICES += zbt-wg3526 ++TARGET_DEVICES += ac1200pro + # # MT7628 Profiles # diff --git a/target/linux/ramips/mt7621/profiles/zbt.mk b/target/linux/ramips/mt7621/profiles/zbt.mk -index cf9beff..0a8fe0c 100644 +index cf9beff..53b100c 100644 --- a/target/linux/ramips/mt7621/profiles/zbt.mk +++ b/target/linux/ramips/mt7621/profiles/zbt.mk @@ -17,3 +17,16 @@ define Profile/ZBT-WG2626/Description @@ -251,14 +240,14 @@ index cf9beff..0a8fe0c 100644 $(eval $(call Profile,ZBT-WG2626)) + + -+define Profile/ZBT-WG3526 -+ NAME:=ZBT-WG3526 Device ++define Profile/ac1200pro ++ NAME:=Digineo AC1200 Pro + PACKAGES:=\ + kmod-usb-core kmod-usb3 \ + kmod-ledtrig-usbdev kmod-ata-core kmod-ata-ahci +endef + -+define Profile/ZBT-WG3526/Description -+ Package set for ZBT-WG3526 device ++define Profile/ac1200pro/Description ++ Package set for ac1200pro device +endef -+$(eval $(call Profile,ZBT-WG3526)) ++$(eval $(call Profile,ac1200pro)) diff --git a/targets/ramips-mt7621/profiles.mk b/targets/ramips-mt7621/profiles.mk index fc016dd7..c596b928 100644 --- a/targets/ramips-mt7621/profiles.mk +++ b/targets/ramips-mt7621/profiles.mk @@ -3,8 +3,6 @@ $(eval $(call GluonProfile,Default)) $(eval $(call GluonModel,Default,dir-860l-b1,d-link-dir-860l-b1)) -ifneq ($(BROKEN),) -$(eval $(call GluonProfile,ZBT-WG3526)) # BROKEN: hangs during reboot (http://lists.infradead.org/pipermail/linux-mtd/2016-November/070368.html) -$(eval $(call GluonProfileFactorySuffix,ZBT-WG3526)) -$(eval $(call GluonModel,ZBT-WG3526,zbt-wg3526,zbt-wg3526)) -endif +$(eval $(call GluonProfile,AC1200pro)) +$(eval $(call GluonProfileFactorySuffix,AC1200pro)) +$(eval $(call GluonModel,AC1200pro,ac1200pro,digineo-ac1200pro))