diff --git a/modules b/modules index c2a7cc8d..4bbbc0fe 100644 --- a/modules +++ b/modules @@ -1,16 +1,16 @@ GLUON_FEEDS='packages routing gluon' OPENWRT_REPO=https://github.com/openwrt/openwrt.git -OPENWRT_BRANCH=openwrt-21.02 -OPENWRT_COMMIT=dd58c12f0f404580785789c144d8548d1a945fe1 +OPENWRT_BRANCH=openwrt-22.03 +OPENWRT_COMMIT=d4053d2e8e098c53d6fc6ab860ba71cd8edf5455 PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git -PACKAGES_PACKAGES_BRANCH=openwrt-21.02 -PACKAGES_PACKAGES_COMMIT=0d142ffd238fadce14e5fafe9a68d0475f39e7d4 +PACKAGES_PACKAGES_BRANCH=openwrt-22.03 +PACKAGES_PACKAGES_COMMIT=09da83968ef0846cd1b13bfa1b91c33a1f9985bb PACKAGES_ROUTING_REPO=https://github.com/openwrt/routing.git -PACKAGES_ROUTING_BRANCH=openwrt-21.02 -PACKAGES_ROUTING_COMMIT=b987eb3a9093f7fcf68d250d0c58f64ca13f0bc0 +PACKAGES_ROUTING_BRANCH=openwrt-22.03 +PACKAGES_ROUTING_COMMIT=48f6120ad4b8c1515d29110c6291ff7e264fef29 PACKAGES_GLUON_REPO=https://github.com/freifunk-gluon/packages.git PACKAGES_GLUON_COMMIT=308166e3c6b2d571606dd1dbfadd2bb8e31d8f90 diff --git a/patches/openwrt/0004-wireguard-tools-allow-generating-private_key-v3.patch b/patches/openwrt/0004-wireguard-tools-allow-generating-private_key-v3.patch deleted file mode 100644 index 9d801d02..00000000 --- a/patches/openwrt/0004-wireguard-tools-allow-generating-private_key-v3.patch +++ /dev/null @@ -1,53 +0,0 @@ -From: lemoer -Date: Sat, 3 Jul 2021 22:50:29 +0200 -Subject: wireguard-tools: allow generating private_key (v3) - -When the uci configuration is created automatically during a very early -stage, where no entropy daemon is set up, generating the key directly is -not an option. Therefore we allow to set the private_key to "generate" -and generate the private key directly before the interface is taken up. - -v3: Somebody has implemented another uci cli flag '-t' upstream to handle - this, before my patch to implement the new uci flag '-x' syntax was - accepted. So I dropped my suggestion of '-x'. -v2: We now use a new uci cli flag to commit only the private_key and do - not commit uncommited user changes. This is not yet upstream as of - now. - -diff --git a/package/network/utils/wireguard-tools/files/wireguard.sh b/package/network/utils/wireguard-tools/files/wireguard.sh -index 63261aea71daa058bf37014ba7d670a5e74a2e04..845f9eb902bf3655b631d52aa3ee69231366f657 100644 ---- a/package/network/utils/wireguard-tools/files/wireguard.sh -+++ b/package/network/utils/wireguard-tools/files/wireguard.sh -@@ -95,6 +95,23 @@ proto_wireguard_setup_peer() { - fi - } - -+ensure_key_is_generated() { -+ local private_key -+ private_key="$(uci get network."$1".private_key)" -+ -+ if [ "$private_key" == "generate" ]; then -+ local ucitmp -+ oldmask="$(umask)" -+ umask 077 -+ ucitmp="$(mktemp -d)" -+ private_key="$("${WG}" genkey)" -+ uci -q -t "$ucitmp" set network."$1".private_key="$private_key" && \ -+ uci -q -t "$ucitmp" commit network -+ rm -rf "$ucitmp" -+ umask "$oldmask" -+ fi -+} -+ - proto_wireguard_setup() { - local config="$1" - local wg_dir="/tmp/wireguard" -@@ -104,6 +121,8 @@ proto_wireguard_setup() { - local listen_port - local mtu - -+ ensure_key_is_generated "${config}" -+ - config_load network - config_get private_key "${config}" "private_key" - config_get listen_port "${config}" "listen_port" diff --git a/patches/openwrt/0005-ath79-Add-support-for-OpenMesh-A60.patch b/patches/openwrt/0005-ath79-Add-support-for-OpenMesh-A60.patch deleted file mode 100644 index 1aeb91a5..00000000 --- a/patches/openwrt/0005-ath79-Add-support-for-OpenMesh-A60.patch +++ /dev/null @@ -1,337 +0,0 @@ -From: Sven Eckelmann -Date: Mon, 23 Nov 2020 13:41:34 +0100 -Subject: ath79: Add support for OpenMesh A60 - -Device specifications: -====================== - -* Qualcomm/Atheros QCA9558 ver 1 rev 0 -* 720/600/240 MHz (CPU/DDR/AHB) -* 128 MB of RAM -* 16 MB of SPI NOR flash - - 2x 7 MB available; but one of the 7 MB regions is the recovery image -* 3T3R 2.4 GHz Wi-Fi (11n) -* 3T3R 5 GHz Wi-Fi (11ac) -* multi-color LED (controlled via red/green/blue GPIOs) -* 1x GPIO-button (reset) -* external h/w watchdog (enabled by default)) -* TTL pins are on board (arrow points to VCC, then follows: GND, TX, RX) -* 2x ethernet - - eth0 - + Label: Ethernet 1 - + AR8035 ethernet PHY (RGMII) - + 10/100/1000 Mbps Ethernet - + 802.3af POE - + used as WAN interface - - eth1 - + Label: Ethernet 2 - + AR8031 ethernet PHY (SGMII) - + 10/100/1000 Mbps Ethernet - + used as LAN interface -* 1x USB -* internal antennas - -Flashing instructions: -====================== - -Various methods can be used to install the actual image on the flash. -Two easy ones are: - -ap51-flash ----------- - -The tool ap51-flash (https://github.com/ap51-flash/ap51-flash) should be -used to transfer the image to the u-boot when the device boots up. - -initramfs from TFTP -------------------- - -The serial console must be used to access the u-boot shell during bootup. -It can then be used to first boot up the initramfs image from a TFTP server -(here with the IP 192.168.1.21): - - setenv serverip 192.168.1.21 - setenv ipaddr 192.168.1.1 - tftpboot 0c00000 .bin && bootm $fileaddr - -The actual sysupgrade image can then be transferred (on the LAN port) to the -device via - - scp .bin root@192.168.1.1:/tmp/ - -On the device, the sysupgrade must then be started using - - sysupgrade -n /tmp/.bin - -Signed-off-by: Sven Eckelmann -(cherry picked from commit eaf2e32c12655d7fb58e158086a784393dc6f69a) - -diff --git a/package/boot/uboot-envtools/files/ath79 b/package/boot/uboot-envtools/files/ath79 -index 8bc7dc5ebfd8b6042336144b000d7ab2237add89..363a0f9a581d16dff4673019b7706b505f74d11c 100644 ---- a/package/boot/uboot-envtools/files/ath79 -+++ b/package/boot/uboot-envtools/files/ath79 -@@ -49,6 +49,7 @@ netgear,wnr2200-16m|\ - netgear,wnr612-v2|\ - ocedo,koala|\ - ocedo,raccoon|\ -+openmesh,a60|\ - openmesh,mr600-v1|\ - openmesh,mr600-v2|\ - openmesh,mr900-v1|\ -diff --git a/target/linux/ath79/dts/qca9558_openmesh_a60.dts b/target/linux/ath79/dts/qca9558_openmesh_a60.dts -new file mode 100644 -index 0000000000000000000000000000000000000000..473f055b492f6dffb0c460fd13e7ad9b604373c6 ---- /dev/null -+++ b/target/linux/ath79/dts/qca9558_openmesh_a60.dts -@@ -0,0 +1,8 @@ -+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT -+ -+#include "qca9558_openmesh_a60.dtsi" -+ -+/ { -+ compatible = "openmesh,a60", "qca,qca9558"; -+ model = "OpenMesh A60"; -+}; -diff --git a/target/linux/ath79/dts/qca9558_openmesh_a60.dtsi b/target/linux/ath79/dts/qca9558_openmesh_a60.dtsi -new file mode 100644 -index 0000000000000000000000000000000000000000..9938e5f4c013575c686edce5699f3541942133d3 ---- /dev/null -+++ b/target/linux/ath79/dts/qca9558_openmesh_a60.dtsi -@@ -0,0 +1,180 @@ -+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT -+ -+#include "qca955x.dtsi" -+ -+#include -+#include -+ -+/ { -+ chosen { -+ /delete-property/ bootargs; -+ }; -+ -+ aliases { -+ serial0 = &uart; -+ led-boot = &led_status_green; -+ led-failsafe = &led_status_green; -+ led-running = &led_status_green; -+ led-upgrade = &led_status_green; -+ label-mac-device = ð0; -+ }; -+ -+ keys { -+ compatible = "gpio-keys"; -+ -+ reset { -+ label = "reset"; -+ linux,code = ; -+ gpios = <&gpio 17 GPIO_ACTIVE_LOW>; -+ }; -+ }; -+ -+ leds { -+ compatible = "gpio-leds"; -+ -+ status_blue { -+ label = "blue:status"; -+ gpios = <&gpio 13 GPIO_ACTIVE_HIGH>; -+ }; -+ -+ status_red { -+ label = "red:status"; -+ gpios = <&gpio 22 GPIO_ACTIVE_HIGH>; -+ }; -+ -+ led_status_green: status_green { -+ label = "green:status"; -+ gpios = <&gpio 23 GPIO_ACTIVE_HIGH>; -+ }; -+ }; -+ -+ watchdog { -+ compatible = "linux,wdt-gpio"; -+ gpios = <&gpio 16 GPIO_ACTIVE_LOW>; -+ hw_algo = "toggle"; -+ /* hw_margin_ms is actually 300s but driver limits it to 60s */ -+ hw_margin_ms = <60000>; -+ always-running; -+ }; -+}; -+ -+&usb_phy1 { -+ status = "okay"; -+}; -+ -+&usb1 { -+ status = "okay"; -+}; -+ -+&spi { -+ status = "okay"; -+ -+ flash@0 { -+ compatible = "jedec,spi-nor"; -+ reg = <0>; -+ spi-max-frequency = <40000000>; -+ -+ /* partitions are passed via bootloader */ -+ partitions { -+ compatible = "fixed-partitions"; -+ #address-cells = <1>; -+ #size-cells = <1>; -+ -+ partition@0 { -+ label = "u-boot"; -+ reg = <0x000000 0x040000>; -+ read-only; -+ }; -+ -+ partition@40000 { -+ label = "u-boot-env"; -+ reg = <0x040000 0x010000>; -+ }; -+ -+ partition@50000 { -+ label = "custom"; -+ reg = <0x050000 0x060000>; -+ read-only; -+ }; -+ -+ partition@b0000 { -+ label = "inactive"; -+ reg = <0x0b0000 0x7a0000>; -+ }; -+ -+ partition@850000 { -+ label = "inactive2"; -+ reg = <0x850000 0x7a0000>; -+ }; -+ -+ art: partition@ff0000 { -+ label = "ART"; -+ reg = <0xff0000 0x010000>; -+ read-only; -+ }; -+ }; -+ }; -+}; -+ -+&mdio0 { -+ status = "okay"; -+ -+ phy-mask = <0x6>; -+ -+ phy1: ethernet-phy@1 { -+ reg = <1>; -+ eee-broken-100tx; -+ eee-broken-1000t; -+ }; -+ -+ phy2: ethernet-phy@2 { -+ reg = <2>; -+ eee-broken-100tx; -+ eee-broken-1000t; -+ at803x-override-sgmii-link-check; -+ }; -+}; -+ -+ð0 { -+ status = "okay"; -+ -+ pll-data = <0x82000101 0x80000101 0x80001313>; -+ -+ mtd-mac-address = <&art 0x0>; -+ -+ phy-mode = "rgmii-id"; -+ phy-handle = <&phy1>; -+ -+ gmac-config { -+ device = <&gmac>; -+ rgmii-enabled = <1>; -+ rxd-delay = <3>; -+ rxdv-delay = <3>; -+ txd-delay = <0>; -+ txen-delay = <0>; -+ }; -+}; -+ -+ð1 { -+ status = "okay"; -+ -+ pll-data = <0x03000101 0x80000101 0x80001313>; -+ -+ mtd-mac-address = <&art 0x6>; -+ -+ qca955x-sgmii-fixup; -+ -+ phy-handle = <&phy2>; -+}; -+ -+&wmac { -+ status = "okay"; -+ -+ mtd-cal-data = <&art 0x1000>; -+ mtd-mac-address = <&art 0x0>; -+ mtd-mac-address-increment = <2>; -+}; -+ -+&pcie0 { -+ status = "okay"; -+}; -diff --git a/target/linux/ath79/generic/base-files/etc/board.d/02_network b/target/linux/ath79/generic/base-files/etc/board.d/02_network -index b01dfa41d1d43e55abfb92ac84ffad01766460e2..eb6068180cb2dd3aac8a455fdbfb29a91d475699 100755 ---- a/target/linux/ath79/generic/base-files/etc/board.d/02_network -+++ b/target/linux/ath79/generic/base-files/etc/board.d/02_network -@@ -172,6 +172,7 @@ ath79_setup_interfaces() - comfast,cf-e120a-v3|\ - comfast,cf-e314n-v2|\ - compex,wpj531-16m|\ -+ openmesh,a60|\ - openmesh,om2p-v4|\ - openmesh,om2p-hs-v4|\ - plasmacloud,pa300|\ -diff --git a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata -index c7dbaafac1056916db79322555c1d3bd63ee20b0..9e1f660cbcf47b1e6194fd10be051daba59b5fe3 100644 ---- a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata -+++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata -@@ -100,6 +100,7 @@ case "$FIRMWARE" in - caldata_extract "art" 0x5000 0x844 - ath10k_patch_mac $(mtd_get_mac_binary art 0xc) - ;; -+ openmesh,a60|\ - openmesh,mr1750-v1|\ - openmesh,mr1750-v2|\ - openmesh,om5p-ac-v2) -diff --git a/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh b/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh -index 1240ef51e88ed2e5d24088746596da085c01ab5c..f7862bb032fbce56be77e9db8ae2e37bf5da30ea 100644 ---- a/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh -+++ b/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh -@@ -65,6 +65,7 @@ platform_do_upgrade() { - jjplus,ja76pf2) - redboot_fis_do_upgrade "$1" linux - ;; -+ openmesh,a60|\ - openmesh,mr600-v1|\ - openmesh,mr600-v2|\ - openmesh,mr900-v1|\ -diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk -index f6e6f98db9090405c2119f58c97f9e8d3e063b31..ed13ad231736d5da1a412162892139193a9523ab 100644 ---- a/target/linux/ath79/image/generic.mk -+++ b/target/linux/ath79/image/generic.mk -@@ -1640,6 +1640,16 @@ define Device/openmesh_common_256k - openmesh-image ce_type=$$$$(OPENMESH_CE_TYPE) | append-metadata - endef - -+define Device/openmesh_a60 -+ $(Device/openmesh_common_64k) -+ SOC := qca9558 -+ DEVICE_MODEL := A60 -+ DEVICE_PACKAGES += kmod-ath10k-ct ath10k-firmware-qca988x-ct kmod-usb2 -+ OPENMESH_CE_TYPE := A60 -+ SUPPORTED_DEVICES += a60 -+endef -+TARGET_DEVICES += openmesh_a60 -+ - define Device/openmesh_mr600-v1 - $(Device/openmesh_common_64k) - SOC := ar9344 diff --git a/patches/openwrt/0006-ath79-Add-support-for-OpenMesh-A40.patch b/patches/openwrt/0006-ath79-Add-support-for-OpenMesh-A40.patch deleted file mode 100644 index e1530253..00000000 --- a/patches/openwrt/0006-ath79-Add-support-for-OpenMesh-A40.patch +++ /dev/null @@ -1,151 +0,0 @@ -From: Sven Eckelmann -Date: Mon, 23 Nov 2020 13:41:34 +0100 -Subject: ath79: Add support for OpenMesh A40 - -Device specifications: -====================== - -* Qualcomm/Atheros QCA9558 ver 1 rev 0 -* 720/600/240 MHz (CPU/DDR/AHB) -* 128 MB of RAM -* 16 MB of SPI NOR flash - - 2x 7 MB available; but one of the 7 MB regions is the recovery image -* 2T2R 2.4 GHz Wi-Fi (11n) -* 2T2R 5 GHz Wi-Fi (11ac) -* multi-color LED (controlled via red/green/blue GPIOs) -* 1x GPIO-button (reset) -* external h/w watchdog (enabled by default)) -* TTL pins are on board (arrow points to VCC, then follows: GND, TX, RX) -* 2x ethernet - - eth0 - + Label: Ethernet 1 - + AR8035 ethernet PHY (RGMII) - + 10/100/1000 Mbps Ethernet - + 802.3af POE - + used as WAN interface - - eth1 - + Label: Ethernet 2 - + AR8035 ethernet PHY (SGMII) - + 10/100/1000 Mbps Ethernet - + used as LAN interface -* 1x USB -* internal antennas - -Flashing instructions: -====================== - -Various methods can be used to install the actual image on the flash. -Two easy ones are: - -ap51-flash ----------- - -The tool ap51-flash (https://github.com/ap51-flash/ap51-flash) should be -used to transfer the image to the u-boot when the device boots up. - -initramfs from TFTP -------------------- - -The serial console must be used to access the u-boot shell during bootup. -It can then be used to first boot up the initramfs image from a TFTP server -(here with the IP 192.168.1.21): - - setenv serverip 192.168.1.21 - setenv ipaddr 192.168.1.1 - tftpboot 0c00000 .bin && bootm $fileaddr - -The actual sysupgrade image can then be transferred (on the LAN port) to the -device via - - scp .bin root@192.168.1.1:/tmp/ - -On the device, the sysupgrade must then be started using - - sysupgrade -n /tmp/.bin - -Signed-off-by: Sven Eckelmann -(cherry picked from commit 9a172797e593c061f6759a37eaeba2956ad8d72f) - -diff --git a/package/boot/uboot-envtools/files/ath79 b/package/boot/uboot-envtools/files/ath79 -index 363a0f9a581d16dff4673019b7706b505f74d11c..e75edff16eb40c7950cfed7767144becae6b67b1 100644 ---- a/package/boot/uboot-envtools/files/ath79 -+++ b/package/boot/uboot-envtools/files/ath79 -@@ -49,6 +49,7 @@ netgear,wnr2200-16m|\ - netgear,wnr612-v2|\ - ocedo,koala|\ - ocedo,raccoon|\ -+openmesh,a40|\ - openmesh,a60|\ - openmesh,mr600-v1|\ - openmesh,mr600-v2|\ -diff --git a/target/linux/ath79/dts/qca9558_openmesh_a40.dts b/target/linux/ath79/dts/qca9558_openmesh_a40.dts -new file mode 100644 -index 0000000000000000000000000000000000000000..d2b817031a9db6846de0632a64962a0197fa2c6f ---- /dev/null -+++ b/target/linux/ath79/dts/qca9558_openmesh_a40.dts -@@ -0,0 +1,8 @@ -+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT -+ -+#include "qca9558_openmesh_a60.dtsi" -+ -+/ { -+ compatible = "openmesh,a40", "qca,qca9558"; -+ model = "OpenMesh A40"; -+}; -diff --git a/target/linux/ath79/generic/base-files/etc/board.d/02_network b/target/linux/ath79/generic/base-files/etc/board.d/02_network -index eb6068180cb2dd3aac8a455fdbfb29a91d475699..6d9dd22b99fc90b197189b4bae6a457ec52e17a9 100755 ---- a/target/linux/ath79/generic/base-files/etc/board.d/02_network -+++ b/target/linux/ath79/generic/base-files/etc/board.d/02_network -@@ -172,6 +172,7 @@ ath79_setup_interfaces() - comfast,cf-e120a-v3|\ - comfast,cf-e314n-v2|\ - compex,wpj531-16m|\ -+ openmesh,a40|\ - openmesh,a60|\ - openmesh,om2p-v4|\ - openmesh,om2p-hs-v4|\ -diff --git a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata -index 9e1f660cbcf47b1e6194fd10be051daba59b5fe3..69e643f735476d68947faf29d0dc4cdf0959950c 100644 ---- a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata -+++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata -@@ -100,6 +100,7 @@ case "$FIRMWARE" in - caldata_extract "art" 0x5000 0x844 - ath10k_patch_mac $(mtd_get_mac_binary art 0xc) - ;; -+ openmesh,a40|\ - openmesh,a60|\ - openmesh,mr1750-v1|\ - openmesh,mr1750-v2|\ -diff --git a/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh b/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh -index f7862bb032fbce56be77e9db8ae2e37bf5da30ea..e979c11bb91cb20fd4168b8921499f03572d3512 100644 ---- a/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh -+++ b/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh -@@ -65,6 +65,7 @@ platform_do_upgrade() { - jjplus,ja76pf2) - redboot_fis_do_upgrade "$1" linux - ;; -+ openmesh,a40|\ - openmesh,a60|\ - openmesh,mr600-v1|\ - openmesh,mr600-v2|\ -diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk -index ed13ad231736d5da1a412162892139193a9523ab..26b12945459c10fa5eb251509836e0c96a39d546 100644 ---- a/target/linux/ath79/image/generic.mk -+++ b/target/linux/ath79/image/generic.mk -@@ -1640,6 +1640,16 @@ define Device/openmesh_common_256k - openmesh-image ce_type=$$$$(OPENMESH_CE_TYPE) | append-metadata - endef - -+define Device/openmesh_a40 -+ $(Device/openmesh_common_64k) -+ SOC := qca9558 -+ DEVICE_MODEL := A40 -+ DEVICE_PACKAGES += kmod-ath10k-ct ath10k-firmware-qca988x-ct kmod-usb2 -+ OPENMESH_CE_TYPE := A60 -+ SUPPORTED_DEVICES += a40 -+endef -+TARGET_DEVICES += openmesh_a40 -+ - define Device/openmesh_a60 - $(Device/openmesh_common_64k) - SOC := qca9558 diff --git a/patches/openwrt/0007-ath79-Allow-to-set-spi-nor-mtd-name-via-devicetree.patch b/patches/openwrt/0007-ath79-Allow-to-set-spi-nor-mtd-name-via-devicetree.patch deleted file mode 100644 index 6507aa7f..00000000 --- a/patches/openwrt/0007-ath79-Allow-to-set-spi-nor-mtd-name-via-devicetree.patch +++ /dev/null @@ -1,135 +0,0 @@ -From: Sven Eckelmann -Date: Thu, 31 Dec 2020 00:25:10 +0100 -Subject: ath79: Allow to set spi-nor mtd name via devicetree - -On ar71xx, it was possible to overwrite the name of the spi-nor mtd device -identifier using the flash_platform_data which each mach-*.c could adjust -for its devices. A similar feature was introduced for mtd-physmap in -devicetree's. The property linux,mtd-name can be used to set the name and -provide a stable identifier for mtdpart from the bootloader. - -But this feature is not yet available upstream for spi-nor devices which -also might receive their partition layout from the bootloader. But the -OpenWrt pistachio support for this property can simply be imported into -ath79 to gain this support. - -Signed-off-by: Sven Eckelmann -(cherry picked from commit 7f074fe1a79f27d30560c35778d963bc520e9a3e) - -diff --git a/target/linux/ath79/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch b/target/linux/ath79/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch -new file mode 100644 -index 0000000000000000000000000000000000000000..af032df51e6dbc3824a45a8efaa1ce8db2261b2a ---- /dev/null -+++ b/target/linux/ath79/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch -@@ -0,0 +1,51 @@ -+From f32bc2aa01edcba2f2ed5db151cf183eac9ef919 Mon Sep 17 00:00:00 2001 -+From: Abhimanyu Vishwakarma -+Date: Sat, 25 Feb 2017 16:42:50 +0000 -+Subject: mtd: nor: support mtd name from device tree -+ -+Signed-off-by: Abhimanyu Vishwakarma -+ -+--- a/drivers/mtd/spi-nor/core.c -++++ b/drivers/mtd/spi-nor/core.c -+@@ -3088,6 +3088,7 @@ int spi_nor_scan(struct spi_nor *nor, const char *name, -+ struct device *dev = nor->dev; -+ struct mtd_info *mtd = &nor->mtd; -+ struct device_node *np = spi_nor_get_flash_node(nor); -++ const char __maybe_unused *of_mtd_name = NULL; -+ int ret; -+ int i; -+ -+@@ -3142,7 +3143,12 @@ int spi_nor_scan(struct spi_nor *nor, const char *name, -+ if (ret) -+ return ret; -+ -+- if (!mtd->name) -++#ifdef CONFIG_MTD_OF_PARTS -++ of_property_read_string(np, "linux,mtd-name", &of_mtd_name); -++#endif -++ if (of_mtd_name) -++ mtd->name = of_mtd_name; -++ else if (!mtd->name) -+ mtd->name = dev_name(dev); -+ mtd->priv = nor; -+ mtd->type = MTD_NORFLASH; -+--- a/drivers/mtd/mtdcore.c -++++ b/drivers/mtd/mtdcore.c -+@@ -762,6 +762,17 @@ int del_mtd_device(struct mtd_info *mtd) -+ */ -+ static void mtd_set_dev_defaults(struct mtd_info *mtd) -+ { -++#ifdef CONFIG_MTD_OF_PARTS -++ const char __maybe_unused *of_mtd_name = NULL; -++ struct device_node *np; -++ -++ np = mtd_get_of_node(mtd); -++ if (np && !mtd->name) { -++ of_property_read_string(np, "linux,mtd-name", &of_mtd_name); -++ if (of_mtd_name) -++ mtd->name = of_mtd_name; -++ } else -++#endif -+ if (mtd->dev.parent) { -+ if (!mtd->owner && mtd->dev.parent->driver) -+ mtd->owner = mtd->dev.parent->driver->owner; -diff --git a/target/linux/ath79/patches-5.4/401-mtd-nor-support-mtd-name-from-device-tree.patch b/target/linux/ath79/patches-5.4/401-mtd-nor-support-mtd-name-from-device-tree.patch -new file mode 100644 -index 0000000000000000000000000000000000000000..a02b632e8c48f4a2df7d66b732aa60dd6788b6b1 ---- /dev/null -+++ b/target/linux/ath79/patches-5.4/401-mtd-nor-support-mtd-name-from-device-tree.patch -@@ -0,0 +1,54 @@ -+From f32bc2aa01edcba2f2ed5db151cf183eac9ef919 Mon Sep 17 00:00:00 2001 -+From: Abhimanyu Vishwakarma -+Date: Sat, 25 Feb 2017 16:42:50 +0000 -+Subject: mtd: nor: support mtd name from device tree -+ -+Signed-off-by: Abhimanyu Vishwakarma -+--- -+ drivers/mtd/spi-nor/spi-nor.c | 8 +++++++- -+ 1 file changed, 7 insertions(+), 1 deletion(-) -+ -+--- a/drivers/mtd/spi-nor/spi-nor.c -++++ b/drivers/mtd/spi-nor/spi-nor.c -+@@ -4937,6 +4937,7 @@ int spi_nor_scan(struct spi_nor *nor, co -+ struct mtd_info *mtd = &nor->mtd; -+ struct device_node *np = spi_nor_get_flash_node(nor); -+ struct spi_nor_flash_parameter *params = &nor->params; -++ const char __maybe_unused *of_mtd_name = NULL; -+ int ret; -+ int i; -+ -+@@ -4999,7 +5000,12 @@ int spi_nor_scan(struct spi_nor *nor, co -+ /* Init flash parameters based on flash_info struct and SFDP */ -+ spi_nor_init_params(nor); -+ -+- if (!mtd->name) -++#ifdef CONFIG_MTD_OF_PARTS -++ of_property_read_string(np, "linux,mtd-name", &of_mtd_name); -++#endif -++ if (of_mtd_name) -++ mtd->name = of_mtd_name; -++ else if (!mtd->name) -+ mtd->name = dev_name(dev); -+ mtd->priv = nor; -+ mtd->type = MTD_NORFLASH; -+--- a/drivers/mtd/mtdcore.c -++++ b/drivers/mtd/mtdcore.c -+@@ -778,6 +778,17 @@ out_error: -+ */ -+ static void mtd_set_dev_defaults(struct mtd_info *mtd) -+ { -++#ifdef CONFIG_MTD_OF_PARTS -++ const char __maybe_unused *of_mtd_name = NULL; -++ struct device_node *np; -++ -++ np = mtd_get_of_node(mtd); -++ if (np && !mtd->name) { -++ of_property_read_string(np, "linux,mtd-name", &of_mtd_name); -++ if (of_mtd_name) -++ mtd->name = of_mtd_name; -++ } else -++#endif -+ if (mtd->dev.parent) { -+ if (!mtd->owner && mtd->dev.parent->driver) -+ mtd->owner = mtd->dev.parent->driver->owner; diff --git a/patches/openwrt/0008-ath79-Add-support-for-OpenMesh-OM2P-v1.patch b/patches/openwrt/0008-ath79-Add-support-for-OpenMesh-OM2P-v1.patch deleted file mode 100644 index a49f43a5..00000000 --- a/patches/openwrt/0008-ath79-Add-support-for-OpenMesh-OM2P-v1.patch +++ /dev/null @@ -1,316 +0,0 @@ -From: Sven Eckelmann -Date: Mon, 23 Nov 2020 13:41:34 +0100 -Subject: ath79: Add support for OpenMesh OM2P v1 - -Device specifications: -====================== - -* Qualcomm/Atheros AR7240 rev 2 -* 350/350/175 MHz (CPU/DDR/AHB) -* 32 MB of RAM -* 16 MB of SPI NOR flash - - 2x 7 MB available; but one of the 7 MB regions is the recovery image -* 2x 10/100 Mbps Ethernet -* 1T1R 2.4 GHz Wi-Fi -* 6x GPIO-LEDs (3x wifi, 2x ethernet, 1x power) -* 1x GPIO-button (reset) -* external h/w watchdog (enabled by default) -* TTL pins are on board (arrow points to VCC, then follows: GND, TX, RX) -* 2x fast ethernet - - eth0 - + 18-24V passive POE (mode B) - + used as WAN interface - - eth1 - + builtin switch port 4 - + used as LAN interface -* 12-24V 1A DC -* external antenna - -The device itself requires the mtdparts from the uboot arguments to -properly boot the flashed image and to support dual-boot (primary + -recovery image). Unfortunately, the name of the mtd device in mtdparts is -still using the legacy name "ar7240-nor0" which must be supplied using the -Linux-specfic DT parameter linux,mtd-name to overwrite the generic name -"spi0.0". - -Flashing instructions: -====================== - -Various methods can be used to install the actual image on the flash. -Two easy ones are: - -ap51-flash ----------- - -The tool ap51-flash (https://github.com/ap51-flash/ap51-flash) should be -used to transfer the image to the u-boot when the device boots up. - -initramfs from TFTP -------------------- - -The serial console must be used to access the u-boot shell during bootup. -It can then be used to first boot up the initramfs image from a TFTP server -(here with the IP 192.168.1.21): - - setenv serverip 192.168.1.21 - setenv ipaddr 192.168.1.1 - tftpboot 0c00000 .bin && bootm $fileaddr - -The actual sysupgrade image can then be transferred (on the LAN port) to the -device via - - scp .bin root@192.168.1.1:/tmp/ - -On the device, the sysupgrade must then be started using - - sysupgrade -n /tmp/.bin - -Signed-off-by: Sven Eckelmann -(cherry picked from commit 8143709c90c3aa0a84e14cf4a9dfbcb365b0d966) - -diff --git a/package/boot/uboot-envtools/files/ath79 b/package/boot/uboot-envtools/files/ath79 -index e75edff16eb40c7950cfed7767144becae6b67b1..9782274868ad4d015e6fb90114750a734f55b379 100644 ---- a/package/boot/uboot-envtools/files/ath79 -+++ b/package/boot/uboot-envtools/files/ath79 -@@ -97,6 +97,7 @@ netgear,wndr4300tn|\ - netgear,wndr4300sw) - ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x40000" "0x20000" - ;; -+openmesh,om2p-v1|\ - openmesh,om2p-v2|\ - openmesh,om2p-v4|\ - openmesh,om2p-hs-v1|\ -diff --git a/target/linux/ath79/dts/ar7240_openmesh_om2p-v1.dts b/target/linux/ath79/dts/ar7240_openmesh_om2p-v1.dts -new file mode 100644 -index 0000000000000000000000000000000000000000..24d406f7ecd2e14729587190de1aecf71029a1eb ---- /dev/null -+++ b/target/linux/ath79/dts/ar7240_openmesh_om2p-v1.dts -@@ -0,0 +1,154 @@ -+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT -+ -+#include "ar7240.dtsi" -+ -+#include -+#include -+ -+/ { -+ compatible = "openmesh,om2p-v1", "qca,ar7240"; -+ model = "OpenMesh OM2P v1"; -+ -+ chosen { -+ /delete-property/ bootargs; -+ }; -+ -+ aliases { -+ led-boot = &led_power_blue; -+ led-failsafe = &led_power_blue; -+ led-running = &led_power_blue; -+ led-upgrade = &led_power_blue; -+ label-mac-device = ð0; -+ }; -+ -+ keys { -+ compatible = "gpio-keys"; -+ -+ reset { -+ label = "reset"; -+ linux,code = ; -+ gpios = <&gpio 1 GPIO_ACTIVE_LOW>; -+ }; -+ }; -+ -+ leds { -+ compatible = "gpio-leds"; -+ -+ pinctrl-names = "default"; -+ pinctrl-0 = <&switch_led_disable_pins>; -+ -+ led_power_blue: power_blue { -+ label = "blue:power"; -+ gpios = <&gpio 0 GPIO_ACTIVE_LOW>; -+ default-state = "on"; -+ }; -+ -+ wifi_green { -+ label = "green:wifi"; -+ gpios = <&gpio 13 GPIO_ACTIVE_LOW>; -+ linux,default-trigger = "phy0tpt"; -+ }; -+ -+ wifi_red { -+ label = "red:wifi"; -+ gpios = <&gpio 14 GPIO_ACTIVE_LOW>; -+ }; -+ -+ wifi_yellow { -+ label = "yellow:wifi"; -+ gpios = <&gpio 15 GPIO_ACTIVE_LOW>; -+ }; -+ -+ lan_blue { -+ label = "blue:lan"; -+ gpios = <&gpio 16 GPIO_ACTIVE_LOW>; -+ }; -+ -+ wan_blue { -+ label = "blue:wan"; -+ gpios = <&gpio 17 GPIO_ACTIVE_LOW>; -+ }; -+ }; -+ -+ watchdog { -+ compatible = "linux,wdt-gpio"; -+ gpios = <&gpio 12 GPIO_ACTIVE_LOW>; -+ hw_algo = "toggle"; -+ /* hw_margin_ms is actually 300s but driver limits it to 60s */ -+ hw_margin_ms = <60000>; -+ always-running; -+ }; -+}; -+ -+&spi { -+ status = "okay"; -+ -+ flash@0 { -+ compatible = "jedec,spi-nor"; -+ reg = <0>; -+ spi-max-frequency = <40000000>; -+ linux,mtd-name = "ar7240-nor0"; -+ -+ /* partitions are passed via bootloader */ -+ partitions { -+ compatible = "fixed-partitions"; -+ #address-cells = <1>; -+ #size-cells = <1>; -+ -+ partition@0 { -+ label = "u-boot"; -+ reg = <0x000000 0x040000>; -+ read-only; -+ }; -+ -+ partition@40000 { -+ label = "u-boot-env"; -+ reg = <0x040000 0x040000>; -+ }; -+ -+ partition@80000 { -+ label = "custom"; -+ reg = <0x080000 0x140000>; -+ read-only; -+ }; -+ -+ partition@1c0000 { -+ label = "inactive"; -+ reg = <0x1c0000 0x700000>; -+ }; -+ -+ partition@8c0000 { -+ label = "inactive2"; -+ reg = <0x8c0000 0x700000>; -+ }; -+ -+ art: partition@fc0000 { -+ label = "ART"; -+ reg = <0xfc0000 0x040000>; -+ read-only; -+ }; -+ }; -+ }; -+}; -+ -+ð0 { -+ mtd-mac-address = <&art 0x0>; -+}; -+ -+ð1 { -+ status = "okay"; -+ -+ mtd-mac-address = <&art 0x6>; -+}; -+ -+&pcie { -+ status = "okay"; -+ -+ wifi@0,0 { -+ compatible = "pci168c,002a"; -+ reg = <0x0000 0 0 0 0>; -+ qca,no-eeprom; -+ #gpio-cells = <2>; -+ gpio-controller; -+ }; -+}; -diff --git a/target/linux/ath79/generic/base-files/etc/board.d/01_leds b/target/linux/ath79/generic/base-files/etc/board.d/01_leds -index 146470855d4ca04258d69e33933730f526e39e44..4b97b2f7f41a181753100c6c1a3ba9c7f63528ad 100755 ---- a/target/linux/ath79/generic/base-files/etc/board.d/01_leds -+++ b/target/linux/ath79/generic/base-files/etc/board.d/01_leds -@@ -254,6 +254,10 @@ openmesh,om2p-hs-v4) - ucidef_set_led_netdev "wan" "WAN" "blue:wan" "eth0" - ucidef_set_led_switch "lan" "LAN" "blue:lan" "switch0" "0x02" - ;; -+openmesh,om2p-v1) -+ ucidef_set_led_netdev "wan" "WAN" "blue:wan" "eth0" -+ ucidef_set_led_switch "lan" "LAN" "blue:lan" "switch0" "0x10" -+ ;; - pcs,cr3000) - ucidef_set_led_netdev "wan" "WAN" "blue:wan" "eth1" - ucidef_set_led_switch "lan1" "LAN1" "blue:lan1" "switch0" "0x04" -diff --git a/target/linux/ath79/generic/base-files/etc/board.d/02_network b/target/linux/ath79/generic/base-files/etc/board.d/02_network -index 6d9dd22b99fc90b197189b4bae6a457ec52e17a9..2d2990fb9f0127d5ac2de10b1371af7bcf86d320 100755 ---- a/target/linux/ath79/generic/base-files/etc/board.d/02_network -+++ b/target/linux/ath79/generic/base-files/etc/board.d/02_network -@@ -174,6 +174,7 @@ ath79_setup_interfaces() - compex,wpj531-16m|\ - openmesh,a40|\ - openmesh,a60|\ -+ openmesh,om2p-v1|\ - openmesh,om2p-v4|\ - openmesh,om2p-hs-v4|\ - plasmacloud,pa300|\ -diff --git a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom -index 08d9e017a734e29c9b3be4c865e32f109847b4f5..cf07f138260170bcac789e617e09978776b3d2c5 100644 ---- a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom -+++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom -@@ -128,6 +128,9 @@ case "$FIRMWARE" in - openmesh,mr600-v2) - caldata_extract "ART" 0x5000 0x440 - ;; -+ openmesh,om2p-v1) -+ caldata_extract "ART" 0x1000 0x440 -+ ;; - wd,mynet-n750) - caldata_extract "art" 0x5000 0x440 - ath9k_patch_mac $(mtd_get_mac_ascii devdata "wlan5mac") -diff --git a/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh b/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh -index e979c11bb91cb20fd4168b8921499f03572d3512..e9203f3a5b624e1e9b46c474e95e27583bcb6765 100644 ---- a/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh -+++ b/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh -@@ -73,6 +73,7 @@ platform_do_upgrade() { - openmesh,mr900-v2|\ - openmesh,mr1750-v1|\ - openmesh,mr1750-v2|\ -+ openmesh,om2p-v1|\ - openmesh,om2p-v2|\ - openmesh,om2p-v4|\ - openmesh,om2p-hs-v1|\ -diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk -index 26b12945459c10fa5eb251509836e0c96a39d546..ca3400e0387581cb20e6402ad63612397a3b8791 100644 ---- a/target/linux/ath79/image/generic.mk -+++ b/target/linux/ath79/image/generic.mk -@@ -1722,6 +1722,16 @@ define Device/openmesh_mr1750-v2 - endef - TARGET_DEVICES += openmesh_mr1750-v2 - -+define Device/openmesh_om2p-v1 -+ $(Device/openmesh_common_256k) -+ SOC := ar7240 -+ DEVICE_MODEL := OM2P -+ DEVICE_VARIANT := v1 -+ OPENMESH_CE_TYPE := OM2P -+ SUPPORTED_DEVICES += om2p -+endef -+TARGET_DEVICES += openmesh_om2p-v1 -+ - define Device/openmesh_om2p-v2 - $(Device/openmesh_common_256k) - SOC := ar9330 diff --git a/patches/openwrt/0009-ath79-Add-support-for-OpenMesh-OM5P-AC-v1.patch b/patches/openwrt/0009-ath79-Add-support-for-OpenMesh-OM5P-AC-v1.patch deleted file mode 100644 index 3d7ecec2..00000000 --- a/patches/openwrt/0009-ath79-Add-support-for-OpenMesh-OM5P-AC-v1.patch +++ /dev/null @@ -1,348 +0,0 @@ -From: Sven Eckelmann -Date: Mon, 23 Nov 2020 13:41:34 +0100 -Subject: ath79: Add support for OpenMesh OM5P-AC v1 - -Device specifications: -====================== - -* Qualcomm/Atheros QCA9558 ver 1 rev 0 -* 720/600/240 MHz (CPU/DDR/AHB) -* 128 MB of RAM -* 16 MB of SPI NOR flash - - 2x 7 MB available; but one of the 7 MB regions is the recovery image -* 2T2R 2.4 GHz Wi-Fi (11n) -* 2T2R 5 GHz Wi-Fi (11ac) -* 6x GPIO-LEDs (3x wifi, 2x ethernet, 1x power) -* external h/w watchdog (enabled by default)) -* TTL pins are on board (arrow points to VCC, then follows: GND, TX, RX) -* TI tmp423 (package kmod-hwmon-tmp421) for temperature monitoring -* 2x ethernet - - eth0 - + AR8035 ethernet PHY (RGMII) - + 10/100/1000 Mbps Ethernet - + 802.3af POE - + used as LAN interface - - eth1 - + AR8035 ethernet PHY (SGMII) - + 10/100/1000 Mbps Ethernet - + 18-24V passive POE (mode B) - + used as WAN interface -* 12-24V 1A DC -* internal antennas - -Flashing instructions: -====================== - -Various methods can be used to install the actual image on the flash. -Two easy ones are: - -ap51-flash ----------- - -The tool ap51-flash (https://github.com/ap51-flash/ap51-flash) should be -used to transfer the image to the u-boot when the device boots up. - -initramfs from TFTP -------------------- - -The serial console must be used to access the u-boot shell during bootup. -It can then be used to first boot up the initramfs image from a TFTP server -(here with the IP 192.168.1.21): - - setenv serverip 192.168.1.21 - setenv ipaddr 192.168.1.1 - tftpboot 0c00000 .bin && bootm $fileaddr - -The actual sysupgrade image can then be transferred (on the LAN port) to the -device via - - scp .bin root@192.168.1.1:/tmp/ - -On the device, the sysupgrade must then be started using - - sysupgrade -n /tmp/.bin - -Signed-off-by: Sven Eckelmann -(cherry picked from commit 97f561725962ddb8823b2e01563a0f37f7930477) - -diff --git a/package/boot/uboot-envtools/files/ath79 b/package/boot/uboot-envtools/files/ath79 -index 9782274868ad4d015e6fb90114750a734f55b379..0fe6d046c35a09d8b61974c92ffbc6568e74faf1 100644 ---- a/package/boot/uboot-envtools/files/ath79 -+++ b/package/boot/uboot-envtools/files/ath79 -@@ -58,6 +58,7 @@ openmesh,mr900-v2|\ - openmesh,mr1750-v1|\ - openmesh,mr1750-v2|\ - openmesh,om5p|\ -+openmesh,om5p-ac-v1|\ - openmesh,om5p-ac-v2|\ - samsung,wam250|\ - ubnt,nanostation-m|\ -diff --git a/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v1.dts b/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v1.dts -new file mode 100644 -index 0000000000000000000000000000000000000000..ae69992abf583168a0ab9a017a9aee33758dd4d8 ---- /dev/null -+++ b/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v1.dts -@@ -0,0 +1,199 @@ -+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT -+ -+#include "qca955x.dtsi" -+ -+#include -+#include -+ -+/ { -+ compatible = "openmesh,om5p-ac-v1", "qca,qca9558"; -+ model = "OpenMesh OM5P-AC v1"; -+ -+ chosen { -+ /delete-property/ bootargs; -+ }; -+ -+ aliases { -+ serial0 = &uart; -+ led-boot = &led_power_blue; -+ led-failsafe = &led_power_blue; -+ led-running = &led_power_blue; -+ led-upgrade = &led_power_blue; -+ label-mac-device = ð0; -+ }; -+ -+ leds { -+ compatible = "gpio-leds"; -+ -+ led_power_blue: power_blue { -+ label = "blue:power"; -+ gpios = <&gpio 18 GPIO_ACTIVE_LOW>; -+ default-state = "on"; -+ }; -+ -+ wan_blue { -+ label = "blue:wan"; -+ gpios = <&gpio 19 GPIO_ACTIVE_LOW>; -+ }; -+ -+ lan_blue { -+ label = "blue:lan"; -+ gpios = <&gpio 20 GPIO_ACTIVE_LOW>; -+ }; -+ -+ wifi_green { -+ label = "green:wifi"; -+ gpios = <&gpio 21 GPIO_ACTIVE_LOW>; -+ linux,default-trigger = "phy0tpt"; -+ }; -+ -+ wifi_yellow { -+ label = "yellow:wifi"; -+ gpios = <&gpio 22 GPIO_ACTIVE_LOW>; -+ }; -+ -+ wifi_red { -+ label = "red:wifi"; -+ gpios = <&gpio 23 GPIO_ACTIVE_LOW>; -+ }; -+ }; -+ -+ i2c { -+ compatible = "i2c-gpio"; -+ gpios = <&gpio 11 GPIO_ACTIVE_HIGH /* sda */ -+ &gpio 12 GPIO_ACTIVE_HIGH /* scl */ -+ >; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ i2c-gpio,scl-open-drain; -+ i2c-gpio,sda-open-drain; -+ -+ tmp423a@4c { -+ compatible = "ti,tmp423"; -+ reg = <0x4c>; -+ }; -+ }; -+ -+ watchdog { -+ compatible = "linux,wdt-gpio"; -+ gpios = <&gpio 17 GPIO_ACTIVE_LOW>; -+ hw_algo = "toggle"; -+ /* hw_margin_ms is actually 300s but driver limits it to 60s */ -+ hw_margin_ms = <60000>; -+ always-running; -+ }; -+}; -+ -+&spi { -+ status = "okay"; -+ -+ flash@0 { -+ compatible = "jedec,spi-nor"; -+ reg = <0>; -+ spi-max-frequency = <40000000>; -+ -+ /* partitions are passed via bootloader */ -+ partitions { -+ compatible = "fixed-partitions"; -+ #address-cells = <1>; -+ #size-cells = <1>; -+ -+ partition@0 { -+ label = "u-boot"; -+ reg = <0x000000 0x040000>; -+ read-only; -+ }; -+ -+ partition@40000 { -+ label = "u-boot-env"; -+ reg = <0x040000 0x010000>; -+ }; -+ -+ partition@50000 { -+ label = "custom"; -+ reg = <0x050000 0x060000>; -+ read-only; -+ }; -+ -+ partition@b0000 { -+ label = "inactive"; -+ reg = <0x0b0000 0x7a0000>; -+ }; -+ -+ partition@850000 { -+ label = "inactive2"; -+ reg = <0x850000 0x7a0000>; -+ }; -+ -+ art: partition@ff0000 { -+ label = "ART"; -+ reg = <0xff0000 0x010000>; -+ read-only; -+ }; -+ }; -+ }; -+}; -+ -+&mdio0 { -+ status = "okay"; -+ -+ phy-mask = <0x6>; -+ -+ phy1: ethernet-phy@1 { -+ reg = <1>; -+ eee-broken-100tx; -+ eee-broken-1000t; -+ }; -+ -+ phy2: ethernet-phy@2 { -+ reg = <2>; -+ eee-broken-100tx; -+ eee-broken-1000t; -+ at803x-override-sgmii-link-check; -+ }; -+}; -+ -+ð0 { -+ status = "okay"; -+ -+ pll-data = <0x82000101 0x80000101 0x80001313>; -+ -+ mtd-mac-address = <&art 0x0>; -+ -+ phy-mode = "rgmii-id"; -+ phy-handle = <&phy1>; -+ -+ gmac-config { -+ device = <&gmac>; -+ rgmii-enabled = <1>; -+ rxd-delay = <3>; -+ rxdv-delay = <3>; -+ txd-delay = <0>; -+ txen-delay = <0>; -+ }; -+}; -+ -+ð1 { -+ status = "okay"; -+ -+ pll-data = <0x03000101 0x80000101 0x80001313>; -+ -+ mtd-mac-address = <&art 0x6>; -+ -+ qca955x-sgmii-fixup; -+ -+ phy-handle = <&phy2>; -+}; -+ -+&wmac { -+ status = "okay"; -+ -+ mtd-cal-data = <&art 0x1000>; -+ mtd-mac-address = <&art 0x0>; -+ mac-address-increment = <2>; -+}; -+ -+&pcie1 { -+ status = "okay"; -+}; -diff --git a/target/linux/ath79/generic/base-files/etc/board.d/01_leds b/target/linux/ath79/generic/base-files/etc/board.d/01_leds -index 4b97b2f7f41a181753100c6c1a3ba9c7f63528ad..0f37e086b336af07abffb62ec3c4d47ca412ec3e 100755 ---- a/target/linux/ath79/generic/base-files/etc/board.d/01_leds -+++ b/target/linux/ath79/generic/base-files/etc/board.d/01_leds -@@ -258,6 +258,10 @@ openmesh,om2p-v1) - ucidef_set_led_netdev "wan" "WAN" "blue:wan" "eth0" - ucidef_set_led_switch "lan" "LAN" "blue:lan" "switch0" "0x10" - ;; -+openmesh,om5p-ac-v1) -+ ucidef_set_led_netdev "lan" "LAN" "blue:lan" "eth0" -+ ucidef_set_led_netdev "wan" "WAN" "blue:wan" "eth1" -+ ;; - pcs,cr3000) - ucidef_set_led_netdev "wan" "WAN" "blue:wan" "eth1" - ucidef_set_led_switch "lan1" "LAN1" "blue:lan1" "switch0" "0x04" -diff --git a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata -index 69e643f735476d68947faf29d0dc4cdf0959950c..9a413d8cf4231d7c71048f585c4aa69d2801c4f4 100644 ---- a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata -+++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata -@@ -159,6 +159,10 @@ case "$FIRMWARE" in - ;; - "ath10k/cal-pci-0000:01:00.0.bin") - case $board in -+ openmesh,om5p-ac-v1) -+ caldata_extract "ART" 0x5000 0x844 -+ ath10k_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) +16) -+ ;; - sitecom,wlr-8100) - caldata_extract "art" 0x5000 0x844 - ath10k_patch_mac $(macaddr_add $(mtd_get_mac_ascii u-boot-env ethaddr) +1) -diff --git a/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh b/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh -index e9203f3a5b624e1e9b46c474e95e27583bcb6765..2cac42c9feaed3c0360091a5b7959e741d4a0473 100644 ---- a/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh -+++ b/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh -@@ -82,6 +82,7 @@ platform_do_upgrade() { - openmesh,om2p-hs-v4|\ - openmesh,om2p-lc|\ - openmesh,om5p|\ -+ openmesh,om5p-ac-v1|\ - openmesh,om5p-ac-v2) - PART_NAME="inactive" - platform_do_upgrade_openmesh "$1" -diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk -index ca3400e0387581cb20e6402ad63612397a3b8791..54a2ec13692ae24244d95b79e35cdf8fb70fbc53 100644 ---- a/target/linux/ath79/image/generic.mk -+++ b/target/linux/ath79/image/generic.mk -@@ -1810,6 +1810,17 @@ define Device/openmesh_om5p - endef - TARGET_DEVICES += openmesh_om5p - -+define Device/openmesh_om5p-ac-v1 -+ $(Device/openmesh_common_64k) -+ SOC := qca9558 -+ DEVICE_MODEL := OM5P-AC -+ DEVICE_VARIANT := v1 -+ DEVICE_PACKAGES += kmod-ath10k-ct ath10k-firmware-qca988x-ct -+ OPENMESH_CE_TYPE := OM5PAC -+ SUPPORTED_DEVICES += om5p-ac -+endef -+TARGET_DEVICES += openmesh_om5p-ac-v1 -+ - define Device/openmesh_om5p-ac-v2 - $(Device/openmesh_common_64k) - SOC := qca9558 diff --git a/patches/openwrt/0010-ath79-Add-support-for-OpenMesh-OM5P-AN.patch b/patches/openwrt/0010-ath79-Add-support-for-OpenMesh-OM5P-AN.patch deleted file mode 100644 index 23c83751..00000000 --- a/patches/openwrt/0010-ath79-Add-support-for-OpenMesh-OM5P-AN.patch +++ /dev/null @@ -1,365 +0,0 @@ -From: Sven Eckelmann -Date: Mon, 23 Nov 2020 13:41:34 +0100 -Subject: ath79: Add support for OpenMesh OM5P-AN - -Device specifications: -====================== - -* Qualcomm/Atheros AR9344 rev 2 -* 560/450/225 MHz (CPU/DDR/AHB) -* 64 MB of RAM -* 16 MB of SPI NOR flash - - 2x 7 MB available; but one of the 7 MB regions is the recovery image -* 1T1R 2.4 GHz Wi-Fi -* 2T2R 5 GHz Wi-Fi -* 6x GPIO-LEDs (3x wifi, 2x ethernet, 1x power) -* 1x GPIO-button (reset) -* external h/w watchdog (enabled by default) -* TTL pins are on board (arrow points to VCC, then follows: GND, TX, RX) -* TI tmp423 (package kmod-hwmon-tmp421) for temperature monitoring -* 2x ethernet - - eth0 - + AR8035 ethernet PHY - + 10/100/1000 Mbps Ethernet - + 802.3af POE - + used as LAN interface - - eth1 - + 10/100 Mbps Ethernet - + builtin switch port 1 - + 18-24V passive POE (mode B) - + used as WAN interface -* 12-24V 1A DC -* internal antennas - -Flashing instructions: -====================== - -Various methods can be used to install the actual image on the flash. -Two easy ones are: - -ap51-flash ----------- - -The tool ap51-flash (https://github.com/ap51-flash/ap51-flash) should be -used to transfer the image to the u-boot when the device boots up. - -initramfs from TFTP -------------------- - -The serial console must be used to access the u-boot shell during bootup. -It can then be used to first boot up the initramfs image from a TFTP server -(here with the IP 192.168.1.21): - - setenv serverip 192.168.1.21 - setenv ipaddr 192.168.1.1 - tftpboot 0c00000 .bin && bootm $fileaddr - -The actual sysupgrade image can then be transferred (on the LAN port) to the -device via - - scp .bin root@192.168.1.1:/tmp/ - -On the device, the sysupgrade must then be started using - - sysupgrade -n /tmp/.bin - -Signed-off-by: Sven Eckelmann -(cherry picked from commit 72ef5945508193228544bcd7fcfe81b32e8dc042) - -diff --git a/package/boot/uboot-envtools/files/ath79 b/package/boot/uboot-envtools/files/ath79 -index 0fe6d046c35a09d8b61974c92ffbc6568e74faf1..739b595a61000273e40c3cab410ea398f7d5db00 100644 ---- a/package/boot/uboot-envtools/files/ath79 -+++ b/package/boot/uboot-envtools/files/ath79 -@@ -58,6 +58,7 @@ openmesh,mr900-v2|\ - openmesh,mr1750-v1|\ - openmesh,mr1750-v2|\ - openmesh,om5p|\ -+openmesh,om5p-an|\ - openmesh,om5p-ac-v1|\ - openmesh,om5p-ac-v2|\ - samsung,wam250|\ -diff --git a/target/linux/ath79/dts/ar9344_openmesh_om5p-an.dts b/target/linux/ath79/dts/ar9344_openmesh_om5p-an.dts -new file mode 100644 -index 0000000000000000000000000000000000000000..6950ba3a2936cf8c9b12a22c966dc3b9215f2227 ---- /dev/null -+++ b/target/linux/ath79/dts/ar9344_openmesh_om5p-an.dts -@@ -0,0 +1,216 @@ -+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT -+ -+#include "ar9344.dtsi" -+ -+#include -+#include -+ -+/ { -+ compatible = "openmesh,om5p-an", "qca,ar9344"; -+ model = "OpenMesh OM5P-AN"; -+ -+ chosen { -+ /delete-property/ bootargs; -+ }; -+ -+ aliases { -+ led-boot = &led_power_blue; -+ led-failsafe = &led_power_blue; -+ led-running = &led_power_blue; -+ led-upgrade = &led_power_blue; -+ label-mac-device = ð0; -+ }; -+ -+ keys { -+ compatible = "gpio-keys"; -+ -+ reset { -+ label = "reset"; -+ linux,code = ; -+ gpios = <&gpio 4 GPIO_ACTIVE_LOW>; -+ }; -+ }; -+ -+ leds { -+ compatible = "gpio-leds"; -+ -+ pinctrl-names = "default"; -+ pinctrl-0 = <&led_lan_wan_blue_pin>; -+ -+ led_power_blue: power_blue { -+ label = "blue:power"; -+ gpios = <&gpio 13 GPIO_ACTIVE_LOW>; -+ default-state = "on"; -+ }; -+ -+ wan_blue { -+ label = "blue:wan"; -+ gpios = <&gpio 14 GPIO_ACTIVE_LOW>; -+ }; -+ -+ lan_blue { -+ label = "blue:lan"; -+ gpios = <&gpio 15 GPIO_ACTIVE_LOW>; -+ }; -+ -+ wifi_green { -+ label = "green:wifi"; -+ gpios = <&gpio 16 GPIO_ACTIVE_LOW>; -+ linux,default-trigger = "phy0tpt"; -+ }; -+ -+ wifi_yellow { -+ label = "yellow:wifi"; -+ gpios = <&gpio 17 GPIO_ACTIVE_LOW>; -+ }; -+ -+ wifi_red { -+ label = "red:wifi"; -+ gpios = <&gpio 19 GPIO_ACTIVE_LOW>; -+ }; -+ }; -+ -+ i2c { -+ compatible = "i2c-gpio"; -+ gpios = <&gpio 21 GPIO_ACTIVE_HIGH /* sda */ -+ &gpio 20 GPIO_ACTIVE_HIGH /* scl */ -+ >; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ i2c-gpio,scl-open-drain; -+ i2c-gpio,sda-open-drain; -+ -+ tmp423a@4c { -+ compatible = "ti,tmp423"; -+ reg = <0x4c>; -+ }; -+ }; -+ -+ watchdog { -+ compatible = "linux,wdt-gpio"; -+ gpios = <&gpio 11 GPIO_ACTIVE_LOW>; -+ hw_algo = "toggle"; -+ /* hw_margin_ms is actually 300s but driver limits it to 60s */ -+ hw_margin_ms = <60000>; -+ always-running; -+ }; -+}; -+ -+&ref { -+ clock-frequency = <40000000>; -+}; -+ -+&pinmux { -+ led_lan_wan_blue_pin: pinmux_lan_wan_blue_pin { -+ pinctrl-single,bits = <0xc 0x0 0xffff0000>; -+ }; -+}; -+ -+&spi { -+ status = "okay"; -+ -+ flash@0 { -+ compatible = "jedec,spi-nor"; -+ reg = <0>; -+ spi-max-frequency = <40000000>; -+ -+ /* partitions are passed via bootloader */ -+ partitions { -+ compatible = "fixed-partitions"; -+ #address-cells = <1>; -+ #size-cells = <1>; -+ -+ partition@0 { -+ label = "u-boot"; -+ reg = <0x000000 0x040000>; -+ read-only; -+ }; -+ -+ partition@40000 { -+ label = "u-boot-env"; -+ reg = <0x040000 0x010000>; -+ }; -+ -+ partition@50000 { -+ label = "custom"; -+ reg = <0x050000 0x060000>; -+ read-only; -+ }; -+ -+ partition@b0000 { -+ label = "inactive"; -+ reg = <0x0b0000 0x7a0000>; -+ }; -+ -+ partition@850000 { -+ label = "inactive2"; -+ reg = <0x850000 0x7a0000>; -+ }; -+ -+ art: partition@ff0000 { -+ label = "ART"; -+ reg = <0xff0000 0x010000>; -+ read-only; -+ }; -+ }; -+ }; -+}; -+ -+&mdio0 { -+ status = "okay"; -+ -+ phy-mask = <0x80>; -+ -+ phy7: ethernet-phy@7 { -+ reg = <7>; -+ eee-broken-100tx; -+ eee-broken-1000t; -+ }; -+}; -+ -+ð0 { -+ status = "okay"; -+ -+ pll-data = <0x02000000 0x00000101 0x00001313>; -+ -+ mtd-mac-address = <&art 0x0>; -+ -+ phy-mode = "rgmii-id"; -+ phy-handle = <&phy7>; -+ -+ gmac-config { -+ device = <&gmac>; -+ rgmii-gmac0 = <1>; -+ rxd-delay = <2>; -+ rxdv-delay = <2>; -+ switch-phy-swap = <1>; -+ }; -+}; -+ -+ð1 { -+ status = "okay"; -+ -+ mtd-mac-address = <&art 0x0>; -+ mac-address-increment = <1>; -+}; -+ -+&wmac { -+ status = "okay"; -+ -+ mtd-cal-data = <&art 0x1000>; -+ mtd-mac-address = <&art 0x0>; -+ mac-address-increment = <2>; -+}; -+ -+&pcie { -+ status = "okay"; -+ -+ wifi@0,0 { -+ compatible = "pci168c,0030"; -+ reg = <0x0000 0 0 0 0>; -+ qca,no-eeprom; -+ mtd-mac-address = <&art 0x0>; -+ mac-address-increment = <16>; -+ }; -+}; -diff --git a/target/linux/ath79/generic/base-files/etc/board.d/01_leds b/target/linux/ath79/generic/base-files/etc/board.d/01_leds -index 0f37e086b336af07abffb62ec3c4d47ca412ec3e..236703b7d958d13136a0be3744cd35a65adcfda1 100755 ---- a/target/linux/ath79/generic/base-files/etc/board.d/01_leds -+++ b/target/linux/ath79/generic/base-files/etc/board.d/01_leds -@@ -262,6 +262,10 @@ openmesh,om5p-ac-v1) - ucidef_set_led_netdev "lan" "LAN" "blue:lan" "eth0" - ucidef_set_led_netdev "wan" "WAN" "blue:wan" "eth1" - ;; -+openmesh,om5p-an) -+ ucidef_set_led_netdev "lan" "LAN" "blue:lan" "eth0" -+ ucidef_set_led_switch "wan" "WAN" "blue:wan" "switch0" "0x02" -+ ;; - pcs,cr3000) - ucidef_set_led_netdev "wan" "WAN" "blue:wan" "eth1" - ucidef_set_led_switch "lan1" "LAN1" "blue:lan1" "switch0" "0x04" -diff --git a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom -index cf07f138260170bcac789e617e09978776b3d2c5..fbce7d672b2306094544aacf527257e7e6a6ba8c 100644 ---- a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom -+++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom -@@ -125,7 +125,8 @@ case "$FIRMWARE" in - caldata_extract "art" 0x1000 0x1000 - ;; - openmesh,mr600-v1|\ -- openmesh,mr600-v2) -+ openmesh,mr600-v2|\ -+ openmesh,om5p-an) - caldata_extract "ART" 0x5000 0x440 - ;; - openmesh,om2p-v1) -diff --git a/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh b/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh -index 2cac42c9feaed3c0360091a5b7959e741d4a0473..67e53c5fdebf29e71b920753be829fa4e41ca207 100644 ---- a/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh -+++ b/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh -@@ -83,7 +83,8 @@ platform_do_upgrade() { - openmesh,om2p-lc|\ - openmesh,om5p|\ - openmesh,om5p-ac-v1|\ -- openmesh,om5p-ac-v2) -+ openmesh,om5p-ac-v2|\ -+ openmesh,om5p-an) - PART_NAME="inactive" - platform_do_upgrade_openmesh "$1" - ;; -diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk -index 54a2ec13692ae24244d95b79e35cdf8fb70fbc53..4d6647f8c56a4bc14a641d8bab4a70c3e895efbd 100644 ---- a/target/linux/ath79/image/generic.mk -+++ b/target/linux/ath79/image/generic.mk -@@ -1832,6 +1832,15 @@ define Device/openmesh_om5p-ac-v2 - endef - TARGET_DEVICES += openmesh_om5p-ac-v2 - -+define Device/openmesh_om5p-an -+ $(Device/openmesh_common_64k) -+ SOC := ar9344 -+ DEVICE_MODEL := OM5P-AN -+ OPENMESH_CE_TYPE := OM5P -+ SUPPORTED_DEVICES += om5p-an -+endef -+TARGET_DEVICES += openmesh_om5p-an -+ - define Device/pcs_cap324 - SOC := ar9344 - DEVICE_VENDOR := PowerCloud Systems diff --git a/patches/packages/packages/0001-perl-don-t-build-in-parallel-and-bump-release.patch b/patches/packages/packages/0001-perl-don-t-build-in-parallel-and-bump-release.patch index 52eeb6c9..35c03582 100644 --- a/patches/packages/packages/0001-perl-don-t-build-in-parallel-and-bump-release.patch +++ b/patches/packages/packages/0001-perl-don-t-build-in-parallel-and-bump-release.patch @@ -8,7 +8,7 @@ https://github.com/openwrt/packages/issues/8238 https://github.com/openwrt/packages/pull/17274 diff --git a/lang/perl/Makefile b/lang/perl/Makefile -index 443164f0a4a6a1c9fa189bf9c3c033d70db30ca0..121a3bfe653f46ecac7d10b1f3ae480fcd02f155 100644 +index 99302cb1a4414c309b238342d3f1b8bc7f43dd47..66c6ce7aaf342e404b8d9a133a7e396d0108a31f 100644 --- a/lang/perl/Makefile +++ b/lang/perl/Makefile @@ -34,8 +34,8 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/perl/$(PKG_NAME)-$(PKG_VERSION) diff --git a/patches/packages/packages/0002-fastd-simplify-Config.in.patch b/patches/packages/packages/0002-fastd-simplify-Config.in.patch deleted file mode 100644 index 973342cf..00000000 --- a/patches/packages/packages/0002-fastd-simplify-Config.in.patch +++ /dev/null @@ -1,124 +0,0 @@ -From: Matthias Schiffer -Date: Sun, 7 Mar 2021 11:48:32 +0100 -Subject: fastd: simplify Config.in - -Signed-off-by: Matthias Schiffer -(cherry picked from commit 45976ff31a9894dec35fc4a077c9652f6cb59a54) - -diff --git a/net/fastd/Config.in b/net/fastd/Config.in -index 8302f7ee4dac874b1303ebeeb836551ef202c261..89ff6850aa5ab4ad0e762d8fb9473d5e5c820089 100644 ---- a/net/fastd/Config.in -+++ b/net/fastd/Config.in -@@ -1,102 +1,79 @@ -+if PACKAGE_fastd -+ - menu "Configuration" -- depends on PACKAGE_fastd - - config FASTD_ENABLE_METHOD_CIPHER_TEST - bool "Enable cipher-test method provider" -- depends on PACKAGE_fastd -- default n - - config FASTD_ENABLE_METHOD_COMPOSED_GMAC - bool "Enable composed-gmac method provider" -- depends on PACKAGE_fastd -+ select FASTD_ENABLE_MAC_GHASH - default y - - config FASTD_ENABLE_METHOD_COMPOSED_UMAC - bool "Enable composed-umac method provider" -- depends on PACKAGE_fastd -+ select FASTD_ENABLE_MAC_UHASH - default y - - config FASTD_ENABLE_METHOD_GENERIC_GMAC - bool "Enable generic-gmac method provider" -- depends on PACKAGE_fastd -+ select FASTD_ENABLE_MAC_GHASH - default y - - config FASTD_ENABLE_METHOD_GENERIC_POLY1305 - bool "Enable generic-poly1305 method provider" -- depends on PACKAGE_fastd -- default n - - config FASTD_ENABLE_METHOD_GENERIC_UMAC - bool "Enable generic-umac method provider" -- depends on PACKAGE_fastd -+ select FASTD_ENABLE_MAC_UHASH - default y - - config FASTD_ENABLE_METHOD_NULL - bool "Enable null method" -- depends on PACKAGE_fastd - default y - - - config FASTD_ENABLE_CIPHER_NULL - bool "Enable the null cipher" -- depends on PACKAGE_fastd - default y - - config FASTD_ENABLE_CIPHER_SALSA20 - bool "Enable the Salsa20 cipher" -- depends on PACKAGE_fastd -- default n - - config FASTD_ENABLE_CIPHER_SALSA2012 - bool "Enable the Salsa20/12 cipher" -- depends on PACKAGE_fastd - default y - - - config FASTD_ENABLE_MAC_GHASH -- bool "Enable the GHASH message authentication code" -- depends on PACKAGE_fastd -- default y -+ bool - - config FASTD_ENABLE_MAC_UHASH -- bool "Enable the UHASH message authentication code" -- depends on PACKAGE_fastd -- default y -+ bool - - - config FASTD_WITH_CAPABILITIES - bool "Enable POSIX capability support" -- depends on PACKAGE_fastd -- default n - - config FASTD_WITH_CMDLINE_USER - bool "Include support for setting user/group related options on the command line" -- depends on PACKAGE_fastd -- default n - - config FASTD_WITH_CMDLINE_LOGGING - bool "Include support for setting logging related options on the command line" -- depends on PACKAGE_fastd -- default n - - config FASTD_WITH_CMDLINE_OPERATION - bool "Include support for setting options related to the VPN operation (like mode, interface, encryption method) on the command line" -- depends on PACKAGE_fastd -- default n - - config FASTD_WITH_CMDLINE_COMMANDS - bool "Include support for setting handler scripts (e.g. --on-up) on the command line" -- depends on PACKAGE_fastd -- default n - - config FASTD_WITH_DYNAMIC_PEERS - bool "Include support for dynamic peers (using on-verify handlers)" -- depends on PACKAGE_fastd -- default n - - config FASTD_WITH_STATUS_SOCKET - bool "Include support for status sockets" -- depends on PACKAGE_fastd - default y - - endmenu -+ -+endif diff --git a/patches/packages/packages/0003-fastd-disable-GMAC-based-methods-by-default.patch b/patches/packages/packages/0003-fastd-disable-GMAC-based-methods-by-default.patch deleted file mode 100644 index a0075a0b..00000000 --- a/patches/packages/packages/0003-fastd-disable-GMAC-based-methods-by-default.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: Matthias Schiffer -Date: Sun, 7 Mar 2021 11:50:04 +0100 -Subject: fastd: disable GMAC-based methods by default - -The UMAC-based methods provide higher performance than GMAC and aren't -suspectible to timing attacks when implemented in software (which is -always the case on OpenWrt, as OpenSSL support is disabled). Disable -GMAC by default to save a few KiB. - -Signed-off-by: Matthias Schiffer -(cherry picked from commit 916a65781829d93856bfb82cf78ba333b8fbc973) - -diff --git a/net/fastd/Config.in b/net/fastd/Config.in -index 89ff6850aa5ab4ad0e762d8fb9473d5e5c820089..b6d46246e53516cdb7fc6e4857ea62481b4e8276 100644 ---- a/net/fastd/Config.in -+++ b/net/fastd/Config.in -@@ -8,7 +8,6 @@ config FASTD_ENABLE_METHOD_CIPHER_TEST - config FASTD_ENABLE_METHOD_COMPOSED_GMAC - bool "Enable composed-gmac method provider" - select FASTD_ENABLE_MAC_GHASH -- default y - - config FASTD_ENABLE_METHOD_COMPOSED_UMAC - bool "Enable composed-umac method provider" -@@ -18,7 +17,6 @@ config FASTD_ENABLE_METHOD_COMPOSED_UMAC - config FASTD_ENABLE_METHOD_GENERIC_GMAC - bool "Enable generic-gmac method provider" - select FASTD_ENABLE_MAC_GHASH -- default y - - config FASTD_ENABLE_METHOD_GENERIC_POLY1305 - bool "Enable generic-poly1305 method provider" diff --git a/patches/packages/packages/0004-fastd-update-to-v22.patch b/patches/packages/packages/0004-fastd-update-to-v22.patch deleted file mode 100644 index 4c1f8016..00000000 --- a/patches/packages/packages/0004-fastd-update-to-v22.patch +++ /dev/null @@ -1,59 +0,0 @@ -From: Matthias Schiffer -Date: Sun, 27 Jun 2021 13:07:49 +0200 -Subject: fastd: update to v22 - -Signed-off-by: Matthias Schiffer -(cherry picked from commit c8ca43865dcc7be0e3193f9b7d12f40d3441c258) - -diff --git a/net/fastd/Config.in b/net/fastd/Config.in -index b6d46246e53516cdb7fc6e4857ea62481b4e8276..157d1e39931cc0163785212cb5eea7d8af4f46f2 100644 ---- a/net/fastd/Config.in -+++ b/net/fastd/Config.in -@@ -30,6 +30,10 @@ config FASTD_ENABLE_METHOD_NULL - bool "Enable null method" - default y - -+config FASTD_ENABLE_METHOD_NULL_L2TP -+ bool "Enable null@l2tp method" -+ default y -+ - - config FASTD_ENABLE_CIPHER_NULL - bool "Enable the null cipher" -diff --git a/net/fastd/Makefile b/net/fastd/Makefile -index c7ab056a9ae005a75a75911658607e64d6228aac..d1ed4cf9afbe2faf11a0fa3b7b4d281848a8df2d 100644 ---- a/net/fastd/Makefile -+++ b/net/fastd/Makefile -@@ -8,12 +8,12 @@ - include $(TOPDIR)/rules.mk - - PKG_NAME:=fastd --PKG_VERSION:=21 -+PKG_VERSION:=22 - - PKG_MAINTAINER:=Matthias Schiffer - PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz - PKG_SOURCE_URL:=https://github.com/NeoRaider/fastd/releases/download/v$(PKG_VERSION) --PKG_HASH:=942f33bcd794bcb8e19da4c30c875bdfd4d0f1c24ec4dcdf51237791bbfb0d4c -+PKG_HASH:=19750b88705d66811b7c21b672537909c19ae6b21350688cbd1a3a54d08a8951 - - PKG_LICENSE:=BSD-2-Clause - PKG_LICENSE_FILES:=COPYRIGHT -@@ -26,6 +26,7 @@ PKG_CONFIG_DEPENDS:=\ - CONFIG_FASTD_ENABLE_METHOD_GENERIC_POLY1305 \ - CONFIG_FASTD_ENABLE_METHOD_GENERIC_UMAC \ - CONFIG_FASTD_ENABLE_METHOD_NULL \ -+ CONFIG_FASTD_ENABLE_METHOD_NULL_L2TP \ - CONFIG_FASTD_ENABLE_CIPHER_NULL \ - CONFIG_FASTD_ENABLE_CIPHER_SALSA20 \ - CONFIG_FASTD_ENABLE_CIPHER_SALSA2012 \ -@@ -81,7 +82,9 @@ MESON_ARGS += \ - -Dmethod_generic-poly1305=$(call feature,ENABLE_METHOD_GENERIC_POLY1305) \ - -Dmethod_generic-umac=$(call feature,ENABLE_METHOD_GENERIC_UMAC) \ - -Dmethod_null=$(call feature,ENABLE_METHOD_NULL) \ -+ -Dmethod_null_l2tp=$(call feature,ENABLE_METHOD_NULL_L2TP) \ - -Dstatus_socket=$(call feature,WITH_STATUS_SOCKET) \ -+ -Doffload_l2tp=disabled \ - -Dsystemd=disabled \ - -Duse_nacl=true \ - -Db_lto=true \ diff --git a/patches/packages/packages/0005-fastd-add-L2TP-variant.patch b/patches/packages/packages/0005-fastd-add-L2TP-variant.patch deleted file mode 100644 index 61948e3c..00000000 --- a/patches/packages/packages/0005-fastd-add-L2TP-variant.patch +++ /dev/null @@ -1,88 +0,0 @@ -From: Matthias Schiffer -Date: Sun, 27 Jun 2021 13:26:26 +0200 -Subject: fastd: add L2TP variant - -Signed-off-by: Matthias Schiffer -(cherry picked from commit 7b9c04f95b5202d5eb75e4bf1c6831a667ac3d0f) - -diff --git a/net/fastd/Config.in b/net/fastd/Config.in -index 157d1e39931cc0163785212cb5eea7d8af4f46f2..3da5e1f183c5400cc38650efad39edf31c6f18d0 100644 ---- a/net/fastd/Config.in -+++ b/net/fastd/Config.in -@@ -1,4 +1,4 @@ --if PACKAGE_fastd -+if PACKAGE_fastd || PACKAGE_fastd-l2tp - - menu "Configuration" - -diff --git a/net/fastd/Makefile b/net/fastd/Makefile -index d1ed4cf9afbe2faf11a0fa3b7b4d281848a8df2d..58255cb0ba1a3b00fbca7cfdd44abd3a923603f3 100644 ---- a/net/fastd/Makefile -+++ b/net/fastd/Makefile -@@ -15,8 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz - PKG_SOURCE_URL:=https://github.com/NeoRaider/fastd/releases/download/v$(PKG_VERSION) - PKG_HASH:=19750b88705d66811b7c21b672537909c19ae6b21350688cbd1a3a54d08a8951 - --PKG_LICENSE:=BSD-2-Clause --PKG_LICENSE_FILES:=COPYRIGHT -+PKG_LICENSE:=BSD-2-Clause LGPL-2.1-or-later -+PKG_LICENSE_FILES:=COPYRIGHT src/dep/libmnl/COPYING - - PKG_CONFIG_DEPENDS:=\ - CONFIG_FASTD_ENABLE_METHOD_CIPHER_TEST \ -@@ -54,6 +54,14 @@ define Package/fastd - TITLE:=Fast and Secure Tunneling Daemon - URL:=https://github.com/NeoRaider/fastd/ - SUBMENU:=VPN -+ VARIANT:=default -+endef -+define Package/fastd-l2tp -+$(Package/fastd) -+ DEPENDS+=+kmod-l2tp +kmod-l2tp-eth -+ TITLE+=(L2TP kernel offloading) -+ VARIANT:=l2tp -+ PROVIDES:=fastd - endef - - define Package/fastd/config -@@ -85,18 +93,31 @@ MESON_ARGS += \ - -Dmethod_null_l2tp=$(call feature,ENABLE_METHOD_NULL_L2TP) \ - -Dstatus_socket=$(call feature,WITH_STATUS_SOCKET) \ - -Doffload_l2tp=disabled \ -+ -Dlibmnl_builtin=true \ - -Dsystemd=disabled \ - -Duse_nacl=true \ - -Db_lto=true \ - -Dprefix=/usr - -+ifeq ($(BUILD_VARIANT),l2tp) -+ MESON_ARGS += \ -+ -Dmethod_null_l2tp=enabled \ -+ -Doffload_l2tp=enabled -+endif -+ - define Package/fastd/description -- Fast and secure tunneling daemon, which is optimized on small code size and few dependencies -+Fast and secure tunneling daemon, which is optimized on small code size and few dependencies -+endef -+define Package/fastd-l2tp/description -+$(Package/fastd/description) -+ -+This variant enables L2TP kernel offloadig support. - endef - - define Package/fastd/conffiles - /etc/config/fastd - endef -+Package/fastd-l2tp/conffiles = $(Package/fastd/conffiles) - - define Package/fastd/install - $(INSTALL_DIR) $(1)/usr/bin -@@ -110,5 +131,7 @@ define Package/fastd/install - $(INSTALL_DIR) $(1)/lib/upgrade/keep.d - $(INSTALL_DATA) files/fastd.upgrade $(1)/lib/upgrade/keep.d/fastd - endef -+Package/fastd-l2tp/install = $(Package/fastd/install) - - $(eval $(call BuildPackage,fastd)) -+$(eval $(call BuildPackage,fastd-l2tp)) diff --git a/patches/packages/packages/0006-fastd-fix-start-of-non-L2TP-variant.patch b/patches/packages/packages/0006-fastd-fix-start-of-non-L2TP-variant.patch deleted file mode 100644 index a34ce851..00000000 --- a/patches/packages/packages/0006-fastd-fix-start-of-non-L2TP-variant.patch +++ /dev/null @@ -1,63 +0,0 @@ -From: Matthias Schiffer -Date: Sun, 27 Jun 2021 14:48:48 +0200 -Subject: fastd: fix start of non-L2TP variant - -Signed-off-by: Matthias Schiffer -(cherry picked from commit 62742985d7cf15029b4d6027a7ccfa0e480278ca) - -diff --git a/net/fastd/Makefile b/net/fastd/Makefile -index 58255cb0ba1a3b00fbca7cfdd44abd3a923603f3..6fd316374d876834995f696fc63e7fbb98fb437c 100644 ---- a/net/fastd/Makefile -+++ b/net/fastd/Makefile -@@ -9,6 +9,7 @@ include $(TOPDIR)/rules.mk - - PKG_NAME:=fastd - PKG_VERSION:=22 -+PKG_RELEASE=2 - - PKG_MAINTAINER:=Matthias Schiffer - PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -diff --git a/net/fastd/patches/0001-config-allow-disabling-L2TP-offload-when-fastd-doesn.patch b/net/fastd/patches/0001-config-allow-disabling-L2TP-offload-when-fastd-doesn.patch -new file mode 100644 -index 0000000000000000000000000000000000000000..f2eabc95d61abf070907239b9d5d5935bd82966c ---- /dev/null -+++ b/net/fastd/patches/0001-config-allow-disabling-L2TP-offload-when-fastd-doesn.patch -@@ -0,0 +1,38 @@ -+From d95ae843845760aecbbc62a734c2b93b401b1834 Mon Sep 17 00:00:00 2001 -+Message-Id: -+From: Matthias Schiffer -+Date: Sun, 27 Jun 2021 14:45:46 +0200 -+Subject: [PATCH] config: allow disabling L2TP offload when fastd doesn't -+ support it -+ -+Only attempting to enable the offloading should raise an error when it -+is not supported. -+--- -+ src/config.y | 8 +++++--- -+ 1 file changed, 5 insertions(+), 3 deletions(-) -+ -+diff --git a/src/config.y b/src/config.y -+index a107d7b9fda7..7a3ec6a32649 100644 -+--- a/src/config.y -++++ b/src/config.y -+@@ -282,12 +282,14 @@ offload: TOK_L2TP boolean { -+ #ifdef WITH_OFFLOAD_L2TP -+ conf.offload_l2tp = $2; -+ #else -++ if ($2) { -+ # ifdef __linux__ -+- fastd_config_error(&@$, state, "L2TP offload is not supported by this build of fastd"); -++ fastd_config_error(&@$, state, "L2TP offload is not supported by this build of fastd"); -+ # else -+- fastd_config_error(&@$, state, "L2TP offload is not supported on this platform"); -++ fastd_config_error(&@$, state, "L2TP offload is not supported on this platform"); -+ # endif -+- YYERROR; -++ YYERROR; -++ } -+ #endif -+ } -+ ; -+-- -+2.32.0 -+ diff --git a/patches/packages/packages/0007-fastd-make-L2TP-support-a-config-option-instead-of-a-variant.patch b/patches/packages/packages/0007-fastd-make-L2TP-support-a-config-option-instead-of-a-variant.patch deleted file mode 100644 index 7759d711..00000000 --- a/patches/packages/packages/0007-fastd-make-L2TP-support-a-config-option-instead-of-a-variant.patch +++ /dev/null @@ -1,112 +0,0 @@ -From: Matthias Schiffer -Date: Sun, 27 Jun 2021 16:46:38 +0200 -Subject: fastd: make L2TP support a config option instead of a variant - -We enable the option by default, but do not depend on the kernel modules -required for L2TP offloading to avoid wasting space when the feature is -not needed. To use offloading, kmod-l2tp-eth must be installed. - -Signed-off-by: Matthias Schiffer -(cherry picked from commit 03ff71d5ba955ad2d3f23de30e526ab6452297d4) - -diff --git a/net/fastd/Config.in b/net/fastd/Config.in -index 3da5e1f183c5400cc38650efad39edf31c6f18d0..67ae7c6b1390632735c5d26bade2cb2c570a9a43 100644 ---- a/net/fastd/Config.in -+++ b/net/fastd/Config.in -@@ -1,4 +1,4 @@ --if PACKAGE_fastd || PACKAGE_fastd-l2tp -+if PACKAGE_fastd - - menu "Configuration" - -@@ -76,6 +76,10 @@ config FASTD_WITH_STATUS_SOCKET - bool "Include support for status sockets" - default y - -+config FASTD_WITH_OFFLOAD_L2TP -+ bool "Enable L2TP offloading" -+ default y -+ - endmenu - - endif -diff --git a/net/fastd/Makefile b/net/fastd/Makefile -index 6fd316374d876834995f696fc63e7fbb98fb437c..9175227a5fe179bdb9d38d5e173f84908fb216ef 100644 ---- a/net/fastd/Makefile -+++ b/net/fastd/Makefile -@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk - - PKG_NAME:=fastd - PKG_VERSION:=22 --PKG_RELEASE=2 -+PKG_RELEASE=3 - - PKG_MAINTAINER:=Matthias Schiffer - PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -@@ -39,7 +39,8 @@ PKG_CONFIG_DEPENDS:=\ - CONFIG_FASTD_WITH_CMDLINE_OPERATION \ - CONFIG_FASTD_WITH_CMDLINE_COMMANDS \ - CONFIG_FASTD_WITH_DYNAMIC_PEERS \ -- CONFIG_FASTD_WITH_STATUS_SOCKET -+ CONFIG_FASTD_WITH_STATUS_SOCKET \ -+ CONFIG_FASTD_WITH_OFFLOAD_L2TP - - - PKG_BUILD_DEPENDS:=meson/host nacl -@@ -55,14 +56,6 @@ define Package/fastd - TITLE:=Fast and Secure Tunneling Daemon - URL:=https://github.com/NeoRaider/fastd/ - SUBMENU:=VPN -- VARIANT:=default --endef --define Package/fastd-l2tp --$(Package/fastd) -- DEPENDS+=+kmod-l2tp +kmod-l2tp-eth -- TITLE+=(L2TP kernel offloading) -- VARIANT:=l2tp -- PROVIDES:=fastd - endef - - define Package/fastd/config -@@ -93,32 +86,20 @@ MESON_ARGS += \ - -Dmethod_null=$(call feature,ENABLE_METHOD_NULL) \ - -Dmethod_null_l2tp=$(call feature,ENABLE_METHOD_NULL_L2TP) \ - -Dstatus_socket=$(call feature,WITH_STATUS_SOCKET) \ -- -Doffload_l2tp=disabled \ -+ -Doffload_l2tp=$(call feature,WITH_OFFLOAD_L2TP) \ - -Dlibmnl_builtin=true \ - -Dsystemd=disabled \ - -Duse_nacl=true \ - -Db_lto=true \ - -Dprefix=/usr - --ifeq ($(BUILD_VARIANT),l2tp) -- MESON_ARGS += \ -- -Dmethod_null_l2tp=enabled \ -- -Doffload_l2tp=enabled --endif -- - define Package/fastd/description - Fast and secure tunneling daemon, which is optimized on small code size and few dependencies - endef --define Package/fastd-l2tp/description --$(Package/fastd/description) -- --This variant enables L2TP kernel offloadig support. --endef - - define Package/fastd/conffiles - /etc/config/fastd - endef --Package/fastd-l2tp/conffiles = $(Package/fastd/conffiles) - - define Package/fastd/install - $(INSTALL_DIR) $(1)/usr/bin -@@ -132,7 +113,5 @@ define Package/fastd/install - $(INSTALL_DIR) $(1)/lib/upgrade/keep.d - $(INSTALL_DATA) files/fastd.upgrade $(1)/lib/upgrade/keep.d/fastd - endef --Package/fastd-l2tp/install = $(Package/fastd/install) - - $(eval $(call BuildPackage,fastd)) --$(eval $(call BuildPackage,fastd-l2tp))