[PATCH v5 2/2] treewide: move devices from ar71xx to ath79

So Jun 14 12:49:12 CEST 2020

Hallo Adrian,

könnte passen. Super genau habe ich es mir nicht angesehen, das würde ich lieber auf eine ggf. erweiterte Testphase schieben. Speziell die ggf. verdrehten SWITCHDEV/WANDEV habe ich mir nicht genauer angesehen.
Sieht soweit aber gut aus, ich habe zumindest nichts gefunden, was du komplett vergessen hast. Danke für die Frickelarbeit.

Einige Anmerkungen:
- Ich hätte das Verschieben der CPE210 nach generic in einen eigenen Patch gemacht
- weiteres inline

Ein weiteres Problem ist mir aufgefallen: fff-network wird nur pro Zielarchitektur gebaut, nicht pro BOARD.
Da wir jetzt zwei verschiedene BOARDs mit der gleichen Zielarchitektur haben, geht das beim Bauen mehrerer BSPs kaputt, weil ein fertig erzeugtes fff-network von ar71xx einfach unverändert auch für ath79 (bzw. anders herum) verwendet wird, und die network.* Dateien damit falsch sind.
Ich habe für dieses Problem schon einen Patch vorbereitet, den ich dann auch gleich auf die Liste schicke.
Dieser Patch sollte daher nur in Kombination mit einem weiteren Patch applied werden, der das fixt.

Bin soweit aber zufrieden, können wir denke ich so übernehmen.
Reviewed-by: Fabian Bläse <fabian at blaese.de>

Ich habe das ganze mal beispielhaft auf einem tiny (wa901nd) und einem generic (archer c60v1) ath79 Gerät ausprobiert. Ging beides in Kombination mit 1/2 scheinbar einwandfrei:
Tested-by: Fabian Bläse <fabian at blaese.de>

Gruß
Fabian

On 17.05.20 00:52, Adrian Schmutzler wrote:
> This patch moves device support for ar71xx devices that are supported
> in ath79. Building them with ath79 will be the new default.
> 
> The only devices remaining in ar71xx will be the following, as backporting
> them to openwrt-19.07 is too complicated:
> - cpe210-v1
> - cpe510-v1
> 
> Accordingly, no tiny devices are left in ar71xx and we can drop the relevant
> patches, and build ar71xx as generic again.
> 
> For the tl-wr741nd-v2, in ath79 the tplink_tl-wr741-v1 image is used.
> 
> The move from ar71xx to ath79 requires some adjustments on the way:
> - The board names and image names on ath79 contain the vendor name,
>   where the former have it separated by a comma (tplink,cpe210-v2)
>   and the latter use an underscore (tplink_cpe210-v2). It is
>   safe to assume that this is the only difference between board and
>   image names.
>   Consequently, the ath79 devices will use their full board name also
>   in our firmware. A lot of renames in fff-boardname can be dropped.
>   The rename for fff-sysupgrade is already present in fff-upgrade.sh
>   While at it, fix that for the WDR4900 v1 as well.
> - Due to a different switch driver, the startup of ethernet devices
>   is altered, which leads to eth0 and eth1 being swapped for some ath79
>   devices compared to ar71xx. This has been adjusted for SWITCHDEV/WANDEV
>   and MAC address setup.
> - Since we have direct support for the AC Mesh now, use the proper
>   name instead of the AC Lite image. For Ubiquiti, different device
>   variants are now available as separate images.
Dafür brauchen wir einen Rewrite auf dem Upgrade-Server.
Genauso auch für die neuen Boardnamen mit den Kommas drin.

Sollte jemand für dieses Problem mal eine wirklich gute Idee haben, bitte unbedingt bescheid sagen.

> diff --git a/bsp/ar71xx-generic.bsp b/bsp/ar71xx-generic.bsp
> new file mode 100644
> index 00000000..89fca1df
> --- /dev/null
> +++ b/bsp/ar71xx-generic.bsp
> @@ -0,0 +1,5 @@
> +chipset=ar71xx
> +subtarget=generic
> +images=("openwrt-${chipset}-${subtarget}-cpe210-220-v1-squashfs-*"
> +        "openwrt-${chipset}-${subtarget}-cpe510-520-v1-squashfs-*"
> +        )
> diff --git a/bsp/ar71xx-generic/.config b/bsp/ar71xx-generic/.config
> new file mode 100644
> index 00000000..f505d866
> --- /dev/null
> +++ b/bsp/ar71xx-generic/.config
> @@ -0,0 +1,34 @@
> +# Generated using "./buildscript config openwrt".
> +# Do no edit manually
> +#
> +CONFIG_TARGET_ar71xx=y
> +CONFIG_TARGET_ar71xx_generic=y
> +CONFIG_TARGET_MULTI_PROFILE=y
> +CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_cpe210-220-v1=y
> +CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_generic_DEVICE_cpe210-220-v1="-rssileds"
> +CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_cpe510-520-v1=y
> +CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_generic_DEVICE_cpe510-520-v1="-rssileds"
> +CONFIG_BUSYBOX_CUSTOM=y
> +CONFIG_TARGET_PER_DEVICE_ROOTFS=y
> +# CONFIG_BUSYBOX_CONFIG_BRCTL is not set
> +# CONFIG_BUSYBOX_CONFIG_CROND is not set
> +# CONFIG_BUSYBOX_CONFIG_CRONTAB is not set
> +# CONFIG_BUSYBOX_CONFIG_FEATURE_FAST_TOP is not set
> +# CONFIG_BUSYBOX_CONFIG_FEATURE_NTPD_SERVER is not set
> +CONFIG_CLEAN_IPKG=y
> +# CONFIG_DROPBEAR_CURVE25519 is not set
> +# CONFIG_FASTD_ENABLE_CIPHER_SALSA2012 is not set
> +# CONFIG_FASTD_ENABLE_MAC_GHASH is not set
> +# CONFIG_FASTD_ENABLE_MAC_UHASH is not set
> +# CONFIG_FASTD_ENABLE_METHOD_COMPOSED_GMAC is not set
> +# CONFIG_FASTD_ENABLE_METHOD_COMPOSED_UMAC is not set
> +# CONFIG_FASTD_ENABLE_METHOD_GENERIC_GMAC is not set
> +# CONFIG_FASTD_ENABLE_METHOD_GENERIC_UMAC is not set

---
> +CONFIG_KERNEL_SQUASHFS_FRAGMENT_CACHE_SIZE=1
> +# CONFIG_PACKAGE_ALFRED_VIS is not set
> +CONFIG_PACKAGE_hostapd-mini=y
> +CONFIG_PACKAGE_iwinfo=m
> +CONFIG_PACKAGE_libiwinfo=m
> +CONFIG_PACKAGE_opkg=m
> +CONFIG_PACKAGE_wpad-mini=m
> +CONFIG_STRIP_KERNEL_EXPORTS=y
Für generic würde ich das hier nicht mit rein nehmen, nur für tiny..

> diff --git a/bsp/ath79-generic/.config b/bsp/ath79-generic/.config
> new file mode 100644
> index 00000000..1f25ae2f
> --- /dev/null
> +++ b/bsp/ath79-generic/.config
> @@ -0,0 +1,89 @@
> +# Generated using "./buildscript config openwrt".
> +# Do no edit manually
> +#
> +CONFIG_TARGET_ath79=y
> +CONFIG_TARGET_ath79_generic=y
> +CONFIG_TARGET_MULTI_PROFILE=y
> +CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_glinet_gl-ar150=y
> +CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_glinet_gl-ar150=""
> +CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_archer-c25-v1=y
> +CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_archer-c25-v1="-kmod-ath10k-ct-smallbuffers kmod-ath10k -ath10k-firmware-qca9887-ct ath10k-firmware-qca9887"
> +CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_archer-c60-v1=y
> +CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_archer-c60-v1="-kmod-ath10k-ct-smallbuffers kmod-ath10k -ath10k-firmware-qca9888-ct ath10k-firmware-qca9888"
> +CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_archer-c60-v2=y
> +CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_archer-c60-v2="-kmod-ath10k-ct-smallbuffers kmod-ath10k -ath10k-firmware-qca9888-ct ath10k-firmware-qca9888"
> +CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_archer-c7-v2=y
> +CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_archer-c7-v2="-kmod-ath10k-ct kmod-ath10k -ath10k-firmware-qca988x-ct ath10k-firmware-qca988x"
> +CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_archer-c7-v5=y
> +CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_archer-c7-v5="-kmod-ath10k-ct kmod-ath10k -ath10k-firmware-qca988x-ct ath10k-firmware-qca988x"
> +CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_cpe210-v2=y
> +CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_cpe210-v2="-rssileds"
> +CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_cpe210-v3=y
> +CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_cpe210-v3="-rssileds"
> +CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_tl-wdr3500-v1=y
> +CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_tl-wdr3500-v1=""
> +CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_tl-wdr3600-v1=y
> +CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_tl-wdr3600-v1=""
> +CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_tl-wdr4300-v1=y
> +CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_tl-wdr4300-v1=""
> +CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_tl-wdr4310-v1=y
> +CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_tl-wdr4310-v1=""
> +CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_tl-wr1043nd-v1=y
> +CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_tl-wr1043nd-v1=""
> +CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_tl-wr1043nd-v2=y
> +CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_tl-wr1043nd-v2=""
> +CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_tl-wr1043nd-v3=y
> +CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_tl-wr1043nd-v3=""
> +CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_tl-wr1043nd-v4=y
> +CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_tl-wr1043nd-v4=""
> +CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_tl-wr1043n-v5=y
> +CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_tl-wr1043n-v5=""
> +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_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
> +CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_ubnt_nanostation-loco-m-xw="-rssileds"
> +CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_ubnt_nanostation-m=y
> +CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_ubnt_nanostation-m="-rssileds"
> +CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_ubnt_picostation-m=y
> +CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_ubnt_picostation-m="-rssileds"
> +CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_ubnt_unifi=y
> +CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_ubnt_unifi=""
> +CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_ubnt_unifiac-mesh=y
> +CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_ubnt_unifiac-mesh="-kmod-ath10k-ct kmod-ath10k -ath10k-firmware-qca988x-ct ath10k-firmware-qca988x"
> +CONFIG_BUSYBOX_CUSTOM=y
> +CONFIG_TARGET_PER_DEVICE_ROOTFS=y
> +# CONFIG_BUSYBOX_CONFIG_BRCTL is not set
> +# CONFIG_BUSYBOX_CONFIG_CROND is not set
> +# CONFIG_BUSYBOX_CONFIG_CRONTAB is not set
> +# CONFIG_BUSYBOX_CONFIG_FEATURE_FAST_TOP is not set
> +# CONFIG_BUSYBOX_CONFIG_FEATURE_NTPD_SERVER is not set
> +CONFIG_CLEAN_IPKG=y
> +# CONFIG_DROPBEAR_CURVE25519 is not set
> +# CONFIG_FASTD_ENABLE_CIPHER_SALSA2012 is not set
> +# CONFIG_FASTD_ENABLE_MAC_GHASH is not set
> +# CONFIG_FASTD_ENABLE_MAC_UHASH is not set
> +# CONFIG_FASTD_ENABLE_METHOD_COMPOSED_GMAC is not set
> +# CONFIG_FASTD_ENABLE_METHOD_COMPOSED_UMAC is not set
> +# CONFIG_FASTD_ENABLE_METHOD_GENERIC_GMAC is not set
> +# CONFIG_FASTD_ENABLE_METHOD_GENERIC_UMAC is not set

---
> +CONFIG_KERNEL_SQUASHFS_FRAGMENT_CACHE_SIZE=1
> +# CONFIG_PACKAGE_ALFRED_VIS is not set
> +CONFIG_PACKAGE_hostapd-mini=y
> +CONFIG_PACKAGE_iwinfo=m
> +CONFIG_PACKAGE_libiwinfo=m
> +CONFIG_PACKAGE_opkg=m
> +CONFIG_PACKAGE_wpad-mini=m
> +CONFIG_PACKAGE_ath10k-firmware-qca9887=m
> +CONFIG_PACKAGE_ath10k-firmware-qca9888=m
> +CONFIG_PACKAGE_ath10k-firmware-qca988x=m
> +CONFIG_PACKAGE_kmod-ath10k=m
> +CONFIG_PACKAGE_ath10k-firmware-qca9887-ct=m
> +CONFIG_PACKAGE_ath10k-firmware-qca9888-ct=m
> +CONFIG_PACKAGE_ath10k-firmware-qca988x-ct=m
> +CONFIG_PACKAGE_kmod-ath10k-ct-smallbuffers=m
> +CONFIG_PACKAGE_kmod-ath10k-ct=m
> +CONFIG_STRIP_KERNEL_EXPORTS=y
siehe oben.

-------------- nächster Teil --------------
Ein Dateianhang mit Binärdaten wurde abgetrennt...
Dateiname   : signature.asc
Dateityp    : application/pgp-signature
Dateigröße  : 833 bytes
Beschreibung: OpenPGP digital signature
URL         : <https://lists.freifunk.net/pipermail/franken-dev-freifunk.net/attachments/20200614/ed85702c/attachment.sig>