From 813ef01a278e6b551dd16c0b07fb99262e0fea6b Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 11 Aug 2023 19:06:10 -0700 Subject: [PATCH 1/5] tools/xz: update to 5.4.4 * liblzma and xzdec can now build against WASI SDK when threading support is disabled. xz and tests don't build yet. * CMake: - Fixed a bug preventing other projects from including liblzma multiple times using find_package(). - Don't create broken symlinks in Cygwin and MSYS2 unless supported by the environment. This prevented building for the default MSYS2 environment. The problem was introduced in xz 5.4.0. * Documentation: - Small improvements to man pages. - Small improvements and typo fixes for liblzma API documentation. * Tests: - Added a new section to INSTALL to describe basic test usage and address recent questions about building the tests when cross compiling. - Small fixes and improvements to the tests. * Translations: - Fixed a mistake that caused one of the error messages to not be translated. This only affected versions 5.4.2 and 5.4.3. - Updated the Chinese (simplified), Croatian, Esperanto, German, Korean, Polish, Romanian, Spanish, Swedish, Ukrainian, and Vietnamese translations. - Updated the German, Korean, Romanian, and Ukrainian man page translations. Signed-off-by: Rosen Penev --- tools/xz/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/xz/Makefile b/tools/xz/Makefile index 67f96aa0de2..757d5ae0e1e 100644 --- a/tools/xz/Makefile +++ b/tools/xz/Makefile @@ -7,12 +7,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xz -PKG_VERSION:=5.4.3 +PKG_VERSION:=5.4.4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@SF/lzmautils \ http://tukaani.org/xz -PKG_HASH:=9243a04598d7a70c1f567a0143a255581ac5c64b140fd55fd5cbc1e00b0e6f90 +PKG_HASH:=0b6fcde1ac38e90433a2556f500c065950b9bcd2d602006efc334782bdfe6296 PKG_CPE_ID:=cpe:/a:tukaani:xz HOST_BUILD_PARALLEL:=1 From 00ce1c05877ac38f5ff00c1c2ce3468d5168f76c Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 13 Aug 2023 22:32:20 +0200 Subject: [PATCH 2/5] linux-firmware: Update Intel AX200 and AX210 firmware This updates the Intel iwlwifi firmware for AX200 and AX210 from version 66 to version 72. Version 72 is the latest version supported by iwlwifi from kernel 6.1. Signed-off-by: Hauke Mehrtens Reviewed-by: Robert Marko --- package/firmware/linux-firmware/intel.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/firmware/linux-firmware/intel.mk b/package/firmware/linux-firmware/intel.mk index 23b58358b4e..cb7b7f4ae42 100644 --- a/package/firmware/linux-firmware/intel.mk +++ b/package/firmware/linux-firmware/intel.mk @@ -173,14 +173,14 @@ $(eval $(call BuildPackage,iwlwifi-firmware-iwl9260)) Package/iwlwifi-firmware-ax200 = $(call Package/firmware-default,Intel AX200 firmware) define Package/iwlwifi-firmware-ax200/install $(INSTALL_DIR) $(1)/lib/firmware - $(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-cc-a0-66.ucode $(1)/lib/firmware + $(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-cc-a0-72.ucode $(1)/lib/firmware endef $(eval $(call BuildPackage,iwlwifi-firmware-ax200)) Package/iwlwifi-firmware-ax210 = $(call Package/firmware-default,Intel AX210 firmware) define Package/iwlwifi-firmware-ax210/install $(INSTALL_DIR) $(1)/lib/firmware - $(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-ty-a0-gf-a0-66.ucode $(1)/lib/firmware + $(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-ty-a0-gf-a0-72.ucode $(1)/lib/firmware $(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-ty-a0-gf-a0.pnvm $(1)/lib/firmware endef $(eval $(call BuildPackage,iwlwifi-firmware-ax210)) From 9e9dc1890c6f58d858208136ecfa435445dfca09 Mon Sep 17 00:00:00 2001 From: Robert Marko Date: Mon, 14 Aug 2023 13:47:49 +0200 Subject: [PATCH 3/5] ipq40xx: commonize Meraki recipe MR33 and MR74 share pretty much everything in the image recipe, so lets extract a common recipe to avoid duplication. Signed-off-by: Robert Marko --- target/linux/ipq40xx/image/generic.mk | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/target/linux/ipq40xx/image/generic.mk b/target/linux/ipq40xx/image/generic.mk index a9dd2aa0912..55e143e0dd8 100644 --- a/target/linux/ipq40xx/image/generic.mk +++ b/target/linux/ipq40xx/image/generic.mk @@ -756,26 +756,25 @@ define Device/luma_wrtq-329acn endef TARGET_DEVICES += luma_wrtq-329acn -define Device/meraki_mr33 +define Device/meraki_common $(call Device/FitImage) DEVICE_VENDOR := Cisco Meraki - DEVICE_MODEL := MR33 SOC := qcom-ipq4029 BLOCKSIZE := 128k PAGESIZE := 2048 DEVICE_PACKAGES := -swconfig ath10k-firmware-qca9887-ct +endef + +define Device/meraki_mr33 + $(call Device/meraki_common) + DEVICE_MODEL := MR33 DEFAULT := n endef TARGET_DEVICES += meraki_mr33 define Device/meraki_mr74 - $(call Device/FitImage) - DEVICE_VENDOR := Cisco Meraki + $(call Device/meraki_common) DEVICE_MODEL := MR74 - SOC := qcom-ipq4029 - BLOCKSIZE := 128k - PAGESIZE := 2048 - DEVICE_PACKAGES := -swconfig ath10k-firmware-qca9887-ct DEVICE_DTS_CONFIG := config@3 DEFAULT := n endef From bb4a25860f593790aaedc1b31dde33fbc519e7bf Mon Sep 17 00:00:00 2001 From: Robert Marko Date: Mon, 14 Aug 2023 13:48:37 +0200 Subject: [PATCH 4/5] ipq40xx: meraki: remove swconfig in DEVICE_PACKAGES ipq40xx was converted to DSA and swconfig is not being included at all in the default packages so there is no need to drop it from device packages. Signed-off-by: Robert Marko --- target/linux/ipq40xx/image/generic.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/ipq40xx/image/generic.mk b/target/linux/ipq40xx/image/generic.mk index 55e143e0dd8..78fa22c2345 100644 --- a/target/linux/ipq40xx/image/generic.mk +++ b/target/linux/ipq40xx/image/generic.mk @@ -762,7 +762,7 @@ define Device/meraki_common SOC := qcom-ipq4029 BLOCKSIZE := 128k PAGESIZE := 2048 - DEVICE_PACKAGES := -swconfig ath10k-firmware-qca9887-ct + DEVICE_PACKAGES := ath10k-firmware-qca9887-ct endef define Device/meraki_mr33 From f1c80445bd7e3b2f7fc3e4c8136402b30834d4e9 Mon Sep 17 00:00:00 2001 From: Robert Marko Date: Mon, 14 Aug 2023 13:50:47 +0200 Subject: [PATCH 5/5] ipq40xx: meraki: define DTB load address It seems that the Meraki bootloader does not respect the kernel ARM booting specification[1] that requires that address where DTB is located needs to be 64-bit aligned and often places the DTB on a non 64-bit aligned address and then kernel fails to find the DTB magic and fails to boot. Even worse, there is no prints until early printk is enabled and then its visible that kernel is trying to find the ATAG-s as DTB was not found or is invalid. Unifi 6 devices had the same issue and it can be solved by passing the load adress as part of the FIT image. It seems that the vendor was aware of the issue and is always relocating the DTB to 0x89000000, so lets just do the same. Now that booting is reliable, reenable default images for the Meraki MR33 and MR74 devices. Reviewed-by: Lech Perczak lech.perczak@gmail.com Signed-off-by: Robert Marko --- target/linux/ipq40xx/image/generic.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/target/linux/ipq40xx/image/generic.mk b/target/linux/ipq40xx/image/generic.mk index 78fa22c2345..907558302c7 100644 --- a/target/linux/ipq40xx/image/generic.mk +++ b/target/linux/ipq40xx/image/generic.mk @@ -762,13 +762,13 @@ define Device/meraki_common SOC := qcom-ipq4029 BLOCKSIZE := 128k PAGESIZE := 2048 + DEVICE_DTS_LOADADDR := 0x89000000 DEVICE_PACKAGES := ath10k-firmware-qca9887-ct endef define Device/meraki_mr33 $(call Device/meraki_common) DEVICE_MODEL := MR33 - DEFAULT := n endef TARGET_DEVICES += meraki_mr33 @@ -776,7 +776,6 @@ define Device/meraki_mr74 $(call Device/meraki_common) DEVICE_MODEL := MR74 DEVICE_DTS_CONFIG := config@3 - DEFAULT := n endef TARGET_DEVICES += meraki_mr74