From patchwork Mon Jan 28 11:55:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [1/4] Add support for Archer C60 v1 From: Adrian Schmutzler X-Patchwork-Id: 995 Message-Id: <20190128115529.6358-1-freifunk@adrianschmutzler.de> To: franken-dev@freifunk.net Date: Mon, 28 Jan 2019 12:55:26 +0100 While at it, fix order in bsp files. Signed-off-by: Adrian Schmutzler --- Recent changes: - Also use -ct firmware This has not been tested with official firmware by me, but it runs nicely with my firmware (newer OpenWrt, generic subtarget). --- bsp/ar71xx/.config | 22 ++++++------ bsp/board_ar71xx.bsp | 39 +++++++++++----------- .../0005-allow-building-all-devives-as-tiny.patch | 15 +++++---- .../fff/fff-network/ar71xx/network.archer-c60-v1 | 10 ++++++ 4 files changed, 50 insertions(+), 36 deletions(-) create mode 100644 src/packages/fff/fff-network/ar71xx/network.archer-c60-v1 diff --git a/bsp/ar71xx/.config b/bsp/ar71xx/.config index 0e749146..22716c40 100644 --- a/bsp/ar71xx/.config +++ b/bsp/ar71xx/.config @@ -4,16 +4,18 @@ CONFIG_TARGET_ar71xx=y CONFIG_TARGET_ar71xx_tiny=y CONFIG_TARGET_MULTI_PROFILE=y -CONFIG_TARGET_DEVICE_ar71xx_tiny_DEVICE_gl-ar150=y -CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_tiny_DEVICE_gl-ar150="" CONFIG_TARGET_DEVICE_ar71xx_tiny_DEVICE_archer-c25-v1=y CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_tiny_DEVICE_archer-c25-v1="-kmod-ath10k kmod-ath10k-ct" +CONFIG_TARGET_DEVICE_ar71xx_tiny_DEVICE_archer-c60-v1=y +CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_tiny_DEVICE_archer-c60-v1="-kmod-ath10k kmod-ath10k-ct -ath10k-firmware-qca9888 ath10k-firmware-qca9888-ct" CONFIG_TARGET_DEVICE_ar71xx_tiny_DEVICE_archer-c7-v2=y CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_tiny_DEVICE_archer-c7-v2="-kmod-ath10k kmod-ath10k-ct" CONFIG_TARGET_DEVICE_ar71xx_tiny_DEVICE_cpe210-220-v1=y CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_tiny_DEVICE_cpe210-220-v1="" CONFIG_TARGET_DEVICE_ar71xx_tiny_DEVICE_cpe510-520-v1=y CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_tiny_DEVICE_cpe510-520-v1="" +CONFIG_TARGET_DEVICE_ar71xx_tiny_DEVICE_gl-ar150=y +CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_tiny_DEVICE_gl-ar150="" CONFIG_TARGET_DEVICE_ar71xx_tiny_DEVICE_tl-mr3020-v1=y CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_tiny_DEVICE_tl-mr3020-v1="-uboot-envtools -kmod-usb-core -kmod-usb2 -kmod-usb-ledtrig-usbport" CONFIG_TARGET_DEVICE_ar71xx_tiny_DEVICE_tl-wa850re-v1=y @@ -30,8 +32,6 @@ CONFIG_TARGET_DEVICE_ar71xx_tiny_DEVICE_tl-wdr4300-v1=y CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_tiny_DEVICE_tl-wdr4300-v1="" CONFIG_TARGET_DEVICE_ar71xx_tiny_DEVICE_tl-wdr4310-v1=y CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_tiny_DEVICE_tl-wdr4310-v1="" -CONFIG_TARGET_DEVICE_ar71xx_tiny_DEVICE_tl-wr1043n-v5=y -CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_tiny_DEVICE_tl-wr1043n-v5="" CONFIG_TARGET_DEVICE_ar71xx_tiny_DEVICE_tl-wr1043nd-v1=y CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_tiny_DEVICE_tl-wr1043nd-v1="" CONFIG_TARGET_DEVICE_ar71xx_tiny_DEVICE_tl-wr1043nd-v2=y @@ -40,24 +40,26 @@ CONFIG_TARGET_DEVICE_ar71xx_tiny_DEVICE_tl-wr1043nd-v3=y CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_tiny_DEVICE_tl-wr1043nd-v3="" CONFIG_TARGET_DEVICE_ar71xx_tiny_DEVICE_tl-wr1043nd-v4=y CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_tiny_DEVICE_tl-wr1043nd-v4="" +CONFIG_TARGET_DEVICE_ar71xx_tiny_DEVICE_tl-wr1043n-v5=y +CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_tiny_DEVICE_tl-wr1043n-v5="" CONFIG_TARGET_DEVICE_ar71xx_tiny_DEVICE_tl-wr740n-v4=y CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_tiny_DEVICE_tl-wr740n-v4="" CONFIG_TARGET_DEVICE_ar71xx_tiny_DEVICE_tl-wr741nd-v2=y CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_tiny_DEVICE_tl-wr741nd-v2="" CONFIG_TARGET_DEVICE_ar71xx_tiny_DEVICE_tl-wr741nd-v4=y CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_tiny_DEVICE_tl-wr741nd-v4="" -CONFIG_TARGET_DEVICE_ar71xx_tiny_DEVICE_tl-wr841-v10=y -CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_tiny_DEVICE_tl-wr841-v10="" -CONFIG_TARGET_DEVICE_ar71xx_tiny_DEVICE_tl-wr841-v11=y -CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_tiny_DEVICE_tl-wr841-v11="" -CONFIG_TARGET_DEVICE_ar71xx_tiny_DEVICE_tl-wr841-v12=y -CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_tiny_DEVICE_tl-wr841-v12="" CONFIG_TARGET_DEVICE_ar71xx_tiny_DEVICE_tl-wr841-v7=y CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_tiny_DEVICE_tl-wr841-v7="" CONFIG_TARGET_DEVICE_ar71xx_tiny_DEVICE_tl-wr841-v8=y CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_tiny_DEVICE_tl-wr841-v8="" CONFIG_TARGET_DEVICE_ar71xx_tiny_DEVICE_tl-wr841-v9=y CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_tiny_DEVICE_tl-wr841-v9="" +CONFIG_TARGET_DEVICE_ar71xx_tiny_DEVICE_tl-wr841-v10=y +CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_tiny_DEVICE_tl-wr841-v10="" +CONFIG_TARGET_DEVICE_ar71xx_tiny_DEVICE_tl-wr841-v11=y +CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_tiny_DEVICE_tl-wr841-v11="" +CONFIG_TARGET_DEVICE_ar71xx_tiny_DEVICE_tl-wr841-v12=y +CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_tiny_DEVICE_tl-wr841-v12="" CONFIG_TARGET_DEVICE_ar71xx_tiny_DEVICE_tl-wr842n-v2=y CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_tiny_DEVICE_tl-wr842n-v2="" CONFIG_TARGET_DEVICE_ar71xx_tiny_DEVICE_ubnt-bullet-m=y diff --git a/bsp/board_ar71xx.bsp b/bsp/board_ar71xx.bsp index 66631949..dad4d1f5 100644 --- a/bsp/board_ar71xx.bsp +++ b/bsp/board_ar71xx.bsp @@ -2,10 +2,25 @@ machine=ar71xx chipset=ar71xx subtarget=tiny target=$builddir/$machine -images=("openwrt-${chipset}-${subtarget}-cpe210-220-v1-squashfs-sysupgrade.bin" +images=("openwrt-${chipset}-${subtarget}-archer-c25-v1-squashfs-sysupgrade.bin" + "openwrt-${chipset}-${subtarget}-archer-c60-v1-squashfs-sysupgrade.bin" + "openwrt-${chipset}-${subtarget}-archer-c7-v2-squashfs-sysupgrade.bin" + "openwrt-${chipset}-${subtarget}-cpe210-220-v1-squashfs-sysupgrade.bin" "openwrt-${chipset}-${subtarget}-cpe510-520-v1-squashfs-sysupgrade.bin" - "openwrt-${chipset}-${subtarget}-ubnt-nano-m-squashfs-sysupgrade.bin" - "openwrt-${chipset}-${subtarget}-ubnt-loco-m-xw-squashfs-sysupgrade.bin" + "openwrt-${chipset}-${subtarget}-gl-ar150-squashfs-sysupgrade.bin" + "openwrt-${chipset}-${subtarget}-tl-mr3020-v1-squashfs-sysupgrade.bin" + "openwrt-${chipset}-${subtarget}-tl-wa850re-v1-squashfs-sysupgrade.bin" + "openwrt-${chipset}-${subtarget}-tl-wa860re-v1-squashfs-sysupgrade.bin" + "openwrt-${chipset}-${subtarget}-tl-wa901nd-v2-squashfs-sysupgrade.bin" + "openwrt-${chipset}-${subtarget}-tl-wdr3500-v1-squashfs-sysupgrade.bin" + "openwrt-${chipset}-${subtarget}-tl-wdr3600-v1-squashfs-sysupgrade.bin" + "openwrt-${chipset}-${subtarget}-tl-wdr4300-v1-squashfs-sysupgrade.bin" + "openwrt-${chipset}-${subtarget}-tl-wdr4310-v1-squashfs-sysupgrade.bin" + "openwrt-${chipset}-${subtarget}-tl-wr1043nd-v1-squashfs-sysupgrade.bin" + "openwrt-${chipset}-${subtarget}-tl-wr1043nd-v2-squashfs-sysupgrade.bin" + "openwrt-${chipset}-${subtarget}-tl-wr1043nd-v3-squashfs-sysupgrade.bin" + "openwrt-${chipset}-${subtarget}-tl-wr1043nd-v4-squashfs-sysupgrade.bin" + "openwrt-${chipset}-${subtarget}-tl-wr1043n-v5-squashfs-sysupgrade.bin" "openwrt-${chipset}-${subtarget}-tl-wr740n-v4-squashfs-sysupgrade.bin" "openwrt-${chipset}-${subtarget}-tl-wr741nd-v2-squashfs-sysupgrade.bin" "openwrt-${chipset}-${subtarget}-tl-wr741nd-v4-squashfs-sysupgrade.bin" @@ -16,23 +31,9 @@ images=("openwrt-${chipset}-${subtarget}-cpe210-220-v1-squashfs-sysupgrade.bin" "openwrt-${chipset}-${subtarget}-tl-wr841-v11-squashfs-sysupgrade.bin" "openwrt-${chipset}-${subtarget}-tl-wr841-v12-squashfs-sysupgrade.bin" "openwrt-${chipset}-${subtarget}-tl-wr842n-v2-squashfs-sysupgrade.bin" - "openwrt-${chipset}-${subtarget}-tl-wr1043nd-v1-squashfs-sysupgrade.bin" - "openwrt-${chipset}-${subtarget}-tl-wr1043nd-v2-squashfs-sysupgrade.bin" - "openwrt-${chipset}-${subtarget}-tl-wr1043nd-v3-squashfs-sysupgrade.bin" - "openwrt-${chipset}-${subtarget}-tl-wr1043nd-v4-squashfs-sysupgrade.bin" - "openwrt-${chipset}-${subtarget}-tl-wr1043n-v5-squashfs-sysupgrade.bin" - "openwrt-${chipset}-${subtarget}-tl-wa860re-v1-squashfs-sysupgrade.bin" - "openwrt-${chipset}-${subtarget}-tl-wa850re-v1-squashfs-sysupgrade.bin" - "openwrt-${chipset}-${subtarget}-tl-wa901nd-v2-squashfs-sysupgrade.bin" - "openwrt-${chipset}-${subtarget}-gl-ar150-squashfs-sysupgrade.bin" - "openwrt-${chipset}-${subtarget}-tl-mr3020-v1-squashfs-sysupgrade.bin" "openwrt-${chipset}-${subtarget}-ubnt-bullet-m-squashfs-sysupgrade.bin" + "openwrt-${chipset}-${subtarget}-ubnt-loco-m-xw-squashfs-sysupgrade.bin" + "openwrt-${chipset}-${subtarget}-ubnt-nano-m-squashfs-sysupgrade.bin" "openwrt-${chipset}-${subtarget}-ubnt-unifi-squashfs-sysupgrade.bin" "openwrt-${chipset}-${subtarget}-ubnt-unifiac-lite-squashfs-sysupgrade.bin" - "openwrt-${chipset}-${subtarget}-tl-wdr3500-v1-squashfs-sysupgrade.bin" - "openwrt-${chipset}-${subtarget}-tl-wdr3600-v1-squashfs-sysupgrade.bin" - "openwrt-${chipset}-${subtarget}-tl-wdr4300-v1-squashfs-sysupgrade.bin" - "openwrt-${chipset}-${subtarget}-tl-wdr4310-v1-squashfs-sysupgrade.bin" - "openwrt-${chipset}-${subtarget}-archer-c7-v2-squashfs-sysupgrade.bin" - "openwrt-${chipset}-${subtarget}-archer-c25-v1-squashfs-sysupgrade.bin" ) diff --git a/build_patches/openwrt/0005-allow-building-all-devives-as-tiny.patch b/build_patches/openwrt/0005-allow-building-all-devives-as-tiny.patch index 447f0672..326dff6d 100644 --- a/build_patches/openwrt/0005-allow-building-all-devives-as-tiny.patch +++ b/build_patches/openwrt/0005-allow-building-all-devives-as-tiny.patch @@ -1,15 +1,15 @@ -From a90784d1eb5eff968d6d2ced5c33b980dcfe40d0 Mon Sep 17 00:00:00 2001 +From 7b0cf3e8670a1cb67f96d53b4aaf34f1a9774c6b Mon Sep 17 00:00:00 2001 From: Tim Niemeyer Date: Mon, 6 Aug 2018 18:39:04 +0200 Subject: [PATCH] allow building all devives as tiny --- target/linux/ar71xx/image/Makefile | 5 +++++ - target/linux/ar71xx/tiny/config-default | 14 ++++++++++++++ - 2 files changed, 19 insertions(+) + target/linux/ar71xx/tiny/config-default | 15 +++++++++++++++ + 2 files changed, 20 insertions(+) diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile -index 1eaf1e457c..602323bba2 100644 +index 1eaf1e4..602323b 100644 --- a/target/linux/ar71xx/image/Makefile +++ b/target/linux/ar71xx/image/Makefile @@ -22,6 +22,11 @@ endif @@ -25,15 +25,16 @@ index 1eaf1e457c..602323bba2 100644 ifeq ($(SUBTARGET),nand) include ./nand.mk diff --git a/target/linux/ar71xx/tiny/config-default b/target/linux/ar71xx/tiny/config-default -index 2e9031a24c..fa62b41047 100644 +index 2e9031a..4549c4a 100644 --- a/target/linux/ar71xx/tiny/config-default +++ b/target/linux/ar71xx/tiny/config-default -@@ -70,3 +70,17 @@ CONFIG_SOC_AR933X=y +@@ -70,3 +70,18 @@ CONFIG_SOC_AR933X=y CONFIG_SOC_AR934X=y CONFIG_SOC_QCA953X=y CONFIG_SOC_QCA956X=y +# FFF +CONFIG_ATH79_MACH_ARCHER_C25_V1=y ++CONFIG_ATH79_MACH_ARCHER_C60_V1=y +CONFIG_ATH79_MACH_ARCHER_C7=y +CONFIG_ATH79_MACH_CPE510=y +CONFIG_ATH79_MACH_GL_AR150=y @@ -47,5 +48,5 @@ index 2e9031a24c..fa62b41047 100644 +CONFIG_ATH79_MACH_UBNT_UNIFIAC=y +CONFIG_ATH79_MACH_UBNT_XM=y -- -2.11.0 +2.7.4 diff --git a/src/packages/fff/fff-network/ar71xx/network.archer-c60-v1 b/src/packages/fff/fff-network/ar71xx/network.archer-c60-v1 new file mode 100644 index 00000000..3b18cc8f --- /dev/null +++ b/src/packages/fff/fff-network/ar71xx/network.archer-c60-v1 @@ -0,0 +1,10 @@ +PORTORDER="4 3 2 1" + +WANDEV=eth0 +SWITCHDEV=eth1 +CLIENT_PORTS="1 2 0t" +BATMAN_PORTS="3 4 0t" +CPUPORT="0t" + +ETHMESHMAC=$(cat /sys/class/net/eth1/address) +ROUTERMAC=$(cat /sys/class/net/eth0/address)