From a79bdf75940e89410da054961a02228035a45b89 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Wed, 10 Feb 2021 20:28:07 +0100 Subject: [PATCH] ath79: implement both versions of ubnt,bullet-m MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The Bullet M (XM) was sold with two different SoCs, AR7241 and AR7240, which cannot be served by one DTS. This implements both versions as done in OpenWrt. Note that those variants may not be distinguished from the outside. The AR7241 version appears to be the more recent and more abundant version. Signed-off-by: Adrian Schmutzler Reviewed-by: Fabian Bläse --- bsp/ath79-generic.bsp | 3 ++- bsp/ath79-generic/.config | 6 ++++-- src/packages/fff/fff-network/Makefile | 2 +- .../fff/fff-network/files/lib/functions/fff/cpuport | 3 ++- ...network.ubnt,bullet-m => network.ubnt,bullet-m-ar7240} | 0 .../fff/fff-network/mips/network.ubnt,bullet-m-ar7241 | 8 ++++++++ 6 files changed, 17 insertions(+), 5 deletions(-) rename src/packages/fff/fff-network/mips/{network.ubnt,bullet-m => network.ubnt,bullet-m-ar7240} (100%) create mode 100644 src/packages/fff/fff-network/mips/network.ubnt,bullet-m-ar7241 diff --git a/bsp/ath79-generic.bsp b/bsp/ath79-generic.bsp index dd1eccfa..0402ee23 100644 --- a/bsp/ath79-generic.bsp +++ b/bsp/ath79-generic.bsp @@ -21,7 +21,8 @@ images=("openwrt-${chipset}-${subtarget}-glinet_gl-ar150-squashfs-*" "openwrt-${chipset}-${subtarget}-tplink_tl-wr1043n-v5-squashfs-*" "openwrt-${chipset}-${subtarget}-tplink_tl-wr710n-v1-squashfs-*" "openwrt-${chipset}-${subtarget}-tplink_tl-wr842n-v2-squashfs-*" - "openwrt-${chipset}-${subtarget}-ubnt_bullet-m-squashfs-*" + "openwrt-${chipset}-${subtarget}-ubnt_bullet-m-ar7240-squashfs-*" + "openwrt-${chipset}-${subtarget}-ubnt_bullet-m-ar7241-squashfs-*" "openwrt-${chipset}-${subtarget}-ubnt_nanostation-loco-m-squashfs-*" "openwrt-${chipset}-${subtarget}-ubnt_nanostation-loco-m-xw-squashfs-*" "openwrt-${chipset}-${subtarget}-ubnt_nanostation-m-squashfs-*" diff --git a/bsp/ath79-generic/.config b/bsp/ath79-generic/.config index f99ab4cb..852751db 100644 --- a/bsp/ath79-generic/.config +++ b/bsp/ath79-generic/.config @@ -46,8 +46,10 @@ CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_tl-wr710n-v1=y CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_tl-wr710n-v1="" CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_tl-wr842n-v2=y CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_tl-wr842n-v2="" -CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_ubnt_bullet-m=y -CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_ubnt_bullet-m="-rssileds" +CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_ubnt_bullet-m-ar7240=y +CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_ubnt_bullet-m-ar7240="-rssileds" +CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_ubnt_bullet-m-ar7241=y +CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_ubnt_bullet-m-ar7241="-rssileds" CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_ubnt_nanostation-loco-m=y CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_ubnt_nanostation-loco-m="-rssileds" CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_ubnt_nanostation-loco-m-xw=y diff --git a/src/packages/fff/fff-network/Makefile b/src/packages/fff/fff-network/Makefile index c3eb61bb..057e3ccb 100644 --- a/src/packages/fff/fff-network/Makefile +++ b/src/packages/fff/fff-network/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-network -PKG_RELEASE:=39 +PKG_RELEASE:=40 include $(INCLUDE_DIR)/package.mk diff --git a/src/packages/fff/fff-network/files/lib/functions/fff/cpuport b/src/packages/fff/fff-network/files/lib/functions/fff/cpuport index 0728269e..fed1051d 100644 --- a/src/packages/fff/fff-network/files/lib/functions/fff/cpuport +++ b/src/packages/fff/fff-network/files/lib/functions/fff/cpuport @@ -23,7 +23,8 @@ get_cpu_port() { tplink,tl-wa850re-v1|\ tplink,tl-wa860re-v1|\ tplink,tl-wa901nd-v2|\ - ubnt,bullet-m|\ + ubnt,bullet-m-ar7240|\ + ubnt,bullet-m-ar7241|\ ubnt,nanostation-loco-m|\ ubnt,nanostation-loco-m-xw|\ ubnt,nanostation-m|\ diff --git a/src/packages/fff/fff-network/mips/network.ubnt,bullet-m b/src/packages/fff/fff-network/mips/network.ubnt,bullet-m-ar7240 similarity index 100% rename from src/packages/fff/fff-network/mips/network.ubnt,bullet-m rename to src/packages/fff/fff-network/mips/network.ubnt,bullet-m-ar7240 diff --git a/src/packages/fff/fff-network/mips/network.ubnt,bullet-m-ar7241 b/src/packages/fff/fff-network/mips/network.ubnt,bullet-m-ar7241 new file mode 100644 index 00000000..57cbf33f --- /dev/null +++ b/src/packages/fff/fff-network/mips/network.ubnt,bullet-m-ar7241 @@ -0,0 +1,8 @@ +WANDEV=eth0 +SWITCHDEV=eth0 +CLIENT_PORTS="" +WAN_PORTS="" +BATMAN_PORTS="" +ONE_PORT="YES" + +. /etc/network.mode