Message ID | 20190604145451.25208-1-fabian@blaese.de |
---|---|
State | Superseded |
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..a663a81 --- /dev/null +++ b/src/packages/fff/fff-network/ar71xx/network.archer-c7-v5 @@ -0,0 +1,13 @@ +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)
Hallo Fabian, im network.* File fehlt der include für macFlipLocalBit . Ansonsten Reviewed-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> Grüße Adrian > -----Original Message----- > From: Fabian Bläse [mailto:fabian@blaese.de] > Sent: Dienstag, 4. Juni 2019 16:55 > To: franken-dev@freifunk.net > Cc: Fabian Bläse <fabian@blaese.de>; Adrian Schmutzler > <freifunk@adrianschmutzler.de> > Subject: [PATCH] Add support for TP-Link Archer C7 v5 > > Signed-off-by: Fabian Bläse <fabian@blaese.de> > [freifunk@adrianschmztler.de: Added Portorder] > Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> > --- > Changes from RFC patch: > - Moved cpuport to lib/functions/fff/cpuport (matches '*') > - Added portorder > - ath10k driver was not modified as the previously used combination is the only > one I've tested > --- > bsp/ar71xx/.config | 2 ++ > bsp/board_ar71xx.bsp | 1 + > .../fff/fff-network/ar71xx/network.archer-c7-v5 | 13 +++++++++++++ > 3 files changed, 16 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..a663a81 > --- /dev/null > +++ b/src/packages/fff/fff-network/ar71xx/network.archer-c7-v5 > @@ -0,0 +1,13 @@ > +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.21.0
Verdammt. Siehe v2. :-) Gruß Fabian On 05.06.19 17:19, Adrian Schmutzler wrote: > Hallo Fabian, > > im network.* File fehlt der include für macFlipLocalBit . > > Ansonsten > Reviewed-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> > > Grüße > > Adrian > > >> -----Original Message----- >> From: Fabian Bläse [mailto:fabian@blaese.de] >> Sent: Dienstag, 4. Juni 2019 16:55 >> To: franken-dev@freifunk.net >> Cc: Fabian Bläse <fabian@blaese.de>; Adrian Schmutzler >> <freifunk@adrianschmutzler.de> >> Subject: [PATCH] Add support for TP-Link Archer C7 v5 >> >> Signed-off-by: Fabian Bläse <fabian@blaese.de> >> [freifunk@adrianschmztler.de: Added Portorder] >> Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> >> --- >> Changes from RFC patch: >> - Moved cpuport to lib/functions/fff/cpuport (matches '*') >> - Added portorder >> - ath10k driver was not modified as the previously used combination is the only >> one I've tested >> --- >> bsp/ar71xx/.config | 2 ++ >> bsp/board_ar71xx.bsp | 1 + >> .../fff/fff-network/ar71xx/network.archer-c7-v5 | 13 +++++++++++++ >> 3 files changed, 16 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..a663a81 >> --- /dev/null >> +++ b/src/packages/fff/fff-network/ar71xx/network.archer-c7-v5 >> @@ -0,0 +1,13 @@ >> +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.21.0