Message ID | 20190611194024.11516-1-fabian@blaese.de |
---|---|
State | Accepted |
Headers | show |
diff --git a/bsp/ar71xx/.config b/bsp/ar71xx/.config index 85987e3..71ead40 100644 --- a/bsp/ar71xx/.config +++ b/bsp/ar71xx/.config @@ -10,6 +10,8 @@ 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_archer-c7-v5=y +CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_tiny_DEVICE_archer-c7-v5="-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_cpe210-v2=y diff --git a/bsp/board_ar71xx.bsp b/bsp/board_ar71xx.bsp index 1879909..37130d0 100644 --- a/bsp/board_ar71xx.bsp +++ b/bsp/board_ar71xx.bsp @@ -5,6 +5,7 @@ target=$builddir/$machine 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}-archer-c7-v5-squashfs-sysupgrade.bin" "openwrt-${chipset}-${subtarget}-cpe210-220-v1-squashfs-sysupgrade.bin" "openwrt-${chipset}-${subtarget}-cpe210-v2-squashfs-sysupgrade.bin" "openwrt-${chipset}-${subtarget}-cpe210-v3-squashfs-sysupgrade.bin" diff --git a/src/packages/fff/fff-network/ar71xx/network.archer-c7-v5 b/src/packages/fff/fff-network/ar71xx/network.archer-c7-v5 new file mode 100644 index 0000000..493134a --- /dev/null +++ b/src/packages/fff/fff-network/ar71xx/network.archer-c7-v5 @@ -0,0 +1,15 @@ +. /lib/functions/fff/network + +PORTORDER="1 2 3 4 5" + +WANDEV=eth0 +SWITCHDEV=eth0 +CLIENT_PORTS="4 5 0t" +WAN_PORTS="1 0t" +BATMAN_PORTS="2 3 0t" + +# use mac address from phy1 with 'locally administered' bit set to '1' +# only possible, because wXmesh is created first and therefore gets the 'universally administered address' + +ETHMESHMAC=$(macFlipLocalBit "$(cat /sys/class/ieee80211/phy1/macaddress)") +ROUTERMAC=$(cat /sys/class/net/eth0/address)
Getestet und funktioniert bei mir einwandfrei ;) Gruß, McUles Am 11. Juni 2019, 21:41, um 21:41, "Fabian Bläse" <fabian@blaese.de> schrieb: >Signed-off-by: Fabian Bläse <fabian@blaese.de> >[freifunk@adrianschmztler.de: Added Portorder] >Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> >Reviewed-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> >--- >Changes in v2: >- Add missing include for macFlipLocalBit >--- > bsp/ar71xx/.config | 2 ++ > bsp/board_ar71xx.bsp | 1 + > .../fff/fff-network/ar71xx/network.archer-c7-v5 | 15 +++++++++++++++ > 3 files changed, 18 insertions(+) >create mode 100644 >src/packages/fff/fff-network/ar71xx/network.archer-c7-v5 > >diff --git a/bsp/ar71xx/.config b/bsp/ar71xx/.config >index 85987e3..71ead40 100644 >--- a/bsp/ar71xx/.config >+++ b/bsp/ar71xx/.config >@@ -10,6 +10,8 @@ >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_archer-c7-v5=y >+CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_tiny_DEVICE_archer-c7-v5="-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_cpe210-v2=y >diff --git a/bsp/board_ar71xx.bsp b/bsp/board_ar71xx.bsp >index 1879909..37130d0 100644 >--- a/bsp/board_ar71xx.bsp >+++ b/bsp/board_ar71xx.bsp >@@ -5,6 +5,7 @@ target=$builddir/$machine >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}-archer-c7-v5-squashfs-sysupgrade.bin" >"openwrt-${chipset}-${subtarget}-cpe210-220-v1-squashfs-sysupgrade.bin" > "openwrt-${chipset}-${subtarget}-cpe210-v2-squashfs-sysupgrade.bin" > "openwrt-${chipset}-${subtarget}-cpe210-v3-squashfs-sysupgrade.bin" >diff --git a/src/packages/fff/fff-network/ar71xx/network.archer-c7-v5 >b/src/packages/fff/fff-network/ar71xx/network.archer-c7-v5 >new file mode 100644 >index 0000000..493134a >--- /dev/null >+++ b/src/packages/fff/fff-network/ar71xx/network.archer-c7-v5 >@@ -0,0 +1,15 @@ >+. /lib/functions/fff/network >+ >+PORTORDER="1 2 3 4 5" >+ >+WANDEV=eth0 >+SWITCHDEV=eth0 >+CLIENT_PORTS="4 5 0t" >+WAN_PORTS="1 0t" >+BATMAN_PORTS="2 3 0t" >+ >+# use mac address from phy1 with 'locally administered' bit set to '1' >+# only possible, because wXmesh is created first and therefore gets >the 'universally administered address' >+ >+ETHMESHMAC=$(macFlipLocalBit "$(cat >/sys/class/ieee80211/phy1/macaddress)") >+ROUTERMAC=$(cat /sys/class/net/eth0/address) >-- >2.22.0
On 11.06.19 21:40, Fabian Bläse wrote: > Signed-off-by: Fabian Bläse <fabian@blaese.de> > [freifunk@adrianschmztler.de: Added Portorder] Hier ist ein Tippfehler in der E-Mail Adresse, bitte beim applien reparieren. :-) Gruß Fabian
Hallo, ich denke ein Review und ein Test sind genug, um das Gerät aufzunehmen. Applied. Fabian
Zähle ich nicht oder wie? Mit freundlichen Grüßen aus Pfändhausen / Best regards, Dennis Eisold Geschäftsführer / CEO IT Stall UG (haftungsbeschränkt) Poststraße 3 97456 Dittelbrunn Telefon +49(0)9738/3485382 Der Inhalt dieser E-Mail ist vertraulich. Sie ist ausschließlich für den Empfänger gedacht. Jeder nicht autorisierter Empfänger, muss diese E-Mail löschen um eine unzulässige Verwendung zu vermeiden. The content of this E-Mail is confidential. It is intended solely for the addressee. For any unauthorized recipient, please delete this E-Mail to avoid unlawful usage. Am 22.06.2019 21:56:59 schrieb Fabian Bläse <fabian@blaese.de>: Hallo, ich denke ein Review und ein Test sind genug, um das Gerät aufzunehmen. Applied. Fabian
Doch, klar. Hab ich doch geschrieben: "und ein Test" Gruß Fabian On 25.06.19 10:20, Dennis Eisold wrote: > Zähle ich nicht oder wie? > > Mit freundlichen Grüßen aus Pfändhausen / Best regards, > Dennis Eisold