From 1e963f5f393afba35629c8005a26b796f2761012 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Mon, 28 Jan 2019 14:54:23 +0100 Subject: [PATCH] Add support for Archer C60 v2 Signed-off-by: Adrian Schmutzler Reviewed-by: Christian Dresel --- bsp/ar71xx/.config | 2 ++ bsp/board_ar71xx.bsp | 1 + ...05-allow-building-all-devives-as-tiny.patch | 18 +++++------------- .../fff-network/ar71xx/network.archer-c60-v2 | 9 +++++++++ 4 files changed, 17 insertions(+), 13 deletions(-) create mode 100644 src/packages/fff/fff-network/ar71xx/network.archer-c60-v2 diff --git a/bsp/ar71xx/.config b/bsp/ar71xx/.config index b1ac9a22..030ea3db 100644 --- a/bsp/ar71xx/.config +++ b/bsp/ar71xx/.config @@ -8,6 +8,8 @@ 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-c60-v2=y +CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_tiny_DEVICE_archer-c60-v2="-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_archer-c7-v5=y diff --git a/bsp/board_ar71xx.bsp b/bsp/board_ar71xx.bsp index f84b10a1..46c5df2f 100644 --- a/bsp/board_ar71xx.bsp +++ b/bsp/board_ar71xx.bsp @@ -3,6 +3,7 @@ chipset=ar71xx subtarget=tiny images=("openwrt-${chipset}-${subtarget}-archer-c25-v1-squashfs-sysupgrade.bin" "openwrt-${chipset}-${subtarget}-archer-c60-v1-squashfs-sysupgrade.bin" + "openwrt-${chipset}-${subtarget}-archer-c60-v2-squashfs-sysupgrade.bin" "openwrt-${chipset}-${subtarget}-archer-c7-v2-squashfs-sysupgrade.bin" "openwrt-${chipset}-${subtarget}-archer-c7-v5-squashfs-sysupgrade.bin" "openwrt-${chipset}-${subtarget}-cpe210-220-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 53e7a6f3..7bfcb3a1 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,9 @@ -From e602e72f7e67db86264c7daf70c8cf2c32913139 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 | 15 +++++++++++++++ - 2 files changed, 20 insertions(+) +Subject: allow building all devives as tiny diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile -index 1eaf1e457c..602323bba2 100644 +index 1eaf1e457c8862b603cc2477af1638a05aa5a599..602323bba27ee1e401a3e99bb47b9327e9db2e6a 100644 --- a/target/linux/ar71xx/image/Makefile +++ b/target/linux/ar71xx/image/Makefile @@ -22,6 +22,11 @@ endif @@ -25,16 +19,17 @@ 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..4549c4a472 100644 +index 2e9031a24cb23cc6b9a5fffc5223d93a5229fabb..02836de067f3bd2e175c9028596a896b26e2d332 100644 --- a/target/linux/ar71xx/tiny/config-default +++ b/target/linux/ar71xx/tiny/config-default -@@ -70,3 +70,18 @@ CONFIG_SOC_AR933X=y +@@ -70,3 +70,19 @@ 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_C60_V2=y +CONFIG_ATH79_MACH_ARCHER_C7=y +CONFIG_ATH79_MACH_CPE510=y +CONFIG_ATH79_MACH_GL_AR150=y @@ -47,6 +42,3 @@ index 2e9031a24c..4549c4a472 100644 +CONFIG_ATH79_MACH_UBNT=y +CONFIG_ATH79_MACH_UBNT_UNIFIAC=y +CONFIG_ATH79_MACH_UBNT_XM=y --- -2.11.0 - diff --git a/src/packages/fff/fff-network/ar71xx/network.archer-c60-v2 b/src/packages/fff/fff-network/ar71xx/network.archer-c60-v2 new file mode 100644 index 00000000..c1be2dc1 --- /dev/null +++ b/src/packages/fff/fff-network/ar71xx/network.archer-c60-v2 @@ -0,0 +1,9 @@ +PORTORDER="4 3 2 1" + +WANDEV=eth0 +SWITCHDEV=eth1 +CLIENT_PORTS="1 2 0t" +BATMAN_PORTS="3 4 0t" + +ETHMESHMAC=$(cat /sys/class/net/eth1/address) +ROUTERMAC=$(cat /sys/class/net/eth0/address)