diff options
author | Martin Blumenstingl <martin.blumenstingl@googlemail.com> | 2020-06-07 15:07:28 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-06-26 16:05:36 +0200 |
commit | b1df48caac1b3f75a65768a5abf8de84801edbf0 (patch) | |
tree | 6a5f5e9ec3b0a1e2f07feb18a872fa830ecf990f /target/linux/lantiq/xway | |
parent | dea4bae7c2b963af02e1e3e3bdb5cd656a5ea3d3 (diff) | |
download | upstream-b1df48caac1b3f75a65768a5abf8de84801edbf0.tar.gz upstream-b1df48caac1b3f75a65768a5abf8de84801edbf0.tar.bz2 upstream-b1df48caac1b3f75a65768a5abf8de84801edbf0.zip |
lantiq: xrx200: switch the subtarget to the mainline DSA driver
Enable the XRX200 PMAC, GSWIP DSA tag and GSIP DSA drivers in the 5.4
kernel config. Update the existing vr9_*.dts{,i} to use the new
Ethernet and switch drivers. Drop the swconfig package from the xrx200
target because swconfig doesn't manage DSA based switches.
The new /etc/config/network format for the DSA driver is not compatible
with the old (swconfig) based one. Show a message during sysupgrade
notifying users about this change and asking them to start with a fresh
config (or forcefully update and then migrate the config manually).
Failsafe mode can now automatically bring up the first lan interface
based on board.json including DSA based setups. Drop
05_set_preinit_iface_lantiq from the xRX200 sub-target as this is not
needed anymore. For now we are keeping it for the ase, xway and
xway_legacy until there's some confirmation that it can be dropped from
there as well.
While here, some boards also receive minor fixups:
- Use LAN1 as LAN1 (according to a photo this port can also be
configured as WAN) on the Buffalo WBMR-300HPD. This makes it easier to
read the port mapping because otherwise we would have LAN{2,3,4} and
WAN (which was the case for the non-DSA version previously).
- vr9_avm_fritz3390.dts: move the "gpio" comment from port 0 and 1 to
their corresponding PHYs
- vr9_tplink_vr200.dtsi: move the "gpio" comment from port 0 to PHY 0
- vr9_tplink_tdw89x0.dtsi: move the "gpio" comment from port 0 to PHY 0
Acked-by: Aleksander Jan Bajkowski <A.Bajkowski@stud.elka.pw.edu.pl>
Tested-by: Notupus <notpp46@googlemail.com> # TD-W9980/DM200/FRITZ 7430
Tested-by: Martin Schiller <ms@dev.tdt.de> # tested on TDT VR2020
Tested-by: Martin Schiller <ms@dev.tdt.de> # tested on TP-Link TD-W8980B
Tested-by: Martin Schiller <ms@dev.tdt.de> # tested on ZyXEL P-2812HNU-F1
Tested-by: Daniel Kestrel <kestrel1974@t-online.de> # tested on Fritzbox 7490
Tested-by: Daniel Kestrel <kestrel1974@t-online.de> # tested on Fritzbox 3490
Tested-by: @jospezial <jospezial@gmx.de> # tested on VGV7510KW22 (o2 Box 6431)
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Diffstat (limited to 'target/linux/lantiq/xway')
-rw-r--r-- | target/linux/lantiq/xway/base-files/lib/preinit/05_set_preinit_iface_lantiq | 5 | ||||
-rw-r--r-- | target/linux/lantiq/xway/config-5.10 | 1 | ||||
-rw-r--r-- | target/linux/lantiq/xway/config-5.4 | 1 |
3 files changed, 7 insertions, 0 deletions
diff --git a/target/linux/lantiq/xway/base-files/lib/preinit/05_set_preinit_iface_lantiq b/target/linux/lantiq/xway/base-files/lib/preinit/05_set_preinit_iface_lantiq new file mode 100644 index 0000000000..5f059ee974 --- /dev/null +++ b/target/linux/lantiq/xway/base-files/lib/preinit/05_set_preinit_iface_lantiq @@ -0,0 +1,5 @@ +set_preinit_iface() { + ifname=eth0 +} + +boot_hook_add preinit_main set_preinit_iface diff --git a/target/linux/lantiq/xway/config-5.10 b/target/linux/lantiq/xway/config-5.10 index 0716679aee..cfbf08ab9f 100644 --- a/target/linux/lantiq/xway/config-5.10 +++ b/target/linux/lantiq/xway/config-5.10 @@ -41,6 +41,7 @@ CONFIG_RTL8367_PHY=y CONFIG_SGL_ALLOC=y CONFIG_SOC_TYPE_XWAY=y CONFIG_SOC_XWAY=y +CONFIG_SWCONFIG=y CONFIG_UBIFS_FS=y CONFIG_USB=y CONFIG_USB_COMMON=y diff --git a/target/linux/lantiq/xway/config-5.4 b/target/linux/lantiq/xway/config-5.4 index 3f58576242..42004b0d4d 100644 --- a/target/linux/lantiq/xway/config-5.4 +++ b/target/linux/lantiq/xway/config-5.4 @@ -37,6 +37,7 @@ CONFIG_RTL8366_SMI=y CONFIG_RTL8367B_PHY=y CONFIG_RTL8367_PHY=y CONFIG_SGL_ALLOC=y +CONFIG_SWCONFIG=y CONFIG_UBIFS_FS=y CONFIG_USB=y CONFIG_USB_COMMON=y |