armadeus-commitlog — Armadeus GIT commit logs

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-507-g7275c7fb5

[sszy <ss...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  7275c7fb571c00a27a2b6922b874ecaab90baf2a (commit)
      from  a26a2e0b2848751dad1270483f6ccee63e0d8483 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7275c7fb571c00a27a2b6922b874ecaab90baf2a
Author: Sébastien Szymanski <seb...@ar...>
Date:   Thu Dec 11 13:19:31 2025 +0100

    [BUILDROOT] Bump to BR 2025.02.9

-----------------------------------------------------------------------

Summary of changes:
 Makefile                                                       | 2 +-
 patches/buildroot/2025.02/0019-armadeus-add-cmux-package.patch | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 0fb417ee1..d64d622a7 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ export ARMADEUS_TOPDIR
 
 #--- User configurable stuff:
 BUILDROOT_MAJOR_VERSION ?= 2025.02
-BUILDROOT_MINOR_VERSION ?= 8
+BUILDROOT_MINOR_VERSION ?= 9
 ifneq ($(strip $(BUILDROOT_MINOR_VERSION)),)
 BUILDROOT_VERSION := $(BUILDROOT_MAJOR_VERSION).$(BUILDROOT_MINOR_VERSION)
 else
diff --git a/patches/buildroot/2025.02/0019-armadeus-add-cmux-package.patch b/patches/buildroot/2025.02/0019-armadeus-add-cmux-package.patch
index 0d5f3014e..4b5f89939 100644
--- a/patches/buildroot/2025.02/0019-armadeus-add-cmux-package.patch
+++ b/patches/buildroot/2025.02/0019-armadeus-add-cmux-package.patch
@@ -6,8 +6,8 @@ Index: buildroot/package/Config.in
 ===================================================================
 --- buildroot.orig/package/Config.in
 +++ buildroot/package/Config.in
-@@ -2005,6 +2005,7 @@ menu "Networking"
- 	source "package/belle-sip/Config.in"
+@@ -2000,6 +2000,7 @@ menu "Networking"
+ 	source "package/batman-adv/Config.in"
  	source "package/bluez5_utils-headers/Config.in"
  	source "package/c-ares/Config.in"
 +	source "package/cmux/Config.in"


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-506-ga26a2e0b2

[sszy <ss...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  a26a2e0b2848751dad1270483f6ccee63e0d8483 (commit)
       via  f5fe1678d66dc266d4c819b073e06ce222cd22ce (commit)
      from  8b6ef4c83f97174eeab1177b69c421af42b5d9a2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a26a2e0b2848751dad1270483f6ccee63e0d8483
Author: Sébastien Szymanski <seb...@ar...>
Date:   Mon Nov 24 16:54:39 2025 +0100

    [BUILDROOT] Bump to BR 2025.02.8

commit f5fe1678d66dc266d4c819b073e06ce222cd22ce
Author: Sébastien Szymanski <seb...@ar...>
Date:   Mon Nov 24 16:53:42 2025 +0100

    [BUILDROOT] 2025.02: patches to update mwifiex and nxp-bt-wifi-firmware

-----------------------------------------------------------------------

Summary of changes:
 Makefile                                           |  2 +-
 ...-mwifiex-bump-version-to-lf-6.12.34-2.1.0.patch | 40 +++++++++
 ...-bt-wifi-firmware-bump-to-version-lf-6.12.patch | 94 ++++++++++++++++++++++
 patches/buildroot/2025.02/cleanup_buildroot.sh     |  5 ++
 4 files changed, 140 insertions(+), 1 deletion(-)
 create mode 100644 patches/buildroot/2025.02/0488-package-mwifiex-bump-version-to-lf-6.12.34-2.1.0.patch
 create mode 100644 patches/buildroot/2025.02/0489-package-nxp-bt-wifi-firmware-bump-to-version-lf-6.12.patch

diff --git a/Makefile b/Makefile
index c5a36d535..0fb417ee1 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ export ARMADEUS_TOPDIR
 
 #--- User configurable stuff:
 BUILDROOT_MAJOR_VERSION ?= 2025.02
-BUILDROOT_MINOR_VERSION ?= 7
+BUILDROOT_MINOR_VERSION ?= 8
 ifneq ($(strip $(BUILDROOT_MINOR_VERSION)),)
 BUILDROOT_VERSION := $(BUILDROOT_MAJOR_VERSION).$(BUILDROOT_MINOR_VERSION)
 else
diff --git a/patches/buildroot/2025.02/0488-package-mwifiex-bump-version-to-lf-6.12.34-2.1.0.patch b/patches/buildroot/2025.02/0488-package-mwifiex-bump-version-to-lf-6.12.34-2.1.0.patch
new file mode 100644
index 000000000..c68d45050
--- /dev/null
+++ b/patches/buildroot/2025.02/0488-package-mwifiex-bump-version-to-lf-6.12.34-2.1.0.patch
@@ -0,0 +1,40 @@
+From 76fe5d949159f549d0c0af15877735a3ffd3a9e5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Fri, 21 Nov 2025 17:55:10 +0100
+Subject: [PATCH] package/mwifiex: bump version to lf-6.12.34-2.1.0
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ package/nxp-mwifiex/nxp-mwifiex.hash | 2 +-
+ package/nxp-mwifiex/nxp-mwifiex.mk   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/package/nxp-mwifiex/nxp-mwifiex.hash b/package/nxp-mwifiex/nxp-mwifiex.hash
+index 559e89cb3787..63495d8f2ad2 100644
+--- a/package/nxp-mwifiex/nxp-mwifiex.hash
++++ b/package/nxp-mwifiex/nxp-mwifiex.hash
+@@ -1,3 +1,3 @@
+ # locally computed
+-sha256  dcffe6c48babf7db82aac4704b056cffc06a1f80008cd9c23ab0479fc890ba99  nxp-mwifiex-lf-6.6.52_2.2.0.tar.gz
++sha256  d1a05c81a95f83d270b37e5565ce2ffc53fd8a4b773732e130dd81aabe57b735  nxp-mwifiex-lf-6.12.34_2.1.0.tar.gz
+ sha256  67d461bc478d220fcdf99c59d8ea17fffbd1881718281aa4947eb608fcd568bb  LICENSE
+diff --git a/package/nxp-mwifiex/nxp-mwifiex.mk b/package/nxp-mwifiex/nxp-mwifiex.mk
+index 46678a2c9162..3084b54bd986 100644
+--- a/package/nxp-mwifiex/nxp-mwifiex.mk
++++ b/package/nxp-mwifiex/nxp-mwifiex.mk
+@@ -4,7 +4,7 @@
+ #
+ ################################################################################
+ 
+-NXP_MWIFIEX_VERSION = lf-6.6.52_2.2.0
++NXP_MWIFIEX_VERSION = lf-6.12.34_2.1.0
+ NXP_MWIFIEX_SITE = $(call github,nxp-imx,mwifiex,$(NXP_MWIFIEX_VERSION))
+ NXP_MWIFIEX_LICENSE = GPL-2.0
+ NXP_MWIFIEX_LICENSE_FILES = LICENSE
+-- 
+2.51.0
+
diff --git a/patches/buildroot/2025.02/0489-package-nxp-bt-wifi-firmware-bump-to-version-lf-6.12.patch b/patches/buildroot/2025.02/0489-package-nxp-bt-wifi-firmware-bump-to-version-lf-6.12.patch
new file mode 100644
index 000000000..6b3864bd8
--- /dev/null
+++ b/patches/buildroot/2025.02/0489-package-nxp-bt-wifi-firmware-bump-to-version-lf-6.12.patch
@@ -0,0 +1,94 @@
+From 8f315f6f1cefa4b1fba225eb33a6558f6323f249 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Fri, 21 Nov 2025 18:37:59 +0100
+Subject: [PATCH] package/nxp-bt-wifi-firmware: bump to version
+ lf-6.12.34_2.1.0
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+License hashes changed because the LA_OPT_NXP_Software_License changed
+from "v57 July 2024" to "v63 May 2025".
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ Config.in.legacy                                       | 6 ++++++
+ package/nxp-bt-wifi-firmware/Config.in                 | 5 -----
+ package/nxp-bt-wifi-firmware/nxp-bt-wifi-firmware.hash | 4 ++--
+ package/nxp-bt-wifi-firmware/nxp-bt-wifi-firmware.mk   | 7 +++++--
+ 4 files changed, 13 insertions(+), 9 deletions(-)
+
+Index: buildroot/Config.in.legacy
+===================================================================
+--- buildroot.orig/Config.in.legacy
++++ buildroot/Config.in.legacy
+@@ -146,6 +146,12 @@ endif
+ 
+ comment "Legacy options removed in 2025.02.7"
+ 
++config BR2_PACKAGE_NXP_BT_WIFI_FIRMWARE_8801
++	bool "This firmware has been removed"
++	select BR2_LEGACY
++	help
++	  This firmware has been removed from NXP's package
++
+ config BR2_PACKAGE_NETSTAT_NAT
+ 	bool "netstat-nat has been removed"
+ 	select BR2_LEGACY
+Index: buildroot/package/nxp-bt-wifi-firmware/Config.in
+===================================================================
+--- buildroot.orig/package/nxp-bt-wifi-firmware/Config.in
++++ buildroot/package/nxp-bt-wifi-firmware/Config.in
+@@ -7,11 +7,6 @@ config BR2_PACKAGE_NXP_BT_WIFI_FIRMWARE
+ 
+ if BR2_PACKAGE_NXP_BT_WIFI_FIRMWARE
+ 
+-config BR2_PACKAGE_NXP_BT_WIFI_FIRMWARE_8801
+-	bool "8801 (SD)"
+-	help
+-	  NXP 8801 module firmware files.
+-
+ config BR2_PACKAGE_NXP_BT_WIFI_FIRMWARE_8987
+ 	bool "8987 (SD)"
+ 	help
+Index: buildroot/package/nxp-bt-wifi-firmware/nxp-bt-wifi-firmware.hash
+===================================================================
+--- buildroot.orig/package/nxp-bt-wifi-firmware/nxp-bt-wifi-firmware.hash
++++ buildroot/package/nxp-bt-wifi-firmware/nxp-bt-wifi-firmware.hash
+@@ -1,3 +1,3 @@
+ # Locally calculated
+-sha256  444351eba2669772a0f62aadbff92b46adb370dcd5228f12e4f5ae2b58554951  nxp-bt-wifi-firmware-lf-6.6.52_2.2.0.tar.gz
+-sha256  601fa790c5b4d03579bd182fb4d65a6f329a32faf49db22f98e4608221e861f7  LICENSE.txt
++sha256  bfb2a5da2c651baa9cbb8160fd593a87b6cb92983b7aea4db5c3b380785c68c0  nxp-bt-wifi-firmware-lf-6.12.34_2.1.0.tar.gz
++sha256  3001cf84018c5cb10d183a678f6ec8a928c797616ba06b398d7ca93c0779aaa2  LICENSE.txt
+Index: buildroot/package/nxp-bt-wifi-firmware/nxp-bt-wifi-firmware.mk
+===================================================================
+--- buildroot.orig/package/nxp-bt-wifi-firmware/nxp-bt-wifi-firmware.mk
++++ buildroot/package/nxp-bt-wifi-firmware/nxp-bt-wifi-firmware.mk
+@@ -4,13 +4,12 @@
+ #
+ ################################################################################
+ 
+-NXP_BT_WIFI_FIRMWARE_VERSION = lf-6.6.52_2.2.0
++NXP_BT_WIFI_FIRMWARE_VERSION = lf-6.12.34_2.1.0
+ NXP_BT_WIFI_FIRMWARE_SITE = $(call github,nxp-imx,imx-firmware,$(NXP_BT_WIFI_FIRMWARE_VERSION))
+ NXP_BT_WIFI_FIRMWARE_LICENSE = NXP Software License Agreement
+ NXP_BT_WIFI_FIRMWARE_LICENSE_FILES = LICENSE.txt
+ NXP_BT_WIFI_FIRMWARE_REDISTRIBUTE = NO
+ 
+-NXP_BT_WIFI_FIRMWARE_FILES_$(BR2_PACKAGE_NXP_BT_WIFI_FIRMWARE_8801) += FwImage_8801_SD
+ NXP_BT_WIFI_FIRMWARE_FILES_$(BR2_PACKAGE_NXP_BT_WIFI_FIRMWARE_8987) += FwImage_8987
+ NXP_BT_WIFI_FIRMWARE_FILES_$(BR2_PACKAGE_NXP_BT_WIFI_FIRMWARE_8997_SD) += FwImage_8997_SD
+ NXP_BT_WIFI_FIRMWARE_FILES_$(BR2_PACKAGE_NXP_BT_WIFI_FIRMWARE_8997_PCIE) += FwImage_8997
+@@ -28,6 +27,10 @@ define NXP_BT_WIFI_FIRMWARE_INSTALL_TARG
+ 	$(foreach f,$(NXP_BT_WIFI_FIRMWARE_FILES_y), \
+ 		$(INSTALL) -m 0644 -D $(@D)/nxp/$(f)/* $(TARGET_DIR)/lib/firmware/nxp/
+ 	)
++	# Compatibility with previous names
++	ln -sf sdiw416_wlan.bin $(TARGET_DIR)/lib/firmware/nxp/sdioiw416_wlan_v0.bin
++	ln -sf sduartiw416_combo.bin $(TARGET_DIR)/lib/firmware/nxp/sdiouartiw416_combo_v0.bin
++	ln -sf uartiw416_bt.bin $(TARGET_DIR)/lib/firmware/nxp/uartiw416_bt_v0.bin
+ endef
+ 
+ $(eval $(generic-package))
diff --git a/patches/buildroot/2025.02/cleanup_buildroot.sh b/patches/buildroot/2025.02/cleanup_buildroot.sh
index c00b4a856..45777c2c8 100755
--- a/patches/buildroot/2025.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2025.02/cleanup_buildroot.sh
@@ -85,6 +85,11 @@ rm -rf buildroot/package/matiec/matiec.mk
 rm -rf buildroot/package/murata-cyw-fw/Config.in
 rm -rf buildroot/package/murata-cyw-fw/murata-cyw-fw.hash
 rm -rf buildroot/package/murata-cyw-fw/murata-cyw-fw.mk
+rm -rf buildroot/package/nxp-bt-wifi-firmware/Config.in
+rm -rf buildroot/package/nxp-bt-wifi-firmware/nxp-bt-wifi-firmware.hash
+rm -rf buildroot/package/nxp-bt-wifi-firmware/nxp-bt-wifi-firmware.mk
+rm -rf buildroot/package/nxp-mwifiex/nxp-mwifiex.hash
+rm -rf buildroot/package/nxp-mwifiex/nxp-mwifiex.mk
 rm -rf buildroot/package/optee-client/Config.in
 rm -rf buildroot/package/optee-client/optee-client.hash
 rm -rf buildroot/package/optee-examples/Config.in


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-504-g8b6ef4c83

[sszy <ss...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  8b6ef4c83f97174eeab1177b69c421af42b5d9a2 (commit)
      from  f7cb0550b3b5d7828890bde7a484d5601e0df60e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8b6ef4c83f97174eeab1177b69c421af42b5d9a2
Author: Sébastien Szymanski <seb...@ar...>
Date:   Mon Nov 10 19:09:02 2025 +0100

    [BUILDROOT] opos91/opos93{,sp}: bump U-Boot to 38df9eef8f74bcb222c3ddf407a91b57732d8366

-----------------------------------------------------------------------

Summary of changes:
 buildroot/configs/opos91-legacy-6.12_defconfig       | 2 +-
 buildroot/configs/opos91-optee-legacy-6.12_defconfig | 2 +-
 buildroot/configs/opos93-legacy-6.12_defconfig       | 2 +-
 buildroot/configs/opos93-optee-legacy-6.12_defconfig | 2 +-
 buildroot/configs/opos93sp-legacy-6.12_defconfig     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/buildroot/configs/opos91-legacy-6.12_defconfig b/buildroot/configs/opos91-legacy-6.12_defconfig
index 77c5cde45..cc2f1a53f 100644
--- a/buildroot/configs/opos91-legacy-6.12_defconfig
+++ b/buildroot/configs/opos91-legacy-6.12_defconfig
@@ -137,7 +137,7 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://gitlab.com/armadeus/armadeus-u-boot.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="118c7e58328c3f2da0cb992717750fecb9367ec9"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="38df9eef8f74bcb222c3ddf407a91b57732d8366"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="opos91dev"
 BR2_TARGET_UBOOT_SPL=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
diff --git a/buildroot/configs/opos91-optee-legacy-6.12_defconfig b/buildroot/configs/opos91-optee-legacy-6.12_defconfig
index 1ded87e2f..c170ef525 100644
--- a/buildroot/configs/opos91-optee-legacy-6.12_defconfig
+++ b/buildroot/configs/opos91-optee-legacy-6.12_defconfig
@@ -146,7 +146,7 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://gitlab.com/armadeus/armadeus-u-boot.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="118c7e58328c3f2da0cb992717750fecb9367ec9"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="38df9eef8f74bcb222c3ddf407a91b57732d8366"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="opos91dev_optee"
 BR2_TARGET_UBOOT_SPL=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
diff --git a/buildroot/configs/opos93-legacy-6.12_defconfig b/buildroot/configs/opos93-legacy-6.12_defconfig
index 54b6c74ba..2ad7bbc47 100644
--- a/buildroot/configs/opos93-legacy-6.12_defconfig
+++ b/buildroot/configs/opos93-legacy-6.12_defconfig
@@ -137,7 +137,7 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://gitlab.com/armadeus/armadeus-u-boot.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="118c7e58328c3f2da0cb992717750fecb9367ec9"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="38df9eef8f74bcb222c3ddf407a91b57732d8366"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="opos93dev"
 BR2_TARGET_UBOOT_SPL=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
diff --git a/buildroot/configs/opos93-optee-legacy-6.12_defconfig b/buildroot/configs/opos93-optee-legacy-6.12_defconfig
index 3102b62c0..495e93389 100644
--- a/buildroot/configs/opos93-optee-legacy-6.12_defconfig
+++ b/buildroot/configs/opos93-optee-legacy-6.12_defconfig
@@ -146,7 +146,7 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://gitlab.com/armadeus/armadeus-u-boot.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="118c7e58328c3f2da0cb992717750fecb9367ec9"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="38df9eef8f74bcb222c3ddf407a91b57732d8366"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="opos93dev_optee"
 BR2_TARGET_UBOOT_SPL=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
diff --git a/buildroot/configs/opos93sp-legacy-6.12_defconfig b/buildroot/configs/opos93sp-legacy-6.12_defconfig
index bbb938f75..7fba6d6f5 100644
--- a/buildroot/configs/opos93sp-legacy-6.12_defconfig
+++ b/buildroot/configs/opos93sp-legacy-6.12_defconfig
@@ -137,7 +137,7 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://gitlab.com/armadeus/armadeus-u-boot.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="118c7e58328c3f2da0cb992717750fecb9367ec9"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="38df9eef8f74bcb222c3ddf407a91b57732d8366"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="opos93spdev"
 BR2_TARGET_UBOOT_SPL=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus/u-boot branch, armadeus-2024.01, updated. 38df9eef8f74bcb222c3ddf407a91b57732d8366

[sszy <ss...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus/u-boot".

The branch, armadeus-2024.01 has been updated
       via  38df9eef8f74bcb222c3ddf407a91b57732d8366 (commit)
      from  118c7e58328c3f2da0cb992717750fecb9367ec9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 38df9eef8f74bcb222c3ddf407a91b57732d8366
Author: Sébastien Szymanski <seb...@ar...>
Date:   Mon Nov 10 19:00:13 2025 +0100

    configs: opos91: enable GPIOs driver

-----------------------------------------------------------------------

Summary of changes:
 configs/opos91dev_defconfig       | 1 +
 configs/opos91dev_optee_defconfig | 1 +
 2 files changed, 2 insertions(+)

diff --git a/configs/opos91dev_defconfig b/configs/opos91dev_defconfig
index 8bc9308216..f1f1349c47 100644
--- a/configs/opos91dev_defconfig
+++ b/configs/opos91dev_defconfig
@@ -119,6 +119,7 @@ CONFIG_FASTBOOT_UUU_SUPPORT=y
 CONFIG_FASTBOOT_FLASH_MMC_DEV=0
 CONFIG_FASTBOOT_MMC_BOOT_SUPPORT=y
 CONFIG_FASTBOOT_MMC_USER_SUPPORT=y
+CONFIG_IMX_RGPIO2P=y
 CONFIG_DM_I2C=y
 # CONFIG_SPL_DM_I2C is not set
 CONFIG_SYS_I2C_IMX_LPI2C=y
diff --git a/configs/opos91dev_optee_defconfig b/configs/opos91dev_optee_defconfig
index b502bad4ea..72a54a2755 100644
--- a/configs/opos91dev_optee_defconfig
+++ b/configs/opos91dev_optee_defconfig
@@ -120,6 +120,7 @@ CONFIG_FASTBOOT_UUU_SUPPORT=y
 CONFIG_FASTBOOT_FLASH_MMC_DEV=0
 CONFIG_FASTBOOT_MMC_BOOT_SUPPORT=y
 CONFIG_FASTBOOT_MMC_USER_SUPPORT=y
+CONFIG_IMX_RGPIO2P=y
 CONFIG_DM_I2C=y
 # CONFIG_SPL_DM_I2C is not set
 CONFIG_SYS_I2C_IMX_LPI2C=y


hooks/post-receive
-- 
armadeus/u-boot

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-503-gf7cb0550b

[sszy <ss...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  f7cb0550b3b5d7828890bde7a484d5601e0df60e (commit)
      from  2921aecb482311a1bff99e9b7d3cad94a7380f2f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f7cb0550b3b5d7828890bde7a484d5601e0df60e
Author: Sébastien Szymanski <seb...@ar...>
Date:   Tue Nov 4 14:31:02 2025 +0100

    [BUILDROOT] opos91/opos93{,sp}: bump Linux to 14cb99b49f1d6f52ef189cc1c0d6f265383ad1ba

-----------------------------------------------------------------------

Summary of changes:
 buildroot/configs/opos91-legacy-6.12_defconfig       | 2 +-
 buildroot/configs/opos91-optee-legacy-6.12_defconfig | 2 +-
 buildroot/configs/opos93-legacy-6.12_defconfig       | 2 +-
 buildroot/configs/opos93-optee-legacy-6.12_defconfig | 2 +-
 buildroot/configs/opos93sp-legacy-6.12_defconfig     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/buildroot/configs/opos91-legacy-6.12_defconfig b/buildroot/configs/opos91-legacy-6.12_defconfig
index d22c3d001..77c5cde45 100644
--- a/buildroot/configs/opos91-legacy-6.12_defconfig
+++ b/buildroot/configs/opos91-legacy-6.12_defconfig
@@ -24,7 +24,7 @@ BR2_TARGET_ARMADEUS_SDRAM_SIZE="512"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://gitlab.com/armadeus/armadeus-linux.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="168a5c0b2b86ef74edf186086d670a8cd2e81504"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="14cb99b49f1d6f52ef189cc1c0d6f265383ad1ba"
 BR2_LINUX_KERNEL_DEFCONFIG="imx_v8"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-legacy-6.12.fragment"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
diff --git a/buildroot/configs/opos91-optee-legacy-6.12_defconfig b/buildroot/configs/opos91-optee-legacy-6.12_defconfig
index 40157d1c2..1ded87e2f 100644
--- a/buildroot/configs/opos91-optee-legacy-6.12_defconfig
+++ b/buildroot/configs/opos91-optee-legacy-6.12_defconfig
@@ -24,7 +24,7 @@ BR2_TARGET_ARMADEUS_SDRAM_SIZE="512"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://gitlab.com/armadeus/armadeus-linux.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="168a5c0b2b86ef74edf186086d670a8cd2e81504"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="14cb99b49f1d6f52ef189cc1c0d6f265383ad1ba"
 BR2_LINUX_KERNEL_DEFCONFIG="imx_v8"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-legacy-6.12.fragment"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
diff --git a/buildroot/configs/opos93-legacy-6.12_defconfig b/buildroot/configs/opos93-legacy-6.12_defconfig
index 88219065d..54b6c74ba 100644
--- a/buildroot/configs/opos93-legacy-6.12_defconfig
+++ b/buildroot/configs/opos93-legacy-6.12_defconfig
@@ -24,7 +24,7 @@ BR2_TARGET_ARMADEUS_SDRAM_SIZE="512"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://gitlab.com/armadeus/armadeus-linux.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="168a5c0b2b86ef74edf186086d670a8cd2e81504"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="14cb99b49f1d6f52ef189cc1c0d6f265383ad1ba"
 BR2_LINUX_KERNEL_DEFCONFIG="imx_v8"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-legacy-6.12.fragment"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
diff --git a/buildroot/configs/opos93-optee-legacy-6.12_defconfig b/buildroot/configs/opos93-optee-legacy-6.12_defconfig
index 7758c78f0..3102b62c0 100644
--- a/buildroot/configs/opos93-optee-legacy-6.12_defconfig
+++ b/buildroot/configs/opos93-optee-legacy-6.12_defconfig
@@ -24,7 +24,7 @@ BR2_TARGET_ARMADEUS_SDRAM_SIZE="512"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://gitlab.com/armadeus/armadeus-linux.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="168a5c0b2b86ef74edf186086d670a8cd2e81504"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="14cb99b49f1d6f52ef189cc1c0d6f265383ad1ba"
 BR2_LINUX_KERNEL_DEFCONFIG="imx_v8"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-legacy-6.12.fragment"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
diff --git a/buildroot/configs/opos93sp-legacy-6.12_defconfig b/buildroot/configs/opos93sp-legacy-6.12_defconfig
index bab30fd7e..bbb938f75 100644
--- a/buildroot/configs/opos93sp-legacy-6.12_defconfig
+++ b/buildroot/configs/opos93sp-legacy-6.12_defconfig
@@ -24,7 +24,7 @@ BR2_TARGET_ARMADEUS_SDRAM_SIZE="512"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://gitlab.com/armadeus/armadeus-linux.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="9d5a8d114eb629d01592173542c5ea718962e688"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="14cb99b49f1d6f52ef189cc1c0d6f265383ad1ba"
 BR2_LINUX_KERNEL_DEFCONFIG="imx_v8"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-legacy-6.12.fragment"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-501-g7bfda3b7e

[sszy <ss...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  7bfda3b7e8e2f42b9a91fc86a894b7dce7e503d6 (commit)
       via  f18d3add5aa9272810b21261489b9224083aa0b1 (commit)
      from  702daf915a3c0da64404886aa01134b0eee306c3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7bfda3b7e8e2f42b9a91fc86a894b7dce7e503d6
Author: Sébastien Szymanski <seb...@ar...>
Date:   Tue Oct 21 17:13:06 2025 +0200

    [BUILDROOT] opos93: add opos93sp-legacy-6.12_defconfig

commit f18d3add5aa9272810b21261489b9224083aa0b1
Author: Sébastien Szymanski <seb...@ar...>
Date:   Tue Oct 21 14:58:40 2025 +0200

    .gitlab-ci.yml: build opos91-legacy-6.12_defconfig

-----------------------------------------------------------------------

Summary of changes:
 .gitlab-ci.yml                                                 |  2 +-
 ...3sp-legacy-6.1_defconfig => opos93sp-legacy-6.12_defconfig} | 10 +++++-----
 ...legacy-6.1.fragment => opos93sp-linux-legacy-6.12.fragment} |  0
 3 files changed, 6 insertions(+), 6 deletions(-)
 copy buildroot/configs/{opos93sp-legacy-6.1_defconfig => opos93sp-legacy-6.12_defconfig} (93%)
 copy buildroot/target/device/armadeus/opos93sp/{opos93sp-linux-legacy-6.1.fragment => opos93sp-linux-legacy-6.12.fragment} (100%)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ab49f023e..59c77531a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,7 +32,7 @@ stages:
     - cp -r -L buildroot/output/images output-images
   parallel:
     matrix:
-      - ARMADEUS_PLATFORM: [apf27, apf28, apf51, apf6, opos6ul, opos6ulnano, opos8mm-legacy-5.10, opos93-legacy-6.12, opos93sp-legacy-6.1]
+      - ARMADEUS_PLATFORM: [apf27, apf28, apf51, apf6, opos6ul, opos6ulnano, opos8mm-legacy-5.10, opos91-legacy-6.12, opos93-legacy-6.12, opos93sp-legacy-6.12]
 
 build-merge-request:
   rules:
diff --git a/buildroot/configs/opos93sp-legacy-6.1_defconfig b/buildroot/configs/opos93sp-legacy-6.12_defconfig
similarity index 93%
copy from buildroot/configs/opos93sp-legacy-6.1_defconfig
copy to buildroot/configs/opos93sp-legacy-6.12_defconfig
index 8c561c30e..bab30fd7e 100644
--- a/buildroot/configs/opos93sp-legacy-6.1_defconfig
+++ b/buildroot/configs/opos93sp-legacy-6.12_defconfig
@@ -1,7 +1,7 @@
 BR2_aarch64=y
 BR2_cortex_a55=y
 BR2_ARM_FPU_VFPV4D16=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_DL_DIR="$(BASE_DIR)/../downloads"
 BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
@@ -24,9 +24,9 @@ BR2_TARGET_ARMADEUS_SDRAM_SIZE="512"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://gitlab.com/armadeus/armadeus-linux.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="e6494020ade6f5196e058e76f00ae1a7751dff49"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="9d5a8d114eb629d01592173542c5ea718962e688"
 BR2_LINUX_KERNEL_DEFCONFIG="imx_v8"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-legacy-6.1.fragment"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-legacy-6.12.fragment"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx93-opos93spdev"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
@@ -129,7 +129,7 @@ BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O ^64bit,^metadata_csum,uninit_bg"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/nxp-imx/imx-atf"
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="8dbe28631802a51b3ec8179b2c5635b00393ad97"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="6adc4c6f6d9e8bb647aa5b30112d0ce264900052"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx93"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
 BR2_TARGET_UBOOT=y
@@ -137,7 +137,7 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://gitlab.com/armadeus/armadeus-u-boot.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="886242537cd3bb768edf424e2fae6ebb439e5e92"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="118c7e58328c3f2da0cb992717750fecb9367ec9"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="opos93spdev"
 BR2_TARGET_UBOOT_SPL=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
diff --git a/buildroot/target/device/armadeus/opos93sp/opos93sp-linux-legacy-6.1.fragment b/buildroot/target/device/armadeus/opos93sp/opos93sp-linux-legacy-6.12.fragment
similarity index 100%
copy from buildroot/target/device/armadeus/opos93sp/opos93sp-linux-legacy-6.1.fragment
copy to buildroot/target/device/armadeus/opos93sp/opos93sp-linux-legacy-6.12.fragment


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-499-g702daf915

[sszy <ss...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  702daf915a3c0da64404886aa01134b0eee306c3 (commit)
       via  cb464f4487530f4ce92dc056b4ed458ce6984fec (commit)
       via  a9527a11b17ccff08e33a40751fba428fe38e7e7 (commit)
       via  5528e74396d65cb42c724e21c5118d79441dd112 (commit)
      from  3b2890429ba2a3be3bb26b5c6d7b265e712b6d1b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 702daf915a3c0da64404886aa01134b0eee306c3
Author: Sébastien Szymanski <seb...@ar...>
Date:   Fri Oct 17 16:54:00 2025 +0200

    [BUILDROOT] add OPOS91 and OPOS91Dev support (w/ and w/o OPTEE)

commit cb464f4487530f4ce92dc056b4ed458ce6984fec
Author: Sébastien Szymanski <seb...@ar...>
Date:   Fri Oct 17 16:27:42 2025 +0200

    [BUILDROOT] opos93: add opos93-{,optee}-legacy-6.12_defconfig

commit a9527a11b17ccff08e33a40751fba428fe38e7e7
Author: Sébastien Szymanski <seb...@ar...>
Date:   Fri Oct 17 10:27:10 2025 +0200

    [BUILDROOT] 2025.02: patches to update fimware-ele-imx and firmware-imx

commit 5528e74396d65cb42c724e21c5118d79441dd112
Author: Sébastien Szymanski <seb...@ar...>
Date:   Thu Oct 16 16:06:41 2025 +0200

    [BUILDROOT] Bump to BR 2025.02.7

-----------------------------------------------------------------------

Summary of changes:
 .gitlab-ci.yml                                     |   2 +-
 Makefile                                           |   7 +-
 ...-6.1_defconfig => opos91-legacy-6.12_defconfig} |  26 ++--
 ...efconfig => opos91-optee-legacy-6.12_defconfig} |  30 ++---
 ...-6.1_defconfig => opos93-legacy-6.12_defconfig} |  10 +-
 ...efconfig => opos93-optee-legacy-6.12_defconfig} |  12 +-
 .../armadeus/opos91/opos91-bootloader-prepare.sh   |   1 +
 .../opos91-linux-legacy-6.12.fragment}             |   3 +-
 ....fragment => opos93-linux-legacy-6.12.fragment} |   1 +
 ...escale-imx-imx-gpu-viv-rename-IMX_GPU_VIV.patch |  63 +++++++++
 ...escale-imx-imx-gpu-viv-enable-aarch64-fra.patch | 141 +++++++++++++++++++++
 ...scale-imx-firmware-ele-imx-bump-to-versi.patch} |  38 +++---
 ...scale-imx-firmware-imx-bump-version-to-8.patch} |  45 +++----
 patches/buildroot/2025.02/cleanup_buildroot.sh     |   1 +
 14 files changed, 295 insertions(+), 85 deletions(-)
 copy buildroot/configs/{opos93-legacy-6.1_defconfig => opos91-legacy-6.12_defconfig} (88%)
 copy buildroot/configs/{opos93-optee-legacy-6.1_defconfig => opos91-optee-legacy-6.12_defconfig} (85%)
 copy buildroot/configs/{opos93-legacy-6.1_defconfig => opos93-legacy-6.12_defconfig} (93%)
 copy buildroot/configs/{opos93-optee-legacy-6.1_defconfig => opos93-optee-legacy-6.12_defconfig} (91%)
 create mode 120000 buildroot/target/device/armadeus/opos91/opos91-bootloader-prepare.sh
 copy buildroot/target/device/armadeus/{opos93/opos93-linux-legacy-6.1.fragment => opos91/opos91-linux-legacy-6.12.fragment} (74%)
 copy buildroot/target/device/armadeus/opos93/{opos93-linux-legacy-6.1.fragment => opos93-linux-legacy-6.12.fragment} (92%)
 create mode 100644 patches/buildroot/2025.02/0484-package-freescale-imx-imx-gpu-viv-rename-IMX_GPU_VIV.patch
 create mode 100644 patches/buildroot/2025.02/0485-package-freescale-imx-imx-gpu-viv-enable-aarch64-fra.patch
 copy patches/buildroot/2025.02/{0464-package-freescale-imx-firmware-ele-imx-bump-to-versi.patch => 0486-package-freescale-imx-firmware-ele-imx-bump-to-versi.patch} (60%)
 copy patches/buildroot/2025.02/{0462-package-freescale-imx-firmware-imx-bump-version-to-8.patch => 0487-package-freescale-imx-firmware-imx-bump-version-to-8.patch} (50%)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c0e3eaa55..ab49f023e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,7 +32,7 @@ stages:
     - cp -r -L buildroot/output/images output-images
   parallel:
     matrix:
-      - ARMADEUS_PLATFORM: [apf27, apf28, apf51, apf6, opos6ul, opos6ulnano, opos8mm-legacy-5.10, opos93-legacy-6.1, opos93sp-legacy-6.1]
+      - ARMADEUS_PLATFORM: [apf27, apf28, apf51, apf6, opos6ul, opos6ulnano, opos8mm-legacy-5.10, opos93-legacy-6.12, opos93sp-legacy-6.1]
 
 build-merge-request:
   rules:
diff --git a/Makefile b/Makefile
index 4a1d5d680..c5a36d535 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ export ARMADEUS_TOPDIR
 
 #--- User configurable stuff:
 BUILDROOT_MAJOR_VERSION ?= 2025.02
-BUILDROOT_MINOR_VERSION ?= 6
+BUILDROOT_MINOR_VERSION ?= 7
 ifneq ($(strip $(BUILDROOT_MINOR_VERSION)),)
 BUILDROOT_VERSION := $(BUILDROOT_MAJOR_VERSION).$(BUILDROOT_MINOR_VERSION)
 else
@@ -71,6 +71,8 @@ ECHO_CONFIGURATION_NOT_DEFINED:= echo -en "\033[1m"; \
                 echo "     "$(shell find $(ARMADEUS_CONFIG_DIR) -name "opos6ulsp*_defconfig" | sed 's/.*\///');\
                 echo " opos8mm: " >&2; \
                 echo "     "$(shell find $(ARMADEUS_CONFIG_DIR) -name "opos8mm*_defconfig" | sed 's/.*\///');\
+                echo " opos91: " >&2; \
+                echo "     "$(shell find $(ARMADEUS_CONFIG_DIR) -name "opos91-*_defconfig" | sed 's/.*\///');\
                 echo " opos93: " >&2; \
                 echo "     "$(shell find $(ARMADEUS_CONFIG_DIR) -name "opos93-*_defconfig" | sed 's/.*\///');\
                 echo " opos93sp: " >&2; \
@@ -100,7 +102,8 @@ help:
 	@echo '  opos6ulnano_defconfig    - get default config for an OPOS6ULNANO+Dev kit (4.9+ mainline/vanilla kernel)'
 	@echo '  opos6ulsp_defconfig      - get default config for an OPOS6ULSP+Dev kit (4.19+ mainline/vanilla kernel)'
 	@echo '  opos8mm-legacy-5.10_defconfig - get default config for an OPOS8MM+Dev kit (5.10 NXP kernel)'
-	@echo '  opos93-legacy-6.1_defconfig   - get default config for an OPOS93+Dev kit (6.1 NXP kernel)'
+	@echo '  opos91-legacy-6.12_defconfig   - get default config for an OPOS91+Dev kit (6.12 NXP kernel)'
+	@echo '  opos93-legacy-6.12_defconfig   - get default config for an OPOS93+Dev kit (6.12 NXP kernel)'
 	@echo '  opos93sp-legacy-6.1_defconfig - get default config for an OPOS93SP+Dev kit (6.1 NXP kernel)'
 	@echo ''
 	@echo 'Build:'
diff --git a/buildroot/configs/opos93-legacy-6.1_defconfig b/buildroot/configs/opos91-legacy-6.12_defconfig
similarity index 88%
copy from buildroot/configs/opos93-legacy-6.1_defconfig
copy to buildroot/configs/opos91-legacy-6.12_defconfig
index 49950011e..d22c3d001 100644
--- a/buildroot/configs/opos93-legacy-6.1_defconfig
+++ b/buildroot/configs/opos91-legacy-6.12_defconfig
@@ -1,13 +1,13 @@
 BR2_aarch64=y
 BR2_cortex_a55=y
 BR2_ARM_FPU_VFPV4D16=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_DL_DIR="$(BASE_DIR)/../downloads"
 BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
 BR2_CCACHE=y
 BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
-BR2_TARGET_GENERIC_HOSTNAME="opos93"
+BR2_TARGET_GENERIC_HOSTNAME="opos91"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
 BR2_TARGET_GENERIC_GETTY_PORT="ttyLP0"
@@ -16,19 +16,19 @@ BR2_TARGET_LOCALTIME="Europe/Paris"
 BR2_ROOTFS_OVERLAY="$(ARMADEUS_PATH)/rootfs/target_overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx9-bootloader-prepare.sh $(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="opos93 imx93"
+BR2_ROOTFS_POST_SCRIPT_ARGS="opos91 imx93"
 BR2_TARGET_ARMADEUS=y
-BR2_BOARD_NAME="opos93"
-BR2_CPU_NAME="imx93"
+BR2_BOARD_NAME="opos91"
+BR2_CPU_NAME="imx91"
 BR2_TARGET_ARMADEUS_SDRAM_SIZE="512"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://gitlab.com/armadeus/armadeus-linux.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="038a4fac803e8c682c0bba645ab4cf78078d7dee"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="168a5c0b2b86ef74edf186086d670a8cd2e81504"
 BR2_LINUX_KERNEL_DEFCONFIG="imx_v8"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-legacy-6.1.fragment"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-legacy-6.12.fragment"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx93-opos93dev"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx91-opos91dev"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_PACKAGE_LINUX_TOOLS_CPUPOWER=y
@@ -75,7 +75,7 @@ BR2_PACKAGE_NXP_BT_WIFI_FIRMWARE=y
 BR2_PACKAGE_NXP_BT_WIFI_FIRMWARE_IW416=y
 BR2_PACKAGE_EVTEST=y
 BR2_PACKAGE_FREESCALE_IMX=y
-BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93=y
+BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91=y
 BR2_PACKAGE_FIRMWARE_ELE_IMX=y
 BR2_PACKAGE_FIRMWARE_IMX=y
 BR2_PACKAGE_MDIO_TOOLS=y
@@ -129,16 +129,16 @@ BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O ^64bit,^metadata_csum,uninit_bg"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/nxp-imx/imx-atf"
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="8dbe28631802a51b3ec8179b2c5635b00393ad97"
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx93"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="6adc4c6f6d9e8bb647aa5b30112d0ce264900052"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx91"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://gitlab.com/armadeus/armadeus-u-boot.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="4be1b355534698ab738ab74e82d2000550ce7d04"
-BR2_TARGET_UBOOT_BOARD_DEFCONFIG="opos93dev"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="118c7e58328c3f2da0cb992717750fecb9367ec9"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="opos91dev"
 BR2_TARGET_UBOOT_SPL=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_GENIMAGE=y
diff --git a/buildroot/configs/opos93-optee-legacy-6.1_defconfig b/buildroot/configs/opos91-optee-legacy-6.12_defconfig
similarity index 85%
copy from buildroot/configs/opos93-optee-legacy-6.1_defconfig
copy to buildroot/configs/opos91-optee-legacy-6.12_defconfig
index 0f5c6e163..40157d1c2 100644
--- a/buildroot/configs/opos93-optee-legacy-6.1_defconfig
+++ b/buildroot/configs/opos91-optee-legacy-6.12_defconfig
@@ -1,13 +1,13 @@
 BR2_aarch64=y
 BR2_cortex_a55=y
 BR2_ARM_FPU_VFPV4D16=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_DL_DIR="$(BASE_DIR)/../downloads"
 BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
 BR2_CCACHE=y
 BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
-BR2_TARGET_GENERIC_HOSTNAME="opos93"
+BR2_TARGET_GENERIC_HOSTNAME="opos91"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
 BR2_TARGET_GENERIC_GETTY_PORT="ttyLP0"
@@ -15,20 +15,20 @@ BR2_TARGET_TZ_ZONELIST="europe etcetera"
 BR2_TARGET_LOCALTIME="Europe/Paris"
 BR2_ROOTFS_OVERLAY="$(ARMADEUS_PATH)/rootfs/target_overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="$(ARMADEUS_PATH)/opos93/opos93-bootloader-prepare.sh $(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="opos93 imx93"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="$(ARMADEUS_PATH)/opos91/opos91-bootloader-prepare.sh $(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="opos91 imx93"
 BR2_TARGET_ARMADEUS=y
-BR2_BOARD_NAME="opos93"
-BR2_CPU_NAME="imx93"
+BR2_BOARD_NAME="opos91"
+BR2_CPU_NAME="imx91"
 BR2_TARGET_ARMADEUS_SDRAM_SIZE="512"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://gitlab.com/armadeus/armadeus-linux.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="038a4fac803e8c682c0bba645ab4cf78078d7dee"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="168a5c0b2b86ef74edf186086d670a8cd2e81504"
 BR2_LINUX_KERNEL_DEFCONFIG="imx_v8"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-legacy-6.1.fragment $(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-optee-linux-legacy-6.1.fragment"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-legacy-6.12.fragment"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx93-opos93dev"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx91-opos91dev"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_PACKAGE_LINUX_TOOLS_CPUPOWER=y
@@ -75,7 +75,7 @@ BR2_PACKAGE_NXP_BT_WIFI_FIRMWARE=y
 BR2_PACKAGE_NXP_BT_WIFI_FIRMWARE_IW416=y
 BR2_PACKAGE_EVTEST=y
 BR2_PACKAGE_FREESCALE_IMX=y
-BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93=y
+BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91=y
 BR2_PACKAGE_FIRMWARE_ELE_IMX=y
 BR2_PACKAGE_FIRMWARE_IMX=y
 BR2_PACKAGE_MDIO_TOOLS=y
@@ -130,14 +130,14 @@ BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O ^64bit,^metadata_csum,uninit_bg"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://gitlab.com/armadeus/armadeus-atf.git"
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="a87503b583d7085380cfd0cfc811beb3980f5517"
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx93"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="b0366f8405d8b326368e384b05274db2a8e3cbf0"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx91"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="SPD=opteed"
 BR2_TARGET_OPTEE_OS=y
 BR2_TARGET_OPTEE_OS_CUSTOM_GIT=y
 BR2_TARGET_OPTEE_OS_CUSTOM_REPO_URL="https://gitlab.com/armadeus/armadeus-op-tee.git"
-BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION="9162355eaeb2783c4cdb67d79f8fd2ae0ec37424"
+BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION="2a55f6635ecfbd592b492a81880690e5700533dc"
 BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY=y
 BR2_TARGET_OPTEE_OS_PLATFORM="imx-opos93"
 BR2_TARGET_OPTEE_OS_CORE_IMAGES="tee-raw.bin"
@@ -146,8 +146,8 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://gitlab.com/armadeus/armadeus-u-boot.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="e39996f02c7c877d024098216795283f63de3903"
-BR2_TARGET_UBOOT_BOARD_DEFCONFIG="opos93dev_optee"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="118c7e58328c3f2da0cb992717750fecb9367ec9"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="opos91dev_optee"
 BR2_TARGET_UBOOT_SPL=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_GENIMAGE=y
diff --git a/buildroot/configs/opos93-legacy-6.1_defconfig b/buildroot/configs/opos93-legacy-6.12_defconfig
similarity index 93%
copy from buildroot/configs/opos93-legacy-6.1_defconfig
copy to buildroot/configs/opos93-legacy-6.12_defconfig
index 49950011e..88219065d 100644
--- a/buildroot/configs/opos93-legacy-6.1_defconfig
+++ b/buildroot/configs/opos93-legacy-6.12_defconfig
@@ -1,7 +1,7 @@
 BR2_aarch64=y
 BR2_cortex_a55=y
 BR2_ARM_FPU_VFPV4D16=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_DL_DIR="$(BASE_DIR)/../downloads"
 BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
@@ -24,9 +24,9 @@ BR2_TARGET_ARMADEUS_SDRAM_SIZE="512"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://gitlab.com/armadeus/armadeus-linux.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="038a4fac803e8c682c0bba645ab4cf78078d7dee"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="168a5c0b2b86ef74edf186086d670a8cd2e81504"
 BR2_LINUX_KERNEL_DEFCONFIG="imx_v8"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-legacy-6.1.fragment"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-legacy-6.12.fragment"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx93-opos93dev"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
@@ -129,7 +129,7 @@ BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O ^64bit,^metadata_csum,uninit_bg"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/nxp-imx/imx-atf"
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="8dbe28631802a51b3ec8179b2c5635b00393ad97"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="6adc4c6f6d9e8bb647aa5b30112d0ce264900052"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx93"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
 BR2_TARGET_UBOOT=y
@@ -137,7 +137,7 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://gitlab.com/armadeus/armadeus-u-boot.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="4be1b355534698ab738ab74e82d2000550ce7d04"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="118c7e58328c3f2da0cb992717750fecb9367ec9"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="opos93dev"
 BR2_TARGET_UBOOT_SPL=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
diff --git a/buildroot/configs/opos93-optee-legacy-6.1_defconfig b/buildroot/configs/opos93-optee-legacy-6.12_defconfig
similarity index 91%
copy from buildroot/configs/opos93-optee-legacy-6.1_defconfig
copy to buildroot/configs/opos93-optee-legacy-6.12_defconfig
index 0f5c6e163..7758c78f0 100644
--- a/buildroot/configs/opos93-optee-legacy-6.1_defconfig
+++ b/buildroot/configs/opos93-optee-legacy-6.12_defconfig
@@ -1,7 +1,7 @@
 BR2_aarch64=y
 BR2_cortex_a55=y
 BR2_ARM_FPU_VFPV4D16=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_DL_DIR="$(BASE_DIR)/../downloads"
 BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
@@ -24,9 +24,9 @@ BR2_TARGET_ARMADEUS_SDRAM_SIZE="512"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://gitlab.com/armadeus/armadeus-linux.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="038a4fac803e8c682c0bba645ab4cf78078d7dee"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="168a5c0b2b86ef74edf186086d670a8cd2e81504"
 BR2_LINUX_KERNEL_DEFCONFIG="imx_v8"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-legacy-6.1.fragment $(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-optee-linux-legacy-6.1.fragment"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-legacy-6.12.fragment"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx93-opos93dev"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
@@ -130,14 +130,14 @@ BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O ^64bit,^metadata_csum,uninit_bg"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://gitlab.com/armadeus/armadeus-atf.git"
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="a87503b583d7085380cfd0cfc811beb3980f5517"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="b0366f8405d8b326368e384b05274db2a8e3cbf0"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx93"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="SPD=opteed"
 BR2_TARGET_OPTEE_OS=y
 BR2_TARGET_OPTEE_OS_CUSTOM_GIT=y
 BR2_TARGET_OPTEE_OS_CUSTOM_REPO_URL="https://gitlab.com/armadeus/armadeus-op-tee.git"
-BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION="9162355eaeb2783c4cdb67d79f8fd2ae0ec37424"
+BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION="2a55f6635ecfbd592b492a81880690e5700533dc"
 BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY=y
 BR2_TARGET_OPTEE_OS_PLATFORM="imx-opos93"
 BR2_TARGET_OPTEE_OS_CORE_IMAGES="tee-raw.bin"
@@ -146,7 +146,7 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://gitlab.com/armadeus/armadeus-u-boot.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="e39996f02c7c877d024098216795283f63de3903"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="118c7e58328c3f2da0cb992717750fecb9367ec9"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="opos93dev_optee"
 BR2_TARGET_UBOOT_SPL=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
diff --git a/buildroot/target/device/armadeus/opos91/opos91-bootloader-prepare.sh b/buildroot/target/device/armadeus/opos91/opos91-bootloader-prepare.sh
new file mode 120000
index 000000000..179ceddb1
--- /dev/null
+++ b/buildroot/target/device/armadeus/opos91/opos91-bootloader-prepare.sh
@@ -0,0 +1 @@
+../opos93/opos93-bootloader-prepare.sh
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/opos93/opos93-linux-legacy-6.1.fragment b/buildroot/target/device/armadeus/opos91/opos91-linux-legacy-6.12.fragment
similarity index 74%
copy from buildroot/target/device/armadeus/opos93/opos93-linux-legacy-6.1.fragment
copy to buildroot/target/device/armadeus/opos91/opos91-linux-legacy-6.12.fragment
index b54f4dda8..063045013 100644
--- a/buildroot/target/device/armadeus/opos93/opos93-linux-legacy-6.1.fragment
+++ b/buildroot/target/device/armadeus/opos91/opos91-linux-legacy-6.12.fragment
@@ -1,8 +1,7 @@
-CONFIG_DRM_PANEL_ILITEK_ILI9881C=y
 CONFIG_PWM_IMX_TPM=y
 # CONFIG_FW_LOADER_USER_HELPER is not set
 # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is no set
 CONFIG_MWIFIEX=m
 CONFIG_MWIFIEX_SDIO=m
+CONFIG_IMX_SDMA=m
 CONFIG_SND_SOC_FSL_SAI=y
-CONFIG_TOUCHSCREEN_FTS=y
diff --git a/buildroot/target/device/armadeus/opos93/opos93-linux-legacy-6.1.fragment b/buildroot/target/device/armadeus/opos93/opos93-linux-legacy-6.12.fragment
similarity index 92%
copy from buildroot/target/device/armadeus/opos93/opos93-linux-legacy-6.1.fragment
copy to buildroot/target/device/armadeus/opos93/opos93-linux-legacy-6.12.fragment
index b54f4dda8..36c7ab9f6 100644
--- a/buildroot/target/device/armadeus/opos93/opos93-linux-legacy-6.1.fragment
+++ b/buildroot/target/device/armadeus/opos93/opos93-linux-legacy-6.12.fragment
@@ -4,5 +4,6 @@ CONFIG_PWM_IMX_TPM=y
 # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is no set
 CONFIG_MWIFIEX=m
 CONFIG_MWIFIEX_SDIO=m
+CONFIG_IMX_SDMA=m
 CONFIG_SND_SOC_FSL_SAI=y
 CONFIG_TOUCHSCREEN_FTS=y
diff --git a/patches/buildroot/2025.02/0484-package-freescale-imx-imx-gpu-viv-rename-IMX_GPU_VIV.patch b/patches/buildroot/2025.02/0484-package-freescale-imx-imx-gpu-viv-rename-IMX_GPU_VIV.patch
new file mode 100644
index 000000000..7c2e9f87a
--- /dev/null
+++ b/patches/buildroot/2025.02/0484-package-freescale-imx-imx-gpu-viv-rename-IMX_GPU_VIV.patch
@@ -0,0 +1,63 @@
+From c8adccf8df811b850c718c7659b26af420207bb9 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <tho...@bo...>
+Date: Sun, 18 May 2025 21:39:36 +0200
+Subject: [PATCH] package/freescale-imx/imx-gpu-viv: rename
+ IMX_GPU_VIV_LIB_TARGET to IMX_GPU_VIV_OUTPUT
+
+In preparation for some rework of the package, let's rename the
+IMX_GPU_VIV_LIB_TARGET variable to IMX_GPU_VIV_OUTPUT to make it match
+the BR2_PACKAGE_IMX_GPU_VIV_OUTPUT config option it corresponds to.
+
+Signed-off-by: Thomas Petazzoni <tho...@bo...>
+---
+ package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk
+index 8744ff1bc999..14bcbb99d341 100644
+--- a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk
++++ b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk
+@@ -25,14 +25,14 @@ ifeq ($(BR2_aarch64),y)
+ IMX_GPU_VIV_PROVIDES += libgbm
+ endif
+ 
+-IMX_GPU_VIV_LIB_TARGET = $(call qstrip,$(BR2_PACKAGE_IMX_GPU_VIV_OUTPUT))
++IMX_GPU_VIV_OUTPUT = $(call qstrip,$(BR2_PACKAGE_IMX_GPU_VIV_OUTPUT))
+ 
+ # Libraries are linked against libdrm, except framebuffer output on ARM
+-ifneq ($(IMX_GPU_VIV_LIB_TARGET)$(BR2_arm),fby)
++ifneq ($(IMX_GPU_VIV_OUTPUT)$(BR2_arm),fby)
+ IMX_GPU_VIV_DEPENDENCIES += libdrm
+ endif
+ 
+-ifeq ($(IMX_GPU_VIV_LIB_TARGET),wayland)
++ifeq ($(IMX_GPU_VIV_OUTPUT),wayland)
+ IMX_GPU_VIV_DEPENDENCIES += wayland
+ endif
+ 
+@@ -40,11 +40,11 @@ define IMX_GPU_VIV_EXTRACT_CMDS
+ 	$(call NXP_EXTRACT_HELPER,$(IMX_GPU_VIV_DL_DIR)/$(IMX_GPU_VIV_SOURCE))
+ endef
+ 
+-ifeq ($(IMX_GPU_VIV_LIB_TARGET),fb)
++ifeq ($(IMX_GPU_VIV_OUTPUT),fb)
+ define IMX_GPU_VIV_FIXUP_PKGCONFIG
+ 	ln -sf egl_linuxfb.pc $(@D)/gpu-core/usr/lib/pkgconfig/egl.pc
+ endef
+-else ifeq ($(IMX_GPU_VIV_LIB_TARGET),wayland)
++else ifeq ($(IMX_GPU_VIV_OUTPUT),wayland)
+ define IMX_GPU_VIV_FIXUP_PKGCONFIG
+ 	ln -sf egl_wayland.pc $(@D)/gpu-core/usr/lib/pkgconfig/egl.pc
+ endef
+@@ -61,7 +61,7 @@ endif
+ # in the upstream archive here. We also remove unused backend files.
+ # Make sure these commands are idempotent.
+ define IMX_GPU_VIV_BUILD_CMDS
+-	cp -dpfr $(@D)/gpu-core/usr/lib/$(IMX_GPU_VIV_LIB_TARGET)/* $(@D)/gpu-core/usr/lib/
++	cp -dpfr $(@D)/gpu-core/usr/lib/$(IMX_GPU_VIV_OUTPUT)/* $(@D)/gpu-core/usr/lib/
+ 	$(foreach backend,fb wayland, \
+ 		$(RM) -r $(@D)/gpu-core/usr/lib/$(backend)
+ 	)
+-- 
+2.49.1
+
diff --git a/patches/buildroot/2025.02/0485-package-freescale-imx-imx-gpu-viv-enable-aarch64-fra.patch b/patches/buildroot/2025.02/0485-package-freescale-imx-imx-gpu-viv-enable-aarch64-fra.patch
new file mode 100644
index 000000000..e7093dd47
--- /dev/null
+++ b/patches/buildroot/2025.02/0485-package-freescale-imx-imx-gpu-viv-enable-aarch64-fra.patch
@@ -0,0 +1,141 @@
+From faf2b8a6277c1a10ca08e5ad8ecb488d70a03de4 Mon Sep 17 00:00:00 2001
+From: Lang Daniel <d....@ab...>
+Date: Mon, 13 Mar 2023 09:16:31 +0000
+Subject: [PATCH] package/freescale-imx/imx-gpu-viv: enable aarch64 framebuffer
+ support
+
+Back when the imx-gpu-viv package was enabled on AArch64 in commit
+84afda9ca6dad5fd828ba94fa60df52c81cc7814, the fb output option was not
+enabled.
+
+However, according to meta-freescale [0] the framebuffer output can be
+enabled on IMX8 by using the wayland libraries together with egl.pc.
+
+[0] https://git.yoctoproject.org/meta-freescale/tree/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
+
+This commit does enable fb output on AArch64, which requires a few
+precautions as the imx-gpu-viv logic is a bit convoluted:
+
+- FB on ARM is supported using "pure" framebuffer libraries. However,
+  a specific egl.pc is needed: egl_linuxfb.pc. The supporting
+  libraries are found in the fb/ subdirectory in imx-gpu-viv "code".
+
+- FB on AArch64 is supported using libraries that are linked with
+  wayland and libdrm, even though wayland/libdrm is obviously not used
+  for framebuffer output. pkg-config wise, this configuration can use
+  the default egl.pc. The supporting libraries are found in the
+  wayland/ subdirectory in imx-gpu-viv "code", as oddly as it seems.
+
+- Wayland on ARM on AArch64 is supported using libraries that are
+  obviously linked against wayland and libdrm. pkg-config wise, egl.pc
+  needs to be symlinked to egl_wayland.pc.
+
+This patch solves this situation by introducing a hidden boolean
+option BR2_PACKAGE_IMX_GPU_VIV_USES_WAYLAND that indicates whether
+wayland/libdrm is used by the currently selected output. This is of
+course true when BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL, but also when
+BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_FB on AArch64.
+
+Signed-off-by: Daniel Lang <d....@ab...>
+[Thomas: quite significant rework compared to the submission from
+Daniel Lang, so we didn't keep the Reviewed-by from Gary Bisson]
+Signed-off-by: Thomas Petazzoni <tho...@bo...>
+---
+ package/freescale-imx/imx-gpu-viv/Config.in   | 17 +++++++++-----
+ .../freescale-imx/imx-gpu-viv/imx-gpu-viv.mk  | 22 +++++++++++--------
+ 2 files changed, 24 insertions(+), 15 deletions(-)
+
+diff --git a/package/freescale-imx/imx-gpu-viv/Config.in b/package/freescale-imx/imx-gpu-viv/Config.in
+index 0a1be6ec13be..392f004787b6 100644
+--- a/package/freescale-imx/imx-gpu-viv/Config.in
++++ b/package/freescale-imx/imx-gpu-viv/Config.in
+@@ -12,9 +12,6 @@ config BR2_PACKAGE_IMX_GPU_VIV
+ 	depends on (BR2_arm && BR2_ARM_EABIHF) || BR2_aarch64
+ 	# Library binaries are linked against libc.so.6
+ 	depends on BR2_TOOLCHAIN_USES_GLIBC
+-	# Library binaries are linked against libdrm.so.2, except framebuffer
+-	# output on ARM
+-	select BR2_PACKAGE_LIBDRM if !(BR2_arm && BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_FB)
+ 	select BR2_PACKAGE_HAS_LIBEGL
+ 	select BR2_PACKAGE_HAS_LIBGLES
+ 	# gbm is only available in the aarch64 blobs
+@@ -34,6 +31,13 @@ config BR2_PACKAGE_IMX_GPU_VIV
+ 	  This library is provided by Freescale as-is and doesn't have
+ 	  an upstream.
+ 
++# Library binaries are linked against libdrm.so.2 and libwayland,
++# except framebuffer output on ARM
++config BR2_PACKAGE_IMX_GPU_VIV_USES_WAYLAND
++	bool
++	select BR2_PACKAGE_LIBDRM
++	select BR2_PACKAGE_WAYLAND
++
+ if BR2_PACKAGE_IMX_GPU_VIV
+ 
+ choice
+@@ -45,12 +49,13 @@ choice
+ 
+ config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_FB
+ 	bool "Framebuffer"
+-	# The i.MX8 aarch64 blob doesn't support FB output
+-	depends on BR2_arm
++	# Yes, the ARM64 framebuffer libraries link against
++	# libdrm/libwayland.
++	select BR2_PACKAGE_IMX_GPU_VIV_USES_WAYLAND if BR2_aarch64
+ 
+ config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL
+ 	bool "Wayland"
+-	select BR2_PACKAGE_WAYLAND
++	select BR2_PACKAGE_IMX_GPU_VIV_USES_WAYLAND
+ 
+ endchoice
+ 
+diff --git a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk
+index 14bcbb99d341..8494e875e20d 100644
+--- a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk
++++ b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk
+@@ -27,20 +27,24 @@ endif
+ 
+ IMX_GPU_VIV_OUTPUT = $(call qstrip,$(BR2_PACKAGE_IMX_GPU_VIV_OUTPUT))
+ 
+-# Libraries are linked against libdrm, except framebuffer output on ARM
+-ifneq ($(IMX_GPU_VIV_OUTPUT)$(BR2_arm),fby)
+-IMX_GPU_VIV_DEPENDENCIES += libdrm
+-endif
+-
+-ifeq ($(IMX_GPU_VIV_OUTPUT),wayland)
+-IMX_GPU_VIV_DEPENDENCIES += wayland
++ifeq ($(BR2_PACKAGE_IMX_GPU_VIV_USES_WAYLAND),y)
++IMX_GPU_VIV_DEPENDENCIES += libdrm wayland
++IMX_GPU_VIV_LIBDIR = wayland
++else
++IMX_GPU_VIV_LIBDIR = fb
+ endif
+ 
+ define IMX_GPU_VIV_EXTRACT_CMDS
+ 	$(call NXP_EXTRACT_HELPER,$(IMX_GPU_VIV_DL_DIR)/$(IMX_GPU_VIV_SOURCE))
+ endef
+ 
+-ifeq ($(IMX_GPU_VIV_OUTPUT),fb)
++# The package comes with multiple versions of egl.pc,
++# depending on the output the original egl.pc is replaced
++# with a symlink:
++# - arm/frambuffer: symlink to egl_linuxfb.pc
++# - aarch64/framebuffer: original egl.pc without a symlink
++# - wayland: symblink to egl_wayland.pc
++ifeq ($(IMX_GPU_VIV_OUTPUT):$(BR2_arm),fb:y)
+ define IMX_GPU_VIV_FIXUP_PKGCONFIG
+ 	ln -sf egl_linuxfb.pc $(@D)/gpu-core/usr/lib/pkgconfig/egl.pc
+ endef
+@@ -61,7 +65,7 @@ endif
+ # in the upstream archive here. We also remove unused backend files.
+ # Make sure these commands are idempotent.
+ define IMX_GPU_VIV_BUILD_CMDS
+-	cp -dpfr $(@D)/gpu-core/usr/lib/$(IMX_GPU_VIV_OUTPUT)/* $(@D)/gpu-core/usr/lib/
++	cp -dpfr $(@D)/gpu-core/usr/lib/$(IMX_GPU_VIV_LIBDIR)/* $(@D)/gpu-core/usr/lib/
+ 	$(foreach backend,fb wayland, \
+ 		$(RM) -r $(@D)/gpu-core/usr/lib/$(backend)
+ 	)
+-- 
+2.49.1
+
diff --git a/patches/buildroot/2025.02/0464-package-freescale-imx-firmware-ele-imx-bump-to-versi.patch b/patches/buildroot/2025.02/0486-package-freescale-imx-firmware-ele-imx-bump-to-versi.patch
similarity index 60%
copy from patches/buildroot/2025.02/0464-package-freescale-imx-firmware-ele-imx-bump-to-versi.patch
copy to patches/buildroot/2025.02/0486-package-freescale-imx-firmware-ele-imx-bump-to-versi.patch
index 0354b67a9..6b34e39d5 100644
--- a/patches/buildroot/2025.02/0464-package-freescale-imx-firmware-ele-imx-bump-to-versi.patch
+++ b/patches/buildroot/2025.02/0486-package-freescale-imx-firmware-ele-imx-bump-to-versi.patch
@@ -1,17 +1,17 @@
-From 7dcf8ab96db5d61ab9a5736599a689092a8cb3ee Mon Sep 17 00:00:00 2001
+From 876bf555fe78c65e9f155db0ab345b045548df79 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
  <seb...@ar...>
-Date: Fri, 2 May 2025 15:43:21 +0200
-Subject: [PATCH 464/468] package/freescale-imx/firmware-ele-imx: bump to
- version 2.0.1
+Date: Thu, 16 Oct 2025 17:56:14 +0200
+Subject: [PATCH 486/487] package/freescale-imx/firmware-ele-imx: bump to
+ version 2.0.3
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
-This version is aligned with NXP Linux BSP version "lf-6.12.3-1.0.0".
+This version is aligned with NXP Linux BSP version "lf-6.12.34-2.1.0".
 
 License hashes changed because the LA_OPT_NXP_Software_License changed
-from "v57 July 2024" to "v58 November 2024".
+from "v58 November 2024" to "v63 May 2025".
 
 Signed-off-by: Sébastien Szymanski <seb...@ar...>
 ---
@@ -20,33 +20,33 @@ Signed-off-by: Sébastien Szymanski <seb...@ar...>
  2 files changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.hash b/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.hash
-index 6182dc57be82..55e1864e31e6 100644
+index 55e1864e31e6..2d941c5e375e 100644
 --- a/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.hash
 +++ b/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.hash
 @@ -1,5 +1,5 @@
  # Locally calculated
--sha256  8791109824767346237e53ac2c712824e54608e2092859161e6bb3e5385a7595  firmware-ele-imx-1.3.0-17945fc.bin
--sha256  601fa790c5b4d03579bd182fb4d65a6f329a32faf49db22f98e4608221e861f7  COPYING
--sha256  c3d9a7b2a5a7db5da690e9c1081b98b665802c3efbbba7fb237339395a92f607  EULA
-+sha256  a2f16e43e8aff9cf018d0962b70313940f77079b314331ab3980c4c5f44249cb  firmware-ele-imx-2.0.1-0a66c34.bin
-+sha256  3f4a12c82a84bd1c3578c9c986d6371a61d3399525e76288ecbbae01daf0ae26  COPYING
-+sha256  38f1408d6e935c564efd9119c313269e643c1a85cab1d930c3c5bd70bc261769  EULA
+-sha256  a2f16e43e8aff9cf018d0962b70313940f77079b314331ab3980c4c5f44249cb  firmware-ele-imx-2.0.1-0a66c34.bin
+-sha256  3f4a12c82a84bd1c3578c9c986d6371a61d3399525e76288ecbbae01daf0ae26  COPYING
+-sha256  38f1408d6e935c564efd9119c313269e643c1a85cab1d930c3c5bd70bc261769  EULA
++sha256  e0bb78c94c04b771ca63bc530db7fb06e8a6415fc1c258f47f92952a39dd94a3  firmware-ele-imx-2.0.3-286c884.bin
++sha256  3001cf84018c5cb10d183a678f6ec8a928c797616ba06b398d7ca93c0779aaa2  COPYING
++sha256  a829b109a0a406a6a2fec19975a332feca225098ce66bfab2220c6608db8fce5  EULA
  sha256  8721a617a5d4c7f366aaf857ebda21eb4c9fc9175dc92b70f627c611d403ec8e  SCR.txt
 diff --git a/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.mk b/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.mk
-index 4225805d5023..8f25f4b5b537 100644
+index 8f25f4b5b537..b7ed9b7301fa 100644
 --- a/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.mk
 +++ b/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.mk
 @@ -4,8 +4,8 @@
  #
  ################################################################################
  
--FIRMWARE_ELE_IMX_VERSION = 1.3.0
--FIRMWARE_ELE_IMX_REVISION = 17945fc
-+FIRMWARE_ELE_IMX_VERSION = 2.0.1
-+FIRMWARE_ELE_IMX_REVISION = 0a66c34
+-FIRMWARE_ELE_IMX_VERSION = 2.0.1
+-FIRMWARE_ELE_IMX_REVISION = 0a66c34
++FIRMWARE_ELE_IMX_VERSION = 2.0.3
++FIRMWARE_ELE_IMX_REVISION = 286c884
  FIRMWARE_ELE_IMX_SITE = $(FREESCALE_IMX_SITE)
  FIRMWARE_ELE_IMX_SOURCE = firmware-ele-imx-$(FIRMWARE_ELE_IMX_VERSION)-$(FIRMWARE_ELE_IMX_REVISION).bin
  
 -- 
-2.49.0
+2.49.1
 
diff --git a/patches/buildroot/2025.02/0462-package-freescale-imx-firmware-imx-bump-version-to-8.patch b/patches/buildroot/2025.02/0487-package-freescale-imx-firmware-imx-bump-version-to-8.patch
similarity index 50%
copy from patches/buildroot/2025.02/0462-package-freescale-imx-firmware-imx-bump-version-to-8.patch
copy to patches/buildroot/2025.02/0487-package-freescale-imx-firmware-imx-bump-version-to-8.patch
index 90e404f26..3187a3497 100644
--- a/patches/buildroot/2025.02/0462-package-freescale-imx-firmware-imx-bump-version-to-8.patch
+++ b/patches/buildroot/2025.02/0487-package-freescale-imx-firmware-imx-bump-version-to-8.patch
@@ -1,52 +1,53 @@
-From 3da26212c36d8d3615ae42aeae8ad5ee49cbc8b4 Mon Sep 17 00:00:00 2001
+From d88b668f30be0035ac69fb8a40d2c3b5086858fc Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
  <seb...@ar...>
-Date: Fri, 2 May 2025 15:07:05 +0200
-Subject: [PATCH 462/468] package/freescale-imx/firmware-imx: bump version to
- 8.27
+Date: Thu, 16 Oct 2025 18:57:41 +0200
+Subject: [PATCH 487/487] package/freescale-imx/firmware-imx: bump version to
+ 8.29
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
-This version is aligned with NXP Linux BSP version "lf-6.12.3-1.0.0".
+This version is aligned with NXP Linux BSP version "lf-6.12.34-2.1.0".
 
 License hashes changed because the LA_OPT_NXP_Software_License changed
-from "v57 July 2024" to "v58 November 2024".
+from "v58 November 2024" to "v63 May 2025".
 
 Signed-off-by: Sébastien Szymanski <seb...@ar...>
 ---
- package/freescale-imx/firmware-imx/firmware-imx.hash | 6 +++---
+ package/freescale-imx/firmware-imx/firmware-imx.hash | 8 ++++----
  package/freescale-imx/firmware-imx/firmware-imx.mk   | 4 ++--
- 2 files changed, 5 insertions(+), 5 deletions(-)
+ 2 files changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/package/freescale-imx/firmware-imx/firmware-imx.hash b/package/freescale-imx/firmware-imx/firmware-imx.hash
-index 606075c85eb1..13e9e1a87ba9 100644
+index 13e9e1a87ba9..9022475679d7 100644
 --- a/package/freescale-imx/firmware-imx/firmware-imx.hash
 +++ b/package/freescale-imx/firmware-imx/firmware-imx.hash
 @@ -1,5 +1,5 @@
  # Locally calculated
--sha256  b2fcf84a0417678aa441b1bcde9ece467f8bd063a63d8390684f8e37768d84cf  firmware-imx-8.26-d4c33ab.bin
--sha256  601fa790c5b4d03579bd182fb4d65a6f329a32faf49db22f98e4608221e861f7  COPYING
--sha256  c3d9a7b2a5a7db5da690e9c1081b98b665802c3efbbba7fb237339395a92f607  EULA
-+sha256  61f925e606ab020b1a36f3f7f7e459c6847f5b9dbc79421f9ef86e8fc124eb2f  firmware-imx-8.27-5af0ceb.bin
-+sha256  3f4a12c82a84bd1c3578c9c986d6371a61d3399525e76288ecbbae01daf0ae26  COPYING
-+sha256  38f1408d6e935c564efd9119c313269e643c1a85cab1d930c3c5bd70bc261769  EULA
- sha256  40d02f6d6b4e94d9307529408f372f5a9908cf3d156ec533a4e54274b40f271e  SCR.txt
+-sha256  61f925e606ab020b1a36f3f7f7e459c6847f5b9dbc79421f9ef86e8fc124eb2f  firmware-imx-8.27-5af0ceb.bin
+-sha256  3f4a12c82a84bd1c3578c9c986d6371a61d3399525e76288ecbbae01daf0ae26  COPYING
+-sha256  38f1408d6e935c564efd9119c313269e643c1a85cab1d930c3c5bd70bc261769  EULA
+-sha256  40d02f6d6b4e94d9307529408f372f5a9908cf3d156ec533a4e54274b40f271e  SCR.txt
++sha256  5be89eb8162c84eb45121192e69b73079a466ee6cabdabf3d874188fed60bb85  firmware-imx-8.29-8741a3b.bin
++sha256  3001cf84018c5cb10d183a678f6ec8a928c797616ba06b398d7ca93c0779aaa2  COPYING
++sha256  a829b109a0a406a6a2fec19975a332feca225098ce66bfab2220c6608db8fce5  EULA
++sha256  8721a617a5d4c7f366aaf857ebda21eb4c9fc9175dc92b70f627c611d403ec8e  SCR.txt
 diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk
-index 62077238a705..f8c9df1ccee9 100644
+index f8c9df1ccee9..0ca86ace0b03 100644
 --- a/package/freescale-imx/firmware-imx/firmware-imx.mk
 +++ b/package/freescale-imx/firmware-imx/firmware-imx.mk
 @@ -4,8 +4,8 @@
  #
  ################################################################################
  
--FIRMWARE_IMX_VERSION = 8.26
--FIRMWARE_IMX_REVISION = d4c33ab
-+FIRMWARE_IMX_VERSION = 8.27
-+FIRMWARE_IMX_REVISION = 5af0ceb
+-FIRMWARE_IMX_VERSION = 8.27
+-FIRMWARE_IMX_REVISION = 5af0ceb
++FIRMWARE_IMX_VERSION = 8.29
++FIRMWARE_IMX_REVISION = 8741a3b
  FIRMWARE_IMX_SITE = $(FREESCALE_IMX_SITE)
  FIRMWARE_IMX_SOURCE = firmware-imx-$(FIRMWARE_IMX_VERSION)-$(FIRMWARE_IMX_REVISION).bin
  
 -- 
-2.49.0
+2.49.1
 
diff --git a/patches/buildroot/2025.02/cleanup_buildroot.sh b/patches/buildroot/2025.02/cleanup_buildroot.sh
index e0a8fa813..c00b4a856 100755
--- a/patches/buildroot/2025.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2025.02/cleanup_buildroot.sh
@@ -37,6 +37,7 @@ rm -rf buildroot/package/freescale-imx/imx-codec/imx-codec.hash
 rm -rf buildroot/package/freescale-imx/imx-codec/imx-codec.mk
 rm -rf buildroot/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash
 rm -rf buildroot/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk
+rm -rf buildroot/package/freescale-imx/imx-gpu-viv/Config.in
 rm -rf buildroot/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash
 rm -rf buildroot/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk
 rm -rf buildroot/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.hash


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus/u-boot branch, armadeus-2024.01, updated. 118c7e58328c3f2da0cb992717750fecb9367ec9

[sszy <ss...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus/u-boot".

The branch, armadeus-2024.01 has been updated
       via  118c7e58328c3f2da0cb992717750fecb9367ec9 (commit)
      from  00180d4d497ad3e332f07c87bcfccd442895f349 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 118c7e58328c3f2da0cb992717750fecb9367ec9
Author: Sébastien Szymanski <seb...@ar...>
Date:   Mon Oct 20 15:29:26 2025 +0200

    configs: opos91: disable DM_THERMAL

-----------------------------------------------------------------------

Summary of changes:
 configs/opos91dev_defconfig       | 1 -
 configs/opos91dev_optee_defconfig | 1 -
 2 files changed, 2 deletions(-)

diff --git a/configs/opos91dev_defconfig b/configs/opos91dev_defconfig
index d997ea6b53..8bc9308216 100644
--- a/configs/opos91dev_defconfig
+++ b/configs/opos91dev_defconfig
@@ -150,7 +150,6 @@ CONFIG_FSL_LPUART=y
 CONFIG_SYSRESET=y
 CONFIG_SYSRESET_CMD_POWEROFF=y
 CONFIG_SYSRESET_PSCI=y
-CONFIG_DM_THERMAL=y
 CONFIG_USB=y
 # CONFIG_SPL_DM_USB is not set
 CONFIG_USB_EHCI_HCD=y
diff --git a/configs/opos91dev_optee_defconfig b/configs/opos91dev_optee_defconfig
index 528cf0a689..b502bad4ea 100644
--- a/configs/opos91dev_optee_defconfig
+++ b/configs/opos91dev_optee_defconfig
@@ -155,7 +155,6 @@ CONFIG_SYSRESET_PSCI=y
 CONFIG_TEE=y
 CONFIG_OPTEE=y
 # CONFIG_CHIMP_OPTEE is not set
-CONFIG_DM_THERMAL=y
 CONFIG_USB=y
 # CONFIG_SPL_DM_USB is not set
 CONFIG_USB_EHCI_HCD=y


hooks/post-receive
-- 
armadeus/u-boot

[Armadeus-commitlog] armadeus/u-boot branch, armadeus-2024.01, updated. 00180d4d497ad3e332f07c87bcfccd442895f349

[sszy <ss...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus/u-boot".

The branch, armadeus-2024.01 has been updated
       via  00180d4d497ad3e332f07c87bcfccd442895f349 (commit)
       via  4722d1d8575c49c0a6ba18a00511795a31bccce9 (commit)
      from  7abe2aa6e1aaf6e4ed8b07a2c0f4f3d4bfae6e39 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 00180d4d497ad3e332f07c87bcfccd442895f349
Author: Sébastien Szymanski <seb...@ar...>
Date:   Fri Oct 17 20:43:50 2025 +0200

    configs: add opos91dev_optee_defconfig

commit 4722d1d8575c49c0a6ba18a00511795a31bccce9
Author: Sébastien Szymanski <seb...@ar...>
Date:   Fri Oct 17 20:44:45 2025 +0200

    arm: CONFIG_IMX93_OPOS91 -> CONFIG_IMX91_OPOS91

-----------------------------------------------------------------------

Summary of changes:
 arch/arm/include/asm/mach-imx/optee.h                      |  2 +-
 arch/arm/mach-imx/imx9/soc.c                               |  4 ++--
 configs/{opos91dev_defconfig => opos91dev_optee_defconfig} | 14 ++++++++++----
 3 files changed, 13 insertions(+), 7 deletions(-)
 copy configs/{opos91dev_defconfig => opos91dev_optee_defconfig} (94%)

diff --git a/arch/arm/include/asm/mach-imx/optee.h b/arch/arm/include/asm/mach-imx/optee.h
index c2cb880f43..8dd02b25b4 100644
--- a/arch/arm/include/asm/mach-imx/optee.h
+++ b/arch/arm/include/asm/mach-imx/optee.h
@@ -5,7 +5,7 @@
 #ifndef __IMX_OPTEE_H__
 #define __IMX_OPTEE_H__
 
-#if defined(CONFIG_IMX93_OPOS91) || defined(CONFIG_IMX93_OPOS93)
+#if defined(CONFIG_IMX91_OPOS91) || defined(CONFIG_IMX93_OPOS93)
 #define OPTEE_SHM_SIZE 0x00200000
 #else
 #define OPTEE_SHM_SIZE 0x00400000
diff --git a/arch/arm/mach-imx/imx9/soc.c b/arch/arm/mach-imx/imx9/soc.c
index 50c75e2eaa..4344d68083 100644
--- a/arch/arm/mach-imx/imx9/soc.c
+++ b/arch/arm/mach-imx/imx9/soc.c
@@ -318,7 +318,7 @@ static struct mm_region imx93_mem_map[] = {
 	}, {
 		/* DRAM1 */
 		/* OPTEE uses 32MB at the start of the DRAM */
-#if defined(CONFIG_OPTEE) && (defined(CONFIG_IMX93_OPOS91) || defined(CONFIG_IMX93_OPOS93))
+#if defined(CONFIG_OPTEE) && (defined(CONFIG_IMX91_OPOS91) || defined(CONFIG_IMX93_OPOS93))
 		.virt = 0x82000000UL,
 		.phys = 0x82000000UL,
 		.size = PHYS_SDRAM_SIZE - 0x02000000,
@@ -445,7 +445,7 @@ int dram_init_banksize(void)
 		sdram_b2_size = 0;
 	}
 
-	if (IS_ENABLED(CONFIG_IMX93_OPOS91) || IS_ENABLED(CONFIG_IMX93_OPOS93)) {
+	if (IS_ENABLED(CONFIG_IMX91_OPOS91) || IS_ENABLED(CONFIG_IMX93_OPOS93)) {
 		gd->bd->bi_dram[bank].start = PHYS_SDRAM + rom_pointer[1];
 		gd->bd->bi_dram[bank].size = sdram_b1_size - rom_pointer[1];
 	} else {
diff --git a/configs/opos91dev_defconfig b/configs/opos91dev_optee_defconfig
similarity index 94%
copy from configs/opos91dev_defconfig
copy to configs/opos91dev_optee_defconfig
index d997ea6b53..528cf0a689 100644
--- a/configs/opos91dev_defconfig
+++ b/configs/opos91dev_optee_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_ARCH_IMX9=y
-CONFIG_TEXT_BASE=0x80200000
+CONFIG_TEXT_BASE=0x82000000
 CONFIG_SYS_MALLOC_LEN=0x2000000
 CONFIG_SYS_MALLOC_F_LEN=0x18000
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
@@ -21,9 +21,10 @@ CONFIG_SPL_STACK=0x204E0000
 CONFIG_SPL_SYS_MALLOC_F_LEN=0x2000
 CONFIG_SPL=y
 CONFIG_ENV_OFFSET_REDUND=0x20000
+CONFIG_IMX_ELE_DEK_ENCAP=y
 CONFIG_SPL_IMX_ROMAPI_LOADADDR=0x88000000
-CONFIG_SYS_LOAD_ADDR=0x80400000
-CONFIG_SYS_MEMTEST_START=0x80000000
+CONFIG_SYS_LOAD_ADDR=0x82000000
+CONFIG_SYS_MEMTEST_START=0x82000000
 CONFIG_SYS_MEMTEST_END=0x90000000
 CONFIG_REMAKE_ELF=y
 # CONFIG_ANDROID_BOOT_IMAGE is not set
@@ -112,7 +113,7 @@ CONFIG_CPU_IMX=y
 CONFIG_SAVED_DRAM_TIMING_BASE=0x2049C000
 CONFIG_IMX9_LPDDR4X=y
 CONFIG_USB_FUNCTION_FASTBOOT=y
-CONFIG_FASTBOOT_BUF_ADDR=0x80400000
+CONFIG_FASTBOOT_BUF_ADDR=0x82000000
 CONFIG_FASTBOOT_BUF_SIZE=0x1E000000
 CONFIG_FASTBOOT_FLASH=y
 CONFIG_FASTBOOT_UUU_SUPPORT=y
@@ -143,6 +144,7 @@ CONFIG_PINCTRL_IMX93=y
 CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
+CONFIG_DM_RNG=y
 CONFIG_DM_RTC=y
 CONFIG_RTC_EMULATION=y
 CONFIG_DM_SERIAL=y
@@ -150,6 +152,9 @@ CONFIG_FSL_LPUART=y
 CONFIG_SYSRESET=y
 CONFIG_SYSRESET_CMD_POWEROFF=y
 CONFIG_SYSRESET_PSCI=y
+CONFIG_TEE=y
+CONFIG_OPTEE=y
+# CONFIG_CHIMP_OPTEE is not set
 CONFIG_DM_THERMAL=y
 CONFIG_USB=y
 # CONFIG_SPL_DM_USB is not set
@@ -169,3 +174,4 @@ CONFIG_ULP_WATCHDOG=y
 CONFIG_WDT=y
 CONFIG_LZO=y
 CONFIG_BZIP2=y
+# CONFIG_OPTEE_LIB is not set


hooks/post-receive
-- 
armadeus/u-boot

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-494-g34f8da0f7

[sszy <ss...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  34f8da0f7243d20cff4ff99fad0d3f6e46cce576 (commit)
      from  63db7aacb581625e3ea242d51e04c465f1cb9c4e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 34f8da0f7243d20cff4ff99fad0d3f6e46cce576
Author: Sébastien Szymanski <seb...@ar...>
Date:   Thu Sep 11 10:46:26 2025 +0200

    [BUILDROOT] Bump to BR 2025.02.6

-----------------------------------------------------------------------

Summary of changes:
 Makefile                                           |  2 +-
 ...hon-numpy-fix-build-with-python-cython-3..patch | 78 ----------------------
 patches/buildroot/2025.02/cleanup_buildroot.sh     |  1 -
 3 files changed, 1 insertion(+), 80 deletions(-)
 delete mode 100644 patches/buildroot/2025.02/0480-package-python-numpy-fix-build-with-python-cython-3..patch

diff --git a/Makefile b/Makefile
index e2ef703b6..4a1d5d680 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ export ARMADEUS_TOPDIR
 
 #--- User configurable stuff:
 BUILDROOT_MAJOR_VERSION ?= 2025.02
-BUILDROOT_MINOR_VERSION ?= 5
+BUILDROOT_MINOR_VERSION ?= 6
 ifneq ($(strip $(BUILDROOT_MINOR_VERSION)),)
 BUILDROOT_VERSION := $(BUILDROOT_MAJOR_VERSION).$(BUILDROOT_MINOR_VERSION)
 else
diff --git a/patches/buildroot/2025.02/0480-package-python-numpy-fix-build-with-python-cython-3..patch b/patches/buildroot/2025.02/0480-package-python-numpy-fix-build-with-python-cython-3..patch
deleted file mode 100644
index 7f4749267..000000000
--- a/patches/buildroot/2025.02/0480-package-python-numpy-fix-build-with-python-cython-3..patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 7480dea7ab0102054f328099e8c680ef7415dc1a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
- <seb...@ar...>
-Date: Thu, 14 Aug 2025 13:49:17 +0200
-Subject: [PATCH 480/480] package/python-numpy: fix build with python-cython >=
- 3.1
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Since commit b536caaec0d8 ("package/python-cython: bump to version
-3.1.2"), python-numpy fails to build:
-
-Error compiling Cython file:
-------------------------------------------------------------
-...
-                np.issubdtype(cov.dtype, np.complexfloating)):
-            raise TypeError("mean and cov must not be complex")
-        if size is None:
-            shape = []
-        elif isinstance(size, (int, long, np.integer)):
-                                    ^
-------------------------------------------------------------
-numpy/random/_generator.pyx:3760:36: undeclared name not builtin: long
-
-Backport upstream patch to fix that build failure.
-
-Signed-off-by: Sébastien Szymanski <seb...@ar...>
----
-Backport to: 2025.05.x, 2025.02.x
----
- .../0001-MNT-do-not-use-long-type.patch       | 34 +++++++++++++++++++
- 1 file changed, 34 insertions(+)
- create mode 100644 package/python-numpy/0001-MNT-do-not-use-long-type.patch
-
-diff --git a/package/python-numpy/0001-MNT-do-not-use-long-type.patch b/package/python-numpy/0001-MNT-do-not-use-long-type.patch
-new file mode 100644
-index 000000000000..d813a4d51b26
---- /dev/null
-+++ b/package/python-numpy/0001-MNT-do-not-use-long-type.patch
-@@ -0,0 +1,34 @@
-+From 6dc2fd31f8a5a4ef502cb7734f004f5bce94e671 Mon Sep 17 00:00:00 2001
-+From: Thomas A Caswell <tca...@gm...>
-+Date: Sat, 18 Nov 2023 16:46:52 -0500
-+Subject: [PATCH] MNT: do not use `long` type
-+MIME-Version: 1.0
-+Content-Type: text/plain; charset=UTF-8
-+Content-Transfer-Encoding: 8bit
-+
-+Removed as type at language level 3 in ed7e95912b6ed7d20e190fbf1aecb9f2a997d479
-+in cython
-+
-+Upstream: https://github.com/numpy/numpy/commit/6dc2fd31f8a5a4ef502cb7734f004f5bce94e671
-+
-+Signed-off-by: Sébastien Szymanski <seb...@ar...>
-+---
-+ numpy/random/_generator.pyx | 2 +-
-+ 1 file changed, 1 insertion(+), 1 deletion(-)
-+
-+diff --git a/numpy/random/_generator.pyx b/numpy/random/_generator.pyx
-+index d067e795eb5c..ae481d69d696 100644
-+--- a/numpy/random/_generator.pyx
-++++ b/numpy/random/_generator.pyx
-+@@ -3757,7 +3757,7 @@ def multivariate_normal(self, mean, cov, size=None, check_valid='warn',
-+ 
-+         if size is None:
-+             shape = []
-+-        elif isinstance(size, (int, long, np.integer)):
-++        elif isinstance(size, (int, np.integer)):
-+             shape = [size]
-+         else:
-+             shape = size
-+-- 
-+2.49.1
-+
--- 
-2.49.1
-
diff --git a/patches/buildroot/2025.02/cleanup_buildroot.sh b/patches/buildroot/2025.02/cleanup_buildroot.sh
index c14992816..e0a8fa813 100755
--- a/patches/buildroot/2025.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2025.02/cleanup_buildroot.sh
@@ -99,7 +99,6 @@ rm -rf buildroot/package/pwmmusic/pwmmusic.mk
 rm -rf buildroot/package/python-flask-socketio/Config.in
 rm -rf buildroot/package/python-flask-socketio/python-flask-socketio.hash
 rm -rf buildroot/package/python-flask-socketio/python-flask-socketio.mk
-rm -rf buildroot/package/python-numpy/0001-MNT-do-not-use-long-type.patch
 rm -rf buildroot/package/pywebradio/Config.in
 rm -rf buildroot/package/pywebradio/pywebradio.mk
 rm -rf buildroot/package/quake-pak/Config.in


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-493-g63db7aacb

[sszy <ss...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  63db7aacb581625e3ea242d51e04c465f1cb9c4e (commit)
      from  a7142084ca3bc41e74da67cffdfb79bd84a82c66 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 63db7aacb581625e3ea242d51e04c465f1cb9c4e
Author: Sébastien Szymanski <seb...@ar...>
Date:   Thu Sep 11 10:26:37 2025 +0200

    [LINUX] 4.19: refresh patches so they apply with --fuzz=0

-----------------------------------------------------------------------

Summary of changes:
 ...50-armadeus-add_custom_drivers_to_kconfig.patch | 20 +++---
 .../0703-armadeus-mxs-uart-add-rs485-support.patch | 42 ++++++------
 .../4.19/0704-armadeus-dts-apf6dev-add-rtc.patch   |  6 +-
 ...705-armadeus-dts-apf6dev-fix-dts-overload.patch | 12 ++--
 .../4.19/0706-armadeus-dts-apf6-add-mdio-bus.patch |  6 +-
 .../4.19/0707-armadeus-dts-apf6-fix-wifi.patch     |  6 +-
 ...6qdl-apf6-apf6dev-switch-boards-to-SPDX-i.patch | 24 +++----
 ...9-ARM-dts-add-Armadeus-APF6v2-SoM-support.patch | 24 +++----
 ...ts-imx6qdl-apf6-add-flow-control-to-uart2.patch | 13 ++--
 ...armadeus-dts-opos6uldev-LQ043-LCD-support.patch |  6 +-
 ...rmadeus-dts-opos6uldev-add-csi-pin-muxing.patch |  8 +--
 ...3-armadeus-brcmfmac-increase-boot-timeout.patch |  8 ++-
 ...adeus-dts-opos6uldev-add-sgtl5000-support.patch |  6 +-
 ...s-dts-opos6uldev-properly-mux-tampers-pin.patch | 76 +++++++++++-----------
 ...dts-opos6ulspdev-properly-mux-tampers-pin.patch | 38 +++++------
 ...adeus-dts-opos6ul-fix-i2c-clock-frequency.patch | 24 +++----
 ...-cpupower-fix-64bit-detection-when-cross-.patch | 26 ++++----
 ...-armadeus-opos6ulsp-fix-eeprom-compatible.patch |  6 +-
 ...low-setting-slot-index-via-device-tree-al.patch | 25 ++++---
 ...mc-core-Don-t-allocate-IDA-for-OF-aliases.patch |  6 +-
 20 files changed, 188 insertions(+), 194 deletions(-)

diff --git a/patches/linux/4.19/0050-armadeus-add_custom_drivers_to_kconfig.patch b/patches/linux/4.19/0050-armadeus-add_custom_drivers_to_kconfig.patch
index 9a1819812..ef516bc5d 100644
--- a/patches/linux/4.19/0050-armadeus-add_custom_drivers_to_kconfig.patch
+++ b/patches/linux/4.19/0050-armadeus-add_custom_drivers_to_kconfig.patch
@@ -1,25 +1,25 @@
 This patch adds the possibility to have custom Armadeus drivers built in kernel or compiled as modules.
 
-Index: linux-3.8-rc1/drivers/Kconfig
+Index: linux-headers-4.19.221/drivers/Kconfig
 ===================================================================
---- linux-3.8-rc1.orig/drivers/Kconfig	2012-12-22 02:19:00.000000000 +0100
-+++ linux-3.8-rc1/drivers/Kconfig	2013-01-02 20:28:02.000000000 +0100
-@@ -158,4 +158,6 @@
+--- linux-headers-4.19.221.orig/drivers/Kconfig
++++ linux-headers-4.19.221/drivers/Kconfig
+@@ -219,4 +219,6 @@ source "drivers/siox/Kconfig"
  
- source "drivers/ipack/Kconfig"
+ source "drivers/slimbus/Kconfig"
  
 +source "drivers/armadeus/Kconfig"
 +
  endmenu
-Index: linux-3.8-rc1/drivers/Makefile
+Index: linux-headers-4.19.221/drivers/Makefile
 ===================================================================
---- linux-3.8-rc1.orig/drivers/Makefile	2012-12-22 02:19:00.000000000 +0100
-+++ linux-3.8-rc1/drivers/Makefile	2013-01-02 20:28:02.000000000 +0100
-@@ -121,6 +121,7 @@
+--- linux-headers-4.19.221.orig/drivers/Makefile
++++ linux-headers-4.19.221/drivers/Makefile
+@@ -143,6 +143,7 @@ obj-$(CONFIG_DCA)		+= dca/
  obj-$(CONFIG_HID)		+= hid/
  obj-$(CONFIG_PPC_PS3)		+= ps3/
  obj-$(CONFIG_OF)		+= of/
 +obj-$(CONFIG_ARMADEUS_DRIVERS)	+= armadeus/
  obj-$(CONFIG_SSB)		+= ssb/
  obj-$(CONFIG_BCMA)		+= bcma/
- obj-$(CONFIG_VHOST_NET)		+= vhost/
+ obj-$(CONFIG_VHOST_RING)	+= vhost/
diff --git a/patches/linux/4.19/0703-armadeus-mxs-uart-add-rs485-support.patch b/patches/linux/4.19/0703-armadeus-mxs-uart-add-rs485-support.patch
index 10baad640..04d4c5fb5 100644
--- a/patches/linux/4.19/0703-armadeus-mxs-uart-add-rs485-support.patch
+++ b/patches/linux/4.19/0703-armadeus-mxs-uart-add-rs485-support.patch
@@ -1,8 +1,8 @@
-Index: linux-4.9.59/drivers/tty/serial/mxs-auart.c
+Index: linux-headers-4.19.221/drivers/tty/serial/mxs-auart.c
 ===================================================================
---- linux-4.9.59.orig/drivers/tty/serial/mxs-auart.c
-+++ linux-4.9.59/drivers/tty/serial/mxs-auart.c
-@@ -76,6 +76,7 @@
+--- linux-headers-4.19.221.orig/drivers/tty/serial/mxs-auart.c
++++ linux-headers-4.19.221/drivers/tty/serial/mxs-auart.c
+@@ -72,6 +72,7 @@
  
  #define AUART_CTRL1_XFER_COUNT(v)		((v) & 0xffff)
  
@@ -10,7 +10,7 @@ Index: linux-4.9.59/drivers/tty/serial/mxs-auart.c
  #define AUART_CTRL2_DMAONERR			(1 << 26)
  #define AUART_CTRL2_TXDMAE			(1 << 25)
  #define AUART_CTRL2_RXDMAE			(1 << 24)
-@@ -427,6 +428,7 @@ struct mxs_auart_port {
+@@ -424,6 +425,7 @@ struct mxs_auart_port {
  #define MXS_AUART_DMA_TX_SYNC	2  /* bit 2 */
  #define MXS_AUART_DMA_RX_READY	3  /* bit 3 */
  #define MXS_AUART_RTSCTS	4  /* bit 4 */
@@ -18,7 +18,7 @@ Index: linux-4.9.59/drivers/tty/serial/mxs-auart.c
  	unsigned long flags;
  	unsigned int mctrl_prev;
  	enum mxs_auart_type devtype;
-@@ -531,6 +533,8 @@ static void mxs_auart_stop_tx(struct uar
+@@ -528,6 +530,8 @@ static void mxs_auart_stop_tx(struct uar
  
  static void mxs_auart_tx_chars(struct mxs_auart_port *s);
  
@@ -27,7 +27,7 @@ Index: linux-4.9.59/drivers/tty/serial/mxs-auart.c
  static void dma_tx_callback(void *param)
  {
  	struct mxs_auart_port *s = param;
-@@ -583,6 +587,20 @@ static int mxs_auart_dma_tx(struct mxs_a
+@@ -580,6 +584,20 @@ static int mxs_auart_dma_tx(struct mxs_a
  	return 0;
  }
  
@@ -48,7 +48,7 @@ Index: linux-4.9.59/drivers/tty/serial/mxs-auart.c
  static void mxs_auart_tx_chars(struct mxs_auart_port *s)
  {
  	struct circ_buf *xmit = &s->port.state->xmit;
-@@ -614,6 +632,11 @@ static void mxs_auart_tx_chars(struct mx
+@@ -611,6 +629,11 @@ static void mxs_auart_tx_chars(struct mx
  		if (i) {
  			mxs_auart_dma_tx(s, i);
  		} else {
@@ -60,7 +60,7 @@ Index: linux-4.9.59/drivers/tty/serial/mxs-auart.c
  			clear_bit(MXS_AUART_DMA_TX_SYNC, &s->flags);
  			smp_mb__after_atomic();
  		}
-@@ -643,6 +666,21 @@ static void mxs_auart_tx_chars(struct mx
+@@ -640,6 +663,21 @@ static void mxs_auart_tx_chars(struct mx
  	else
  		mxs_set(AUART_INTR_TXIEN, s, REG_INTR);
  
@@ -82,7 +82,7 @@ Index: linux-4.9.59/drivers/tty/serial/mxs-auart.c
  	if (uart_tx_stopped(&s->port))
  		mxs_auart_stop_tx(&s->port);
  }
-@@ -739,19 +777,21 @@ static void mxs_auart_set_mctrl(struct u
+@@ -736,19 +774,21 @@ static void mxs_auart_set_mctrl(struct u
  {
  	struct mxs_auart_port *s = to_auart_port(u);
  
@@ -114,7 +114,7 @@ Index: linux-4.9.59/drivers/tty/serial/mxs-auart.c
  }
  
  #define MCTRL_ANY_DELTA        (TIOCM_RI | TIOCM_DSR | TIOCM_CD | TIOCM_CTS)
-@@ -1053,7 +1093,9 @@ static void mxs_auart_settermios(struct
+@@ -1052,7 +1092,9 @@ static void mxs_auart_settermios(struct
  
  	/* figure out the hardware flow control settings */
  	ctrl2 &= ~(AUART_CTRL2_CTSEN | AUART_CTRL2_RTSEN);
@@ -125,7 +125,7 @@ Index: linux-4.9.59/drivers/tty/serial/mxs-auart.c
  		/*
  		 * The DMA has a bug(see errata:2836) in mx23.
  		 * So we can not implement the DMA for auart in mx23,
-@@ -1092,6 +1134,9 @@ static void mxs_auart_settermios(struct
+@@ -1091,6 +1133,9 @@ static void mxs_auart_settermios(struct
  	ctrl |= AUART_LINECTRL_BAUD_DIVINT(div >> 6);
  	mxs_write(ctrl, s, REG_LINECTRL);
  
@@ -135,7 +135,7 @@ Index: linux-4.9.59/drivers/tty/serial/mxs-auart.c
  	mxs_write(ctrl2, s, REG_CTRL2);
  
  	uart_update_timeout(u, termios->c_cflag, baud);
-@@ -1287,6 +1332,12 @@ static void mxs_auart_start_tx(struct ua
+@@ -1286,6 +1331,12 @@ static void mxs_auart_start_tx(struct ua
  {
  	struct mxs_auart_port *s = to_auart_port(u);
  
@@ -148,7 +148,7 @@ Index: linux-4.9.59/drivers/tty/serial/mxs-auart.c
  	/* enable transmitter */
  	mxs_set(AUART_CTRL2_TXE, s, REG_CTRL2);
  
-@@ -1317,6 +1368,28 @@ static void mxs_auart_break_ctl(struct u
+@@ -1316,6 +1367,28 @@ static void mxs_auart_break_ctl(struct u
  		mxs_clr(AUART_LINECTRL_BRK, s, REG_LINECTRL);
  }
  
@@ -177,7 +177,7 @@ Index: linux-4.9.59/drivers/tty/serial/mxs-auart.c
  static const struct uart_ops mxs_auart_ops = {
  	.tx_empty       = mxs_auart_tx_empty,
  	.start_tx       = mxs_auart_start_tx,
-@@ -1575,6 +1648,9 @@ static int serial_mxs_probe_dt(struct mx
+@@ -1574,6 +1647,9 @@ static int serial_mxs_probe_dt(struct mx
  	    of_get_property(np, "fsl,uart-has-rtscts", NULL) /* deprecated */)
  		set_bit(MXS_AUART_RTSCTS, &s->flags);
  
@@ -187,7 +187,7 @@ Index: linux-4.9.59/drivers/tty/serial/mxs-auart.c
  	return 0;
  }
  
-@@ -1685,6 +1761,8 @@ static int mxs_auart_probe(struct platfo
+@@ -1695,6 +1771,8 @@ static int mxs_auart_probe(struct platfo
  	s->port.fifosize = MXS_AUART_FIFO_SIZE;
  	s->port.uartclk = clk_get_rate(s->clk);
  	s->port.type = PORT_IMX;
@@ -196,12 +196,12 @@ Index: linux-4.9.59/drivers/tty/serial/mxs-auart.c
  
  	mxs_init_regs(s);
  
-Index: linux-4.9.59/include/uapi/linux/serial.h
+Index: linux-headers-4.19.221/include/uapi/linux/serial.h
 ===================================================================
---- linux-4.9.59.orig/include/uapi/linux/serial.h
-+++ linux-4.9.59/include/uapi/linux/serial.h
-@@ -124,7 +124,8 @@ struct serial_rs485 {
- #define SER_RS485_RX_DURING_TX		(1 << 4)
+--- linux-headers-4.19.221.orig/include/uapi/linux/serial.h
++++ linux-headers-4.19.221/include/uapi/linux/serial.h
+@@ -128,7 +128,8 @@ struct serial_rs485 {
+ 							   (if supported) */
  	__u32	delay_rts_before_send;	/* Delay before send (milliseconds) */
  	__u32	delay_rts_after_send;	/* Delay after send (milliseconds) */
 -	__u32	padding[5];		/* Memory is cheap, new structs
diff --git a/patches/linux/4.19/0704-armadeus-dts-apf6dev-add-rtc.patch b/patches/linux/4.19/0704-armadeus-dts-apf6dev-add-rtc.patch
index 4c619f594..861950374 100644
--- a/patches/linux/4.19/0704-armadeus-dts-apf6dev-add-rtc.patch
+++ b/patches/linux/4.19/0704-armadeus-dts-apf6dev-add-rtc.patch
@@ -1,9 +1,9 @@
 Signed-off-by: Julien Boibessot <jul...@ar...>
 
-Index: linux-4.19.19/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+Index: linux-headers-4.19.221/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
 ===================================================================
---- linux-4.19.19.orig/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
-+++ linux-4.19.19/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+--- linux-headers-4.19.221.orig/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
++++ linux-headers-4.19.221/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
 @@ -205,6 +205,11 @@
  	pinctrl-0 = <&pinctrl_i2c2>;
  	status = "okay";
diff --git a/patches/linux/4.19/0705-armadeus-dts-apf6dev-fix-dts-overload.patch b/patches/linux/4.19/0705-armadeus-dts-apf6dev-fix-dts-overload.patch
index 899547d8c..eaeb7f753 100644
--- a/patches/linux/4.19/0705-armadeus-dts-apf6dev-fix-dts-overload.patch
+++ b/patches/linux/4.19/0705-armadeus-dts-apf6dev-fix-dts-overload.patch
@@ -2,10 +2,10 @@ Without this, impossible to overload pinctrl from APF6 SOM.
 
 Signed-off-by: Julien Boibessot <jul...@ar...>
 
-Index: linux-4.19.78/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+Index: linux-headers-4.19.221/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
 ===================================================================
---- linux-4.19.78.orig/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
-+++ linux-4.19.78/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+--- linux-headers-4.19.221.orig/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
++++ linux-headers-4.19.221/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
 @@ -302,178 +302,176 @@
  	pinctrl-names = "default";
  	pinctrl-0 = <&pinctrl_gpios>;
@@ -356,10 +356,10 @@ Index: linux-4.19.78/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
 +		>;
  	};
  };
-Index: linux-4.19.78/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+Index: linux-headers-4.19.221/arch/arm/boot/dts/imx6qdl-apf6.dtsi
 ===================================================================
---- linux-4.19.78.orig/arch/arm/boot/dts/imx6qdl-apf6.dtsi
-+++ linux-4.19.78/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+--- linux-headers-4.19.221.orig/arch/arm/boot/dts/imx6qdl-apf6.dtsi
++++ linux-headers-4.19.221/arch/arm/boot/dts/imx6qdl-apf6.dtsi
 @@ -94,65 +94,63 @@
  };
  
diff --git a/patches/linux/4.19/0706-armadeus-dts-apf6-add-mdio-bus.patch b/patches/linux/4.19/0706-armadeus-dts-apf6-add-mdio-bus.patch
index 9d57a6bb1..f0a2b859d 100644
--- a/patches/linux/4.19/0706-armadeus-dts-apf6-add-mdio-bus.patch
+++ b/patches/linux/4.19/0706-armadeus-dts-apf6-add-mdio-bus.patch
@@ -1,7 +1,7 @@
-Index: linux-4.19.78/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+Index: linux-headers-4.19.221/arch/arm/boot/dts/imx6qdl-apf6.dtsi
 ===================================================================
---- linux-4.19.78.orig/arch/arm/boot/dts/imx6qdl-apf6.dtsi
-+++ linux-4.19.78/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+--- linux-headers-4.19.221.orig/arch/arm/boot/dts/imx6qdl-apf6.dtsi
++++ linux-headers-4.19.221/arch/arm/boot/dts/imx6qdl-apf6.dtsi
 @@ -54,7 +54,21 @@
  	phy-mode = "rgmii";
  	phy-reset-duration = <10>;
diff --git a/patches/linux/4.19/0707-armadeus-dts-apf6-fix-wifi.patch b/patches/linux/4.19/0707-armadeus-dts-apf6-fix-wifi.patch
index 615369e82..032e5d7df 100644
--- a/patches/linux/4.19/0707-armadeus-dts-apf6-fix-wifi.patch
+++ b/patches/linux/4.19/0707-armadeus-dts-apf6-fix-wifi.patch
@@ -1,7 +1,7 @@
-Index: linux-4.19.78/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+Index: linux-headers-4.19.221/arch/arm/boot/dts/imx6qdl-apf6.dtsi
 ===================================================================
---- linux-4.19.78.orig/arch/arm/boot/dts/imx6qdl-apf6.dtsi
-+++ linux-4.19.78/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+--- linux-headers-4.19.221.orig/arch/arm/boot/dts/imx6qdl-apf6.dtsi
++++ linux-headers-4.19.221/arch/arm/boot/dts/imx6qdl-apf6.dtsi
 @@ -48,6 +48,24 @@
  #include <dt-bindings/gpio/gpio.h>
  #include <dt-bindings/interrupt-controller/irq.h>
diff --git a/patches/linux/4.19/0708-ARM-dts-imx6qdl-apf6-apf6dev-switch-boards-to-SPDX-i.patch b/patches/linux/4.19/0708-ARM-dts-imx6qdl-apf6-apf6dev-switch-boards-to-SPDX-i.patch
index e59f822c0..39bc32ec6 100644
--- a/patches/linux/4.19/0708-ARM-dts-imx6qdl-apf6-apf6dev-switch-boards-to-SPDX-i.patch
+++ b/patches/linux/4.19/0708-ARM-dts-imx6qdl-apf6-apf6dev-switch-boards-to-SPDX-i.patch
@@ -19,10 +19,10 @@ Signed-off-by: Sébastien Szymanski <seb...@ar...>
  arch/arm/boot/dts/imx6qdl-apf6dev.dtsi | 49 ++------------------------
  4 files changed, 12 insertions(+), 184 deletions(-)
 
-Index: linux-4.19.78/arch/arm/boot/dts/imx6dl-apf6dev.dts
+Index: linux-headers-4.19.221/arch/arm/boot/dts/imx6dl-apf6dev.dts
 ===================================================================
---- linux-4.19.78.orig/arch/arm/boot/dts/imx6dl-apf6dev.dts
-+++ linux-4.19.78/arch/arm/boot/dts/imx6dl-apf6dev.dts
+--- linux-headers-4.19.221.orig/arch/arm/boot/dts/imx6dl-apf6dev.dts
++++ linux-headers-4.19.221/arch/arm/boot/dts/imx6dl-apf6dev.dts
 @@ -1,49 +1,6 @@
 -/*
 - * Copyright 2015 Armadeus Systems
@@ -76,10 +76,10 @@ Index: linux-4.19.78/arch/arm/boot/dts/imx6dl-apf6dev.dts
  
  /dts-v1/;
  #include "imx6dl.dtsi"
-Index: linux-4.19.78/arch/arm/boot/dts/imx6q-apf6dev.dts
+Index: linux-headers-4.19.221/arch/arm/boot/dts/imx6q-apf6dev.dts
 ===================================================================
---- linux-4.19.78.orig/arch/arm/boot/dts/imx6q-apf6dev.dts
-+++ linux-4.19.78/arch/arm/boot/dts/imx6q-apf6dev.dts
+--- linux-headers-4.19.221.orig/arch/arm/boot/dts/imx6q-apf6dev.dts
++++ linux-headers-4.19.221/arch/arm/boot/dts/imx6q-apf6dev.dts
 @@ -1,49 +1,6 @@
 -/*
 - * Copyright 2015 Armadeus Systems
@@ -133,10 +133,10 @@ Index: linux-4.19.78/arch/arm/boot/dts/imx6q-apf6dev.dts
  
  /dts-v1/;
  #include "imx6q.dtsi"
-Index: linux-4.19.78/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+Index: linux-headers-4.19.221/arch/arm/boot/dts/imx6qdl-apf6.dtsi
 ===================================================================
---- linux-4.19.78.orig/arch/arm/boot/dts/imx6qdl-apf6.dtsi
-+++ linux-4.19.78/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+--- linux-headers-4.19.221.orig/arch/arm/boot/dts/imx6qdl-apf6.dtsi
++++ linux-headers-4.19.221/arch/arm/boot/dts/imx6qdl-apf6.dtsi
 @@ -1,49 +1,6 @@
 -/*
 - * Copyright 2015 Armadeus Systems
@@ -190,10 +190,10 @@ Index: linux-4.19.78/arch/arm/boot/dts/imx6qdl-apf6.dtsi
  
  #include <dt-bindings/gpio/gpio.h>
  #include <dt-bindings/interrupt-controller/irq.h>
-Index: linux-4.19.78/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+Index: linux-headers-4.19.221/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
 ===================================================================
---- linux-4.19.78.orig/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
-+++ linux-4.19.78/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+--- linux-headers-4.19.221.orig/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
++++ linux-headers-4.19.221/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
 @@ -1,49 +1,6 @@
 -/*
 - * Copyright 2015 Armadeus Systems
diff --git a/patches/linux/4.19/0709-ARM-dts-add-Armadeus-APF6v2-SoM-support.patch b/patches/linux/4.19/0709-ARM-dts-add-Armadeus-APF6v2-SoM-support.patch
index b05db80c6..c57a32d5d 100644
--- a/patches/linux/4.19/0709-ARM-dts-add-Armadeus-APF6v2-SoM-support.patch
+++ b/patches/linux/4.19/0709-ARM-dts-add-Armadeus-APF6v2-SoM-support.patch
@@ -22,10 +22,10 @@ Signed-off-by: Sébastien Szymanski <seb...@ar...>
  create mode 100644 arch/arm/boot/dts/imx6q-apf6v2dev.dts
  create mode 100644 arch/arm/boot/dts/imx6qdl-apf6v2.dtsi
 
-Index: linux-4.19.78/arch/arm/boot/dts/Makefile
+Index: linux-headers-4.19.221/arch/arm/boot/dts/Makefile
 ===================================================================
---- linux-4.19.78.orig/arch/arm/boot/dts/Makefile
-+++ linux-4.19.78/arch/arm/boot/dts/Makefile
+--- linux-headers-4.19.221.orig/arch/arm/boot/dts/Makefile
++++ linux-headers-4.19.221/arch/arm/boot/dts/Makefile
 @@ -385,6 +385,7 @@ dtb-$(CONFIG_SOC_IMX53) += \
  	imx53-voipac-bsb.dtb
  dtb-$(CONFIG_SOC_IMX6Q) += \
@@ -42,10 +42,10 @@ Index: linux-4.19.78/arch/arm/boot/dts/Makefile
  	imx6q-arm2.dtb \
  	imx6q-b450v3.dtb \
  	imx6q-b650v3.dtb \
-Index: linux-4.19.78/arch/arm/boot/dts/imx6dl-apf6v2dev.dts
+Index: linux-headers-4.19.221/arch/arm/boot/dts/imx6dl-apf6v2dev.dts
 ===================================================================
 --- /dev/null
-+++ linux-4.19.78/arch/arm/boot/dts/imx6dl-apf6v2dev.dts
++++ linux-headers-4.19.221/arch/arm/boot/dts/imx6dl-apf6v2dev.dts
 @@ -0,0 +1,18 @@
 +// SPDX-License-Identifier: GPL-2.0 OR X11
 +//
@@ -65,10 +65,10 @@ Index: linux-4.19.78/arch/arm/boot/dts/imx6dl-apf6v2dev.dts
 +		reg = <0x10000000 0x20000000>;
 +	};
 +};
-Index: linux-4.19.78/arch/arm/boot/dts/imx6q-apf6v2dev.dts
+Index: linux-headers-4.19.221/arch/arm/boot/dts/imx6q-apf6v2dev.dts
 ===================================================================
 --- /dev/null
-+++ linux-4.19.78/arch/arm/boot/dts/imx6q-apf6v2dev.dts
++++ linux-headers-4.19.221/arch/arm/boot/dts/imx6q-apf6v2dev.dts
 @@ -0,0 +1,22 @@
 +// SPDX-License-Identifier: GPL-2.0 OR X11
 +//
@@ -92,10 +92,10 @@ Index: linux-4.19.78/arch/arm/boot/dts/imx6q-apf6v2dev.dts
 +&sata {
 +	status = "okay";
 +};
-Index: linux-4.19.78/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+Index: linux-headers-4.19.221/arch/arm/boot/dts/imx6qdl-apf6.dtsi
 ===================================================================
---- linux-4.19.78.orig/arch/arm/boot/dts/imx6qdl-apf6.dtsi
-+++ linux-4.19.78/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+--- linux-headers-4.19.221.orig/arch/arm/boot/dts/imx6qdl-apf6.dtsi
++++ linux-headers-4.19.221/arch/arm/boot/dts/imx6qdl-apf6.dtsi
 @@ -71,6 +71,8 @@
  	wlcore: wlcore@2 {
  		compatible = "ti,wl1271";
@@ -126,10 +126,10 @@ Index: linux-4.19.78/arch/arm/boot/dts/imx6qdl-apf6.dtsi
 +		>;
 +	};
  };
-Index: linux-4.19.78/arch/arm/boot/dts/imx6qdl-apf6v2.dtsi
+Index: linux-headers-4.19.221/arch/arm/boot/dts/imx6qdl-apf6v2.dtsi
 ===================================================================
 --- /dev/null
-+++ linux-4.19.78/arch/arm/boot/dts/imx6qdl-apf6v2.dtsi
++++ linux-headers-4.19.221/arch/arm/boot/dts/imx6qdl-apf6v2.dtsi
 @@ -0,0 +1,27 @@
 +// SPDX-License-Identifier: GPL-2.0 OR X11
 +//
diff --git a/patches/linux/4.19/0710-ARM-dts-imx6qdl-apf6-add-flow-control-to-uart2.patch b/patches/linux/4.19/0710-ARM-dts-imx6qdl-apf6-add-flow-control-to-uart2.patch
index 5bacee5ad..743fc791a 100644
--- a/patches/linux/4.19/0710-ARM-dts-imx6qdl-apf6-add-flow-control-to-uart2.patch
+++ b/patches/linux/4.19/0710-ARM-dts-imx6qdl-apf6-add-flow-control-to-uart2.patch
@@ -15,11 +15,11 @@ Signed-off-by: Sébastien Szymanski <seb...@ar...>
  arch/arm/boot/dts/imx6qdl-apf6.dtsi | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/arch/arm/boot/dts/imx6qdl-apf6.dtsi b/arch/arm/boot/dts/imx6qdl-apf6.dtsi
-index a97f9766c361..f38421b6ea99 100644
---- a/arch/arm/boot/dts/imx6qdl-apf6.dtsi
-+++ b/arch/arm/boot/dts/imx6qdl-apf6.dtsi
-@@ -32,6 +32,7 @@
+Index: linux-headers-4.19.221/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+===================================================================
+--- linux-headers-4.19.221.orig/arch/arm/boot/dts/imx6qdl-apf6.dtsi
++++ linux-headers-4.19.221/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+@@ -50,6 +50,7 @@
  &uart2 {
  	pinctrl-names = "default";
  	pinctrl-0 = <&pinctrl_uart2>;
@@ -27,6 +27,3 @@ index a97f9766c361..f38421b6ea99 100644
  	status = "okay";
  };
  
--- 
-2.21.0
-
diff --git a/patches/linux/4.19/0800-armadeus-dts-opos6uldev-LQ043-LCD-support.patch b/patches/linux/4.19/0800-armadeus-dts-opos6uldev-LQ043-LCD-support.patch
index 3d8630ba0..168036053 100644
--- a/patches/linux/4.19/0800-armadeus-dts-opos6uldev-LQ043-LCD-support.patch
+++ b/patches/linux/4.19/0800-armadeus-dts-opos6uldev-LQ043-LCD-support.patch
@@ -1,8 +1,8 @@
 Signed-off-by: Julien BOIBESSOT <jul...@ar...>
-Index: linux-4.17-rc1/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
+Index: linux-headers-4.19.221/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
 ===================================================================
---- linux-4.17-rc1.orig/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
-+++ linux-4.17-rc1/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
+--- linux-headers-4.19.221.orig/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
++++ linux-headers-4.19.221/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
 @@ -185,7 +185,7 @@
  		bus-width = <18>;
  
diff --git a/patches/linux/4.19/0800-armadeus-dts-opos6uldev-add-csi-pin-muxing.patch b/patches/linux/4.19/0800-armadeus-dts-opos6uldev-add-csi-pin-muxing.patch
index 5c4a18676..31d0db83d 100644
--- a/patches/linux/4.19/0800-armadeus-dts-opos6uldev-add-csi-pin-muxing.patch
+++ b/patches/linux/4.19/0800-armadeus-dts-opos6uldev-add-csi-pin-muxing.patch
@@ -1,9 +1,9 @@
 Signed-off-by: Julien BOIBESSOT <jul...@ar...>
-Index: linux-4.17-rc1/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
+Index: linux-headers-4.19.221/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
 ===================================================================
---- linux-4.17-rc1.orig/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
-+++ linux-4.17-rc1/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
-@@ -269,6 +269,23 @@
+--- linux-headers-4.19.221.orig/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
++++ linux-headers-4.19.221/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
+@@ -253,6 +253,23 @@
  	pinctrl-names = "default";
  	pinctrl-0 = <&pinctrl_gpios>;
  
diff --git a/patches/linux/4.19/0803-armadeus-brcmfmac-increase-boot-timeout.patch b/patches/linux/4.19/0803-armadeus-brcmfmac-increase-boot-timeout.patch
index 4d2e878e4..3ba72b3de 100644
--- a/patches/linux/4.19/0803-armadeus-brcmfmac-increase-boot-timeout.patch
+++ b/patches/linux/4.19/0803-armadeus-brcmfmac-increase-boot-timeout.patch
@@ -5,9 +5,11 @@ to have a working Wi-Fi.
 
 Signed-off-by: Julien Boibessot <jul...@ar...>
 
---- linux-4.9.org/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c	2016-11-21 10:11:59.000000000 +0100
-+++ linux-4.9/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c	2017-12-14 12:48:41.017304966 +0100
-@@ -297,7 +297,7 @@
+Index: linux-headers-4.19.221/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
+===================================================================
+--- linux-headers-4.19.221.orig/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
++++ linux-headers-4.19.221/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
+@@ -305,7 +305,7 @@ struct rte_console {
   * max out at a 1 second (1000000us).
   */
  #undef PMU_MAX_TRANSITION_DLY
diff --git a/patches/linux/4.19/0804-armadeus-dts-opos6uldev-add-sgtl5000-support.patch b/patches/linux/4.19/0804-armadeus-dts-opos6uldev-add-sgtl5000-support.patch
index a95b6faff..8dac3fce7 100644
--- a/patches/linux/4.19/0804-armadeus-dts-opos6uldev-add-sgtl5000-support.patch
+++ b/patches/linux/4.19/0804-armadeus-dts-opos6uldev-add-sgtl5000-support.patch
@@ -1,7 +1,7 @@
-Index: linux-4.17.2/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
+Index: linux-headers-4.19.221/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
 ===================================================================
---- linux-4.17.2.orig/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
-+++ linux-4.17.2/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
+--- linux-headers-4.19.221.orig/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
++++ linux-headers-4.19.221/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
 @@ -91,6 +91,13 @@
  		gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>;
  	};
diff --git a/patches/linux/4.19/0806-armadeus-dts-opos6uldev-properly-mux-tampers-pin.patch b/patches/linux/4.19/0806-armadeus-dts-opos6uldev-properly-mux-tampers-pin.patch
index c38ae1ad5..88e09509a 100644
--- a/patches/linux/4.19/0806-armadeus-dts-opos6uldev-properly-mux-tampers-pin.patch
+++ b/patches/linux/4.19/0806-armadeus-dts-opos6uldev-properly-mux-tampers-pin.patch
@@ -1,11 +1,11 @@
-Index: linux-4.17.19/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
+Index: linux-headers-4.19.221/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
 ===================================================================
---- linux-4.17.19.orig/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
-+++ linux-4.17.19/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
+--- linux-headers-4.19.221.orig/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
++++ linux-headers-4.19.221/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
 @@ -377,14 +377,6 @@
-			MX6UL_PAD_UART1_CTS_B__GPIO1_IO18	0x0b0b0
-			MX6UL_PAD_UART1_RTS_B__GPIO1_IO19	0x0b0b0
-			MX6UL_PAD_NAND_WE_B__GPIO4_IO01		0x0b0b0
+ 			MX6UL_PAD_UART1_CTS_B__GPIO1_IO18	0x0b0b0
+ 			MX6UL_PAD_UART1_RTS_B__GPIO1_IO19	0x0b0b0
+ 			MX6UL_PAD_NAND_WE_B__GPIO4_IO01		0x0b0b0
 -			MX6UL_PAD_SNVS_TAMPER0__GPIO5_IO00	0x0b0b0
 -			MX6UL_PAD_SNVS_TAMPER2__GPIO5_IO02	0x0b0b0
 -			MX6UL_PAD_SNVS_TAMPER3__GPIO5_IO03	0x0b0b0
@@ -14,13 +14,13 @@ Index: linux-4.17.19/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
 -			MX6UL_PAD_SNVS_TAMPER6__GPIO5_IO06	0x0b0b0
 -			MX6UL_PAD_SNVS_TAMPER7__GPIO5_IO07	0x0b0b0
 -			MX6UL_PAD_SNVS_TAMPER8__GPIO5_IO08	0x0b0b0
-		>;
-	};
-
+ 		>;
+ 	};
+ 
 @@ -491,16 +483,4 @@
-			MX6UL_PAD_GPIO1_IO05__GPIO1_IO05	0x1b0b0
-		>;
-	};
+ 			MX6UL_PAD_GPIO1_IO05__GPIO1_IO05	0x1b0b0
+ 		>;
+ 	};
 -
 -	pinctrl_usbotg2_vbus: usbotg2vbusgrp {
 -		fsl,pins = <
@@ -34,13 +34,13 @@ Index: linux-4.17.19/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
 -		>;
 -	};
  };
-Index: linux-4.17.19/arch/arm/boot/dts/imx6ul-opos6uldev.dts
+Index: linux-headers-4.19.221/arch/arm/boot/dts/imx6ul-opos6uldev.dts
 ===================================================================
---- linux-4.17.19.orig/arch/arm/boot/dts/imx6ul-opos6uldev.dts
-+++ linux-4.17.19/arch/arm/boot/dts/imx6ul-opos6uldev.dts
+--- linux-headers-4.19.221.orig/arch/arm/boot/dts/imx6ul-opos6uldev.dts
++++ linux-headers-4.19.221/arch/arm/boot/dts/imx6ul-opos6uldev.dts
 @@ -54,3 +54,32 @@
-	model = "Armadeus Systems OPOS6UL SoM (i.MX6UL) on OPOS6ULDev board";
-	compatible = "armadeus,opos6uldev", "armadeus,opos6ul", "fsl,imx6ul";
+ 	model = "Armadeus Systems OPOS6UL SoM (i.MX6UL) on OPOS6ULDev board";
+ 	compatible = "armadeus,opos6uldev", "armadeus,opos6ul", "fsl,imx6ul";
  };
 +
 +&iomuxc {
@@ -71,13 +71,13 @@ Index: linux-4.17.19/arch/arm/boot/dts/imx6ul-opos6uldev.dts
 +		>;
 +	};
 +};
-Index: linux-4.17.19/arch/arm/boot/dts/imx6ull-opos6uldev.dts
+Index: linux-headers-4.19.221/arch/arm/boot/dts/imx6ull-opos6uldev.dts
 ===================================================================
---- linux-4.17.19.orig/arch/arm/boot/dts/imx6ull-opos6uldev.dts
-+++ linux-4.17.19/arch/arm/boot/dts/imx6ull-opos6uldev.dts
+--- linux-headers-4.19.221.orig/arch/arm/boot/dts/imx6ull-opos6uldev.dts
++++ linux-headers-4.19.221/arch/arm/boot/dts/imx6ull-opos6uldev.dts
 @@ -54,3 +54,33 @@
-	model = "Armadeus Systems OPOS6UL SoM (i.MX6ULL) on OPOS6ULDev board";
-	compatible = "armadeus,opos6uldev", "armadeus,opos6ul", "fsl,imx6ull";
+ 	model = "Armadeus Systems OPOS6UL SoM (i.MX6ULL) on OPOS6ULDev board";
+ 	compatible = "armadeus,opos6uldev", "armadeus,opos6ul", "fsl,imx6ull";
  };
 +
 +&iomuxc_snvs {
@@ -109,44 +109,44 @@ Index: linux-4.17.19/arch/arm/boot/dts/imx6ull-opos6uldev.dts
 +		>;
 +	};
 +};
-Index: linux-4.17.19/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev-dual-ethernet.dtsi
+Index: linux-headers-4.19.221/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev-dual-ethernet.dtsi
 ===================================================================
---- linux-4.17.19.orig/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev-dual-ethernet.dtsi
-+++ linux-4.17.19/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev-dual-ethernet.dtsi
+--- linux-headers-4.19.221.orig/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev-dual-ethernet.dtsi
++++ linux-headers-4.19.221/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev-dual-ethernet.dtsi
 @@ -45,8 +45,6 @@
   *     OTHER DEALINGS IN THE SOFTWARE.
   */
-
+ 
 -#include "imx6ul-imx6ull-opos6uldev.dtsi"
 -
  / {
-	/delete-node/ gpio-keys;
-	/delete-node/ sound;
-Index: linux-4.17.19/arch/arm/boot/dts/imx6ul-opos6uldev-dual-ethernet.dts
+ 	/delete-node/ gpio-keys;
+ 	/delete-node/ sound;
+Index: linux-headers-4.19.221/arch/arm/boot/dts/imx6ul-opos6uldev-dual-ethernet.dts
 ===================================================================
---- linux-4.17.19.orig/arch/arm/boot/dts/imx6ul-opos6uldev-dual-ethernet.dts
-+++ linux-4.17.19/arch/arm/boot/dts/imx6ul-opos6uldev-dual-ethernet.dts
+--- linux-headers-4.19.221.orig/arch/arm/boot/dts/imx6ul-opos6uldev-dual-ethernet.dts
++++ linux-headers-4.19.221/arch/arm/boot/dts/imx6ul-opos6uldev-dual-ethernet.dts
 @@ -46,8 +46,7 @@
   */
-
+ 
  /dts-v1/;
 -#include "imx6ul.dtsi"
 -#include "imx6ul-imx6ull-opos6ul.dtsi"
 +#include "imx6ul-opos6uldev.dts"
  #include "imx6ul-imx6ull-opos6uldev-dual-ethernet.dtsi"
-
+ 
  / {
-Index: linux-4.17.19/arch/arm/boot/dts/imx6ull-opos6uldev-dual-ethernet.dts
+Index: linux-headers-4.19.221/arch/arm/boot/dts/imx6ull-opos6uldev-dual-ethernet.dts
 ===================================================================
---- linux-4.17.19.orig/arch/arm/boot/dts/imx6ull-opos6uldev-dual-ethernet.dts
-+++ linux-4.17.19/arch/arm/boot/dts/imx6ull-opos6uldev-dual-ethernet.dts
+--- linux-headers-4.19.221.orig/arch/arm/boot/dts/imx6ull-opos6uldev-dual-ethernet.dts
++++ linux-headers-4.19.221/arch/arm/boot/dts/imx6ull-opos6uldev-dual-ethernet.dts
 @@ -46,8 +46,7 @@
   */
-
+ 
  /dts-v1/;
 -#include "imx6ull.dtsi"
 -#include "imx6ul-imx6ull-opos6ul.dtsi"
 +#include "imx6ull-opos6uldev.dts"
  #include "imx6ul-imx6ull-opos6uldev-dual-ethernet.dtsi"
-
+ 
  / {
diff --git a/patches/linux/4.19/0807-armadeus-dts-opos6ulspdev-properly-mux-tampers-pin.patch b/patches/linux/4.19/0807-armadeus-dts-opos6ulspdev-properly-mux-tampers-pin.patch
index 048046f46..7784734bc 100644
--- a/patches/linux/4.19/0807-armadeus-dts-opos6ulspdev-properly-mux-tampers-pin.patch
+++ b/patches/linux/4.19/0807-armadeus-dts-opos6ulspdev-properly-mux-tampers-pin.patch
@@ -1,11 +1,11 @@
-Index: linux-4.19.46/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulspdev.dtsi
+Index: linux-headers-4.19.221/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulspdev.dtsi
 ===================================================================
---- linux-4.19.46.orig/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulspdev.dtsi
-+++ linux-4.19.46/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulspdev.dtsi
+--- linux-headers-4.19.221.orig/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulspdev.dtsi
++++ linux-headers-4.19.221/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulspdev.dtsi
 @@ -210,15 +210,6 @@
-			MX6UL_PAD_ENET2_TX_CLK__GPIO2_IO14	0x1b0b0
-			MX6UL_PAD_ENET2_RX_ER__GPIO2_IO15	0x1b0b0
-			MX6UL_PAD_LCD_RESET__GPIO3_IO04		0x1b0b0
+ 			MX6UL_PAD_ENET2_TX_CLK__GPIO2_IO14	0x1b0b0
+ 			MX6UL_PAD_ENET2_RX_ER__GPIO2_IO15	0x1b0b0
+ 			MX6UL_PAD_LCD_RESET__GPIO3_IO04		0x1b0b0
 -			MX6UL_PAD_SNVS_TAMPER0__GPIO5_IO00	0x1b0b0
 -			MX6UL_PAD_SNVS_TAMPER2__GPIO5_IO02	0x1b0b0
 -			MX6UL_PAD_SNVS_TAMPER3__GPIO5_IO03	0x1b0b0
@@ -15,16 +15,16 @@ Index: linux-4.19.46/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulspdev.dtsi
 -			MX6UL_PAD_SNVS_TAMPER7__GPIO5_IO07	0x1b0b0
 -			MX6UL_PAD_SNVS_TAMPER8__GPIO5_IO08	0x1b0b0
 -			MX6UL_PAD_SNVS_TAMPER9__GPIO5_IO09	0x1b0b0
-		>;
-	};
-
-Index: linux-4.19.46/arch/arm/boot/dts/imx6ul-opos6ulspdev.dts
+ 		>;
+ 	};
+ 
+Index: linux-headers-4.19.221/arch/arm/boot/dts/imx6ul-opos6ulspdev.dts
 ===================================================================
---- linux-4.19.46.orig/arch/arm/boot/dts/imx6ul-opos6ulspdev.dts
-+++ linux-4.19.46/arch/arm/boot/dts/imx6ul-opos6ulspdev.dts
+--- linux-headers-4.19.221.orig/arch/arm/boot/dts/imx6ul-opos6ulspdev.dts
++++ linux-headers-4.19.221/arch/arm/boot/dts/imx6ul-opos6ulspdev.dts
 @@ -54,3 +54,22 @@
-	model = "Armadeus Systems OPOS6UL SP SoM (i.MX6UL) on OPOS6ULSPDev board";
-	compatible = "armadeus,opos6ulspdev", "armadeus,opos6ulsp", "fsl,imx6ul";
+ 	model = "Armadeus Systems OPOS6UL SP SoM (i.MX6UL) on OPOS6ULSPDev board";
+ 	compatible = "armadeus,opos6ulspdev", "armadeus,opos6ulsp", "fsl,imx6ul";
  };
 +
 +&iomuxc {
@@ -45,13 +45,13 @@ Index: linux-4.19.46/arch/arm/boot/dts/imx6ul-opos6ulspdev.dts
 +                >;
 +        };
 +};
-Index: linux-4.19.46/arch/arm/boot/dts/imx6ull-opos6ulspdev.dts
+Index: linux-headers-4.19.221/arch/arm/boot/dts/imx6ull-opos6ulspdev.dts
 ===================================================================
---- linux-4.19.46.orig/arch/arm/boot/dts/imx6ull-opos6ulspdev.dts
-+++ linux-4.19.46/arch/arm/boot/dts/imx6ull-opos6ulspdev.dts
+--- linux-headers-4.19.221.orig/arch/arm/boot/dts/imx6ull-opos6ulspdev.dts
++++ linux-headers-4.19.221/arch/arm/boot/dts/imx6ull-opos6ulspdev.dts
 @@ -54,3 +54,23 @@
-	model = "Armadeus Systems OPOS6UL SP SoM (i.MX6ULL) on OPOS6ULSPDev board";
-	compatible = "armadeus,opos6ulspdev", "armadeus,opos6ulsp", "fsl,imx6ull";
+ 	model = "Armadeus Systems OPOS6UL SP SoM (i.MX6ULL) on OPOS6ULSPDev board";
+ 	compatible = "armadeus,opos6ulspdev", "armadeus,opos6ulsp", "fsl,imx6ull";
  };
 +
 +&iomuxc_snvs {
diff --git a/patches/linux/4.19/0808-armadeus-dts-opos6ul-fix-i2c-clock-frequency.patch b/patches/linux/4.19/0808-armadeus-dts-opos6ul-fix-i2c-clock-frequency.patch
index 2582b0d4e..a75fac8a5 100644
--- a/patches/linux/4.19/0808-armadeus-dts-opos6ul-fix-i2c-clock-frequency.patch
+++ b/patches/linux/4.19/0808-armadeus-dts-opos6ul-fix-i2c-clock-frequency.patch
@@ -1,7 +1,7 @@
-Index: linux-4.19.93/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
+Index: linux-headers-4.19.221/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
 ===================================================================
---- linux-4.19.93.orig/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
-+++ linux-4.19.93/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
+--- linux-headers-4.19.221.orig/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
++++ linux-headers-4.19.221/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
 @@ -199,7 +199,7 @@
  &i2c1 {
  	pinctrl-names = "default";
@@ -20,10 +20,10 @@ Index: linux-4.19.93/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
  	status = "okay";
  };
  
-Index: linux-4.19.93/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulnanodev.dtsi
+Index: linux-headers-4.19.221/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulnanodev.dtsi
 ===================================================================
---- linux-4.19.93.orig/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulnanodev.dtsi
-+++ linux-4.19.93/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulnanodev.dtsi
+--- linux-headers-4.19.221.orig/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulnanodev.dtsi
++++ linux-headers-4.19.221/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulnanodev.dtsi
 @@ -86,14 +86,14 @@
  &i2c1 {
  	pinctrl-names = "default";
@@ -41,10 +41,10 @@ Index: linux-4.19.93/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulnanodev.dtsi
  	status = "okay";
  };
  
-Index: linux-4.19.93/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulsp.dtsi
+Index: linux-headers-4.19.221/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulsp.dtsi
 ===================================================================
---- linux-4.19.93.orig/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulsp.dtsi
-+++ linux-4.19.93/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulsp.dtsi
+--- linux-headers-4.19.221.orig/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulsp.dtsi
++++ linux-headers-4.19.221/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulsp.dtsi
 @@ -92,7 +92,7 @@
  &i2c4 {
  	pinctrl-names = "default";
@@ -54,10 +54,10 @@ Index: linux-4.19.93/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulsp.dtsi
  	status = "okay";
  
  	eeprom@50 {
-Index: linux-4.19.93/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulspdev.dtsi
+Index: linux-headers-4.19.221/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulspdev.dtsi
 ===================================================================
---- linux-4.19.93.orig/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulspdev.dtsi
-+++ linux-4.19.93/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulspdev.dtsi
+--- linux-headers-4.19.221.orig/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulspdev.dtsi
++++ linux-headers-4.19.221/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulspdev.dtsi
 @@ -96,7 +96,7 @@
  &i2c3 {
  	pinctrl-names = "default";
diff --git a/patches/linux/4.19/0809-tools-power-cpupower-fix-64bit-detection-when-cross-.patch b/patches/linux/4.19/0809-tools-power-cpupower-fix-64bit-detection-when-cross-.patch
index 57da394e7..ad1c45d7f 100644
--- a/patches/linux/4.19/0809-tools-power-cpupower-fix-64bit-detection-when-cross-.patch
+++ b/patches/linux/4.19/0809-tools-power-cpupower-fix-64bit-detection-when-cross-.patch
@@ -18,19 +18,19 @@ Signed-off-by: Sébastien Szymanski <seb...@ar...>
  tools/power/cpupower/Makefile | 14 ++++++++------
  1 file changed, 8 insertions(+), 6 deletions(-)
 
-diff --git a/tools/power/cpupower/Makefile b/tools/power/cpupower/Makefile
-index 9063fca480b3..c8622497ef23 100644
---- a/tools/power/cpupower/Makefile
-+++ b/tools/power/cpupower/Makefile
-@@ -18,7 +18,6 @@ OUTDIR := $(shell cd $(OUTPUT) && pwd)
+Index: linux-headers-4.19.221/tools/power/cpupower/Makefile
+===================================================================
+--- linux-headers-4.19.221.orig/tools/power/cpupower/Makefile
++++ linux-headers-4.19.221/tools/power/cpupower/Makefile
+@@ -30,7 +30,6 @@ OUTDIR := $(shell cd $(OUTPUT) && pwd)
  $(if $(OUTDIR),, $(error output directory "$(OUTPUT)" does not exist))
  endif
-
+ 
 -include ../../scripts/Makefile.arch
-
+ 
  # --- CONFIGURATION BEGIN ---
-
-@@ -69,11 +68,6 @@ bindir ?=	/usr/bin
+ 
+@@ -81,11 +80,6 @@ bindir ?=	/usr/bin
  sbindir ?=	/usr/sbin
  mandir ?=	/usr/man
  includedir ?=	/usr/include
@@ -42,10 +42,10 @@ index 9063fca480b3..c8622497ef23 100644
  localedir ?=	/usr/share/locale
  docdir ?=       /usr/share/doc/packages/cpupower
  confdir ?=      /etc/
-@@ -100,6 +94,14 @@ RANLIB = $(CROSS)ranlib
+@@ -110,6 +104,14 @@ RANLIB = $(CROSS)ranlib
  HOSTCC = gcc
  MKDIR = mkdir
-
+ 
 +# 64bit library detection
 +include ../../scripts/Makefile.arch
 +
@@ -54,8 +54,6 @@ index 9063fca480b3..c8622497ef23 100644
 +else
 +libdir ?=	/usr/lib
 +endif
-
+ 
  # Now we set up the build system
  #
---
-2.19.2
diff --git a/patches/linux/4.19/0810-armadeus-opos6ulsp-fix-eeprom-compatible.patch b/patches/linux/4.19/0810-armadeus-opos6ulsp-fix-eeprom-compatible.patch
index 796a2b1cc..4987761df 100644
--- a/patches/linux/4.19/0810-armadeus-opos6ulsp-fix-eeprom-compatible.patch
+++ b/patches/linux/4.19/0810-armadeus-opos6ulsp-fix-eeprom-compatible.patch
@@ -1,7 +1,7 @@
-Index: linux-4.19.169/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulsp.dtsi
+Index: linux-headers-4.19.221/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulsp.dtsi
 ===================================================================
---- linux-4.19.169.orig/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulsp.dtsi
-+++ linux-4.19.169/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulsp.dtsi
+--- linux-headers-4.19.221.orig/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulsp.dtsi
++++ linux-headers-4.19.221/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulsp.dtsi
 @@ -96,7 +96,7 @@
  	status = "okay";
  
diff --git a/patches/linux/4.19/0811-mmc-core-Allow-setting-slot-index-via-device-tree-al.patch b/patches/linux/4.19/0811-mmc-core-Allow-setting-slot-index-via-device-tree-al.patch
index 955526505..394ccac85 100644
--- a/patches/linux/4.19/0811-mmc-core-Allow-setting-slot-index-via-device-tree-al.patch
+++ b/patches/linux/4.19/0811-mmc-core-Allow-setting-slot-index-via-device-tree-al.patch
@@ -47,15 +47,14 @@ Signed-off-by: Ulf Hansson <ulf...@li...>
  drivers/mmc/core/host.c | 26 +++++++++++++++++++++++++-
  1 file changed, 25 insertions(+), 1 deletion(-)
 
-diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c
-index c8fae6611b73..96b2ca1f1b06 100644
---- a/drivers/mmc/core/host.c
-+++ b/drivers/mmc/core/host.c
-@@ -376,6 +376,20 @@ int mmc_of_parse_voltage(struct device_node *np, u32 *mask)
- }
- EXPORT_SYMBOL(mmc_of_parse_voltage);
+Index: linux-headers-4.19.221/drivers/mmc/core/host.c
+===================================================================
+--- linux-headers-4.19.221.orig/drivers/mmc/core/host.c
++++ linux-headers-4.19.221/drivers/mmc/core/host.c
+@@ -349,6 +349,20 @@ int mmc_of_parse(struct mmc_host *host)
+ EXPORT_SYMBOL(mmc_of_parse);
  
-+/**
+ /**
 + * mmc_first_nonreserved_index() - get the first index that is not reserved
 + */
 +static int mmc_first_nonreserved_index(void)
@@ -69,10 +68,11 @@ index c8fae6611b73..96b2ca1f1b06 100644
 +	return max + 1;
 +}
 +
- /**
++/**
   *	mmc_alloc_host - initialise the per-host structure.
   *	@extra: sizeof private data structure
-@@ -387,6 +401,7 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev)
+  *	@dev: pointer to host device model structure
+@@ -359,6 +373,7 @@ struct mmc_host *mmc_alloc_host(int extr
  {
  	int err;
  	struct mmc_host *host;
@@ -80,7 +80,7 @@ index c8fae6611b73..96b2ca1f1b06 100644
  
  	host = kzalloc(sizeof(struct mmc_host) + extra, GFP_KERNEL);
  	if (!host)
-@@ -395,7 +410,16 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev)
+@@ -367,7 +382,16 @@ struct mmc_host *mmc_alloc_host(int extr
  	/* scanning will be enabled when we're ready */
  	host->rescan_disable = 1;
  
@@ -98,6 +98,3 @@ index c8fae6611b73..96b2ca1f1b06 100644
  	if (err < 0) {
  		kfree(host);
  		return NULL;
--- 
-2.34.1
-
diff --git a/patches/linux/4.19/0812-mmc-core-Don-t-allocate-IDA-for-OF-aliases.patch b/patches/linux/4.19/0812-mmc-core-Don-t-allocate-IDA-for-OF-aliases.patch
index 2636daefe..f119cb894 100644
--- a/patches/linux/4.19/0812-mmc-core-Don-t-allocate-IDA-for-OF-aliases.patch
+++ b/patches/linux/4.19/0812-mmc-core-Don-t-allocate-IDA-for-OF-aliases.patch
@@ -38,10 +38,10 @@ Signed-off-by: Ulf Hansson <ulf...@li...>
  drivers/mmc/core/host.c | 20 ++++++++++----------
  1 file changed, 10 insertions(+), 10 deletions(-)
 
-Index: linux-4.19.227/drivers/mmc/core/host.c
+Index: linux-headers-4.19.221/drivers/mmc/core/host.c
 ===================================================================
---- linux-4.19.227.orig/drivers/mmc/core/host.c
-+++ linux-4.19.227/drivers/mmc/core/host.c
+--- linux-headers-4.19.221.orig/drivers/mmc/core/host.c
++++ linux-headers-4.19.221/drivers/mmc/core/host.c
 @@ -39,7 +39,8 @@ static DEFINE_IDA(mmc_host_ida);
  static void mmc_host_classdev_release(struct device *dev)
  {


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-492-ga7142084c

[sszy <ss...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  a7142084ca3bc41e74da67cffdfb79bd84a82c66 (commit)
       via  f360852a1cbcd1f0a872f6dfb336d05376f95170 (commit)
       via  86e063210fdb8efe0646326044c694fead94af17 (commit)
      from  3e383ce003c80c3c9c1bb6524b857f4ebf771d59 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a7142084ca3bc41e74da67cffdfb79bd84a82c66
Author: Sébastien Szymanski <seb...@ar...>
Date:   Tue Sep 9 16:16:57 2025 +0200

    [BUILDROOT] opos6ul{,nano}: add firmwares for LBEE5KL1YN

commit f360852a1cbcd1f0a872f6dfb336d05376f95170
Author: Sébastien Szymanski <seb...@ar...>
Date:   Tue Sep 9 16:07:21 2025 +0200

    [BUILDROOT] 2025.02: patch to bump murata-cyw-fw

commit 86e063210fdb8efe0646326044c694fead94af17
Author: Sébastien Szymanski <seb...@ar...>
Date:   Tue Sep 9 15:07:42 2025 +0200

    [LINUX] 5.10: patch to add LBEE5KL1YN Bluetooth support

-----------------------------------------------------------------------

Summary of changes:
 buildroot/configs/opos6ul_defconfig                |   1 +
 buildroot/configs/opos6ulnano_defconfig            |   1 +
 ...age-murata-cyw-fw-Bump-to-latest-revision.patch | 299 +++++++++++++++++++++
 patches/buildroot/2025.02/cleanup_buildroot.sh     |   3 +
 ...tbcm-Add-entry-for-BCM4343A2-UART-Bluetoo.patch |  34 +++
 5 files changed, 338 insertions(+)
 create mode 100644 patches/buildroot/2025.02/0481-package-murata-cyw-fw-Bump-to-latest-revision.patch
 create mode 100644 patches/linux/5.10/0827-Bluetooth-btbcm-Add-entry-for-BCM4343A2-UART-Bluetoo.patch

diff --git a/buildroot/configs/opos6ul_defconfig b/buildroot/configs/opos6ul_defconfig
index d1127007b..1edd311e8 100644
--- a/buildroot/configs/opos6ul_defconfig
+++ b/buildroot/configs/opos6ul_defconfig
@@ -82,6 +82,7 @@ BR2_PACKAGE_FBTERM=y
 BR2_PACKAGE_FBV=y
 BR2_PACKAGE_MURATA_CYW_FW=y
 BR2_PACKAGE_MURATA_CYW_FW_CYW43430=y
+BR2_PACKAGE_MURATA_CYW_FW_CYW43439=y
 BR2_PACKAGE_APF_CONFIG=y
 BR2_PACKAGE_DBUS_PYTHON=y
 BR2_PACKAGE_EVTEST=y
diff --git a/buildroot/configs/opos6ulnano_defconfig b/buildroot/configs/opos6ulnano_defconfig
index f35d68a76..861914f9e 100644
--- a/buildroot/configs/opos6ulnano_defconfig
+++ b/buildroot/configs/opos6ulnano_defconfig
@@ -63,6 +63,7 @@ BR2_PACKAGE_FBTERM=y
 BR2_PACKAGE_FBV=y
 BR2_PACKAGE_MURATA_CYW_FW=y
 BR2_PACKAGE_MURATA_CYW_FW_CYW43430=y
+BR2_PACKAGE_MURATA_CYW_FW_CYW43439=y
 BR2_PACKAGE_APF_CONFIG=y
 BR2_PACKAGE_DBUS_PYTHON=y
 BR2_PACKAGE_EVTEST=y
diff --git a/patches/buildroot/2025.02/0481-package-murata-cyw-fw-Bump-to-latest-revision.patch b/patches/buildroot/2025.02/0481-package-murata-cyw-fw-Bump-to-latest-revision.patch
new file mode 100644
index 000000000..d6066c571
--- /dev/null
+++ b/patches/buildroot/2025.02/0481-package-murata-cyw-fw-Bump-to-latest-revision.patch
@@ -0,0 +1,299 @@
+From 814182049d149e40797946bb39f7160edc36af8e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Mon, 8 Sep 2025 17:55:21 +0200
+Subject: [PATCH 481/481] package/murata-cyw-fw: Bump to latest revision
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+Signed-off-by: Kory Maincent <kor...@bo...>
+---
+ Config.in.legacy                         | 42 +++++++++++
+ package/murata-cyw-fw/Config.in          | 47 ++----------
+ package/murata-cyw-fw/murata-cyw-fw.hash |  8 +-
+ package/murata-cyw-fw/murata-cyw-fw.mk   | 93 ++++++++++--------------
+ 4 files changed, 92 insertions(+), 98 deletions(-)
+
+diff --git a/Config.in.legacy b/Config.in.legacy
+index 1ac87b3dc653..c430259ab10f 100644
+--- a/Config.in.legacy
++++ b/Config.in.legacy
+@@ -166,6 +166,48 @@ config BR2_PACKAGE_MBEDTLS_COMPRESSION
+ 	  MbedTLS has dropped support for TLS record-level
+ 	  compression.
+ 
++config BR2_PACKAGE_MURATA_CYW_FW_CYW43340
++	bool "Firmwares for Murata Wireless CYW43340/CYW43341 (1BW) module removed"
++	select BR2_LEGACY
++	help
++	  Firmwares for Murata Wireless CYW43340/CYW43341 (1BW) module is no
++	  longer provided.
++
++config BR2_PACKAGE_MURATA_CYW_FW_CYW43362
++	bool "Firmwares for Murata Wireless CYW43362 (SN8000) module removed"
++	select BR2_LEGACY
++	help
++	  Firmwares for Murata Wireless CYW43362 (SN8000) module is no longer
++	  provided.
++
++config BR2_PACKAGE_MURATA_CYW_FW_CYW4339
++	bool "Firmwares for Murata Wireless CYW4339 (1CK/ZP) module removed"
++	select BR2_LEGACY
++	help
++	  Firmwares for Murata Wireless CYW4339 (1CK/ZP) module is no longer
++	  provided.
++
++config BR2_PACKAGE_MURATA_CYW_FW_CYW4354
++	bool "Firmwares for Murata Wireless CYW4354 (1BB) module removed"
++	select BR2_LEGACY
++	help
++	  Firmwares for Murata Wireless CYW4354 (1BB) module is no longer
++	  provided.
++
++config BR2_PACKAGE_MURATA_CYW_FW_CYW4356
++	bool "Firmwares for Murata Wireless CYW4356 (1CX) module removed"
++	select BR2_LEGACY
++	help
++	  Firmwares for Murata Wireless CYW4356 (1CX) module is no longer
++	  provided.
++
++config BR2_PACKAGE_MURATA_CYW_FW_CYW4359
++	bool "Firmwares for Murata Wireless CYW4359 (1FD) module removed"
++	select BR2_LEGACY
++	help
++	  Firmwares for Murata Wireless CYW4359 (1FD) module is no longer
++	  provided.
++
+ config BR2_PACKAGE_LIBWEBSOCK
+ 	bool "libwebsock has been removed"
+ 	select BR2_LEGACY
+diff --git a/package/murata-cyw-fw/Config.in b/package/murata-cyw-fw/Config.in
+index 75304775117e..a61920bfdcc0 100644
+--- a/package/murata-cyw-fw/Config.in
++++ b/package/murata-cyw-fw/Config.in
+@@ -6,6 +6,7 @@ config BR2_PACKAGE_MURATA_CYW_FW
+ 	  https://github.com/murata-wireless/cyw-fmac-fw
+ 	  https://github.com/murata-wireless/cyw-fmac-nvram
+ 	  https://github.com/murata-wireless/cyw-bt-patch
++	  https://github.com/Infineon/ifx-linux-firmware
+ 
+ if BR2_PACKAGE_MURATA_CYW_FW
+ 
+@@ -14,32 +15,6 @@ config BR2_PACKAGE_MURATA_CYW_FW_CYW43012
+ 	help
+ 	  Murata Wireless CYW43012 (1LV) module firmware files.
+ 
+-config BR2_PACKAGE_MURATA_CYW_FW_CYW43340
+-	bool "CYW43340/CYW43341 (1BW)"
+-	help
+-	  Murata Wireless CYW43340/CYW43341 (1BW) module firmware files.
+-
+-config BR2_PACKAGE_MURATA_CYW_FW_CYW43362
+-	bool "CYW43362 (SN8000)"
+-	help
+-	  Murata Wireless CYW43362 (SN8000) module firmware files.
+-
+-config BR2_PACKAGE_MURATA_CYW_FW_CYW4339
+-	bool "CYW4339 (1CK/ZP)"
+-	help
+-	  Murata Wireless CYW4339 (1CK/ZP) module firmware files.
+-
+-choice
+-	prompt "CYW4339 module" if BR2_PACKAGE_MURATA_CYW_FW_CYW4339
+-
+-config BR2_PACKAGE_MURATA_CYW_FW_CYW4339_1CK
+-	bool "1CK"
+-
+-config BR2_PACKAGE_MURATA_CYW_FW_CYW4339_ZP
+-	bool "ZP"
+-
+-endchoice
+-
+ config BR2_PACKAGE_MURATA_CYW_FW_CYW43430
+ 	bool "CYW43430/CYW4343W/CYW43364 (1DX/1FX/1LN)"
+ 	help
+@@ -60,6 +35,11 @@ config BR2_PACKAGE_MURATA_CYW_FW_CYW43430_1LN
+ 
+ endchoice
+ 
++config BR2_PACKAGE_MURATA_CYW_FW_CYW43439
++	bool "CYW43439 (1YN)"
++	help
++	  Murata Wireless CYW43439 (1YN) module firmware files.
++
+ config BR2_PACKAGE_MURATA_CYW_FW_CYW43455
+ 	bool "CYW43455 (1HK/1LC/1MW)"
+ 	help
+@@ -79,19 +59,4 @@ config BR2_PACKAGE_MURATA_CYW_FW_CYW43455_1MW
+ 
+ endchoice
+ 
+-config BR2_PACKAGE_MURATA_CYW_FW_CYW4354
+-	bool "CYW4354 (1BB)"
+-	help
+-	  Murata Wireless CYW4354 (1BB) module firmware files.
+-
+-config BR2_PACKAGE_MURATA_CYW_FW_CYW4356
+-	bool "CYW4356 (1CX)"
+-	help
+-	  Murata Wireless CYW4356 (1CX) module firmware files.
+-
+-config BR2_PACKAGE_MURATA_CYW_FW_CYW4359
+-	bool "CYW4359 (1FD)"
+-	help
+-	  Murata Wireless CYW4359 (1FD) module firmware files.
+-
+ endif
+diff --git a/package/murata-cyw-fw/murata-cyw-fw.hash b/package/murata-cyw-fw/murata-cyw-fw.hash
+index d3c23dca71e0..8465418aab60 100644
+--- a/package/murata-cyw-fw/murata-cyw-fw.hash
++++ b/package/murata-cyw-fw/murata-cyw-fw.hash
+@@ -1,5 +1,7 @@
+ # Locally calculated
+-sha256  c3ecf357786d6db6f3283c0ea36ec067b1728f801fd8871694aed1502a82e9bc  murata-cyw-fw-8d87950bfad28c65926695b7357bd8995b60016a.tar.gz
+-sha256  03c140ae04f9c2036678262d6457b9c4b4a9ebb523c5e681af6d57b97c11da37  cyw-fmac-nvram-d27f1bf105fa1e5b828e355793b88d4b66188411.tar.gz
+-sha256  8f23ebb9a262112b62ace1e1bedcdeb00523d9a45e8d48a829d4ca35db4f0280  cyw-bt-patch-748462f0b02ec4aeb500bedd60780ac51c37be31.tar.gz
++sha256  da11ce28c58768cd36e35db9634f60fff7a7972de1c1f1da4a2bb58a7ba35ae3  murata-cyw-fw-56eed70b1fabf01b38f6cf643dc26eecc6cb293e.tar.gz
++sha256  00aeb183a8f7b6673434a5fb9bbfb175c48bc3140f2d32688c8028926041d8fa  cyw-fmac-nvram-22189fb5173dd0de796cf520ca6f5a6496af74e0.tar.gz
++sha256  ce8004817a623aada3233a132e13ee425aa41ef565216155c9f8bf53a4db7db7  cyw-bt-patch-64ac86708253e12d7089cf75ef8dcc9b30594958.tar.gz
++sha256  602ae73cb0cc0fe922c315f29bc8a47220a474945e069575bcaf3e390ea9cdc0  ifx-linux-firmware-release-v6.1.110-2025_0718.tar.gz
++sha256  82ed67a211877efa47aff4aab83d6d2d1ccf3d5d0f5c396df97f292ade01de9e  cyfmac43430-sdio.bin
+ sha256  3a892759b73e8b459f1a750954b316118b0061fd9d1868d11fa258c104ee7e0c  LICENCE.cypress
+diff --git a/package/murata-cyw-fw/murata-cyw-fw.mk b/package/murata-cyw-fw/murata-cyw-fw.mk
+index b99168b87520..49334b57f2ab 100644
+--- a/package/murata-cyw-fw/murata-cyw-fw.mk
++++ b/package/murata-cyw-fw/murata-cyw-fw.mk
+@@ -4,89 +4,74 @@
+ #
+ ################################################################################
+ 
+-MURATA_CYW_FW_VERSION = 8d87950bfad28c65926695b7357bd8995b60016a
+-MURATA_CYW_FW_VERSION_NVRAM = d27f1bf105fa1e5b828e355793b88d4b66188411
+-MURATA_CYW_FW_VERSION_BT_PATCH = 748462f0b02ec4aeb500bedd60780ac51c37be31
++MURATA_CYW_FW_VERSION = 56eed70b1fabf01b38f6cf643dc26eecc6cb293e
++MURATA_CYW_FW_VERSION_NVRAM = 22189fb5173dd0de796cf520ca6f5a6496af74e0
++MURATA_CYW_FW_VERSION_BT_PATCH = 64ac86708253e12d7089cf75ef8dcc9b30594958
++MURATA_CYW_FW_VERSION_INFINEON = release-v6.1.110-2025_0718
+ MURATA_CYW_FW_SITE = $(call github,murata-wireless,cyw-fmac-fw,$(MURATA_CYW_FW_VERSION))
+ MURATA_CYW_FW_EXTRA_DOWNLOADS = \
+ 	$(call github,murata-wireless,cyw-fmac-nvram,$(MURATA_CYW_FW_VERSION_NVRAM))/cyw-fmac-nvram-$(MURATA_CYW_FW_VERSION_NVRAM).tar.gz \
+-	$(call github,murata-wireless,cyw-bt-patch,$(MURATA_CYW_FW_VERSION_BT_PATCH))/cyw-bt-patch-$(MURATA_CYW_FW_VERSION_BT_PATCH).tar.gz
++	$(call github,murata-wireless,cyw-bt-patch,$(MURATA_CYW_FW_VERSION_BT_PATCH))/cyw-bt-patch-$(MURATA_CYW_FW_VERSION_BT_PATCH).tar.gz \
++	$(call github,Infineon,ifx-linux-firmware,$(MURATA_CYW_FW_VERSION_INFINEON))/ifx-linux-firmware-$(MURATA_CYW_FW_VERSION_INFINEON).tar.gz \
++	https://github.com/Infineon/ifx-linux-firmware/raw/refs/tags/release-v5.10.9-2022_0909/firmware/cyfmac43430-sdio.bin
+ MURATA_CYW_FW_LICENSE = PROPRIETARY
+ MURATA_CYW_FW_LICENSE_FILES = LICENCE.cypress
+ MURATA_CYW_FW_REDISTRIBUTE = NO
+ 
+ define MURATA_CYW_FW_EXTRACT_NVRAM_PATCH
+-	$(foreach tar,$(notdir $(MURATA_CYW_FW_EXTRA_DOWNLOADS)), \
++	$(foreach tar,$(filter-out %.bin,$(notdir $(MURATA_CYW_FW_EXTRA_DOWNLOADS))), \
+ 		$(call suitable-extractor,$(tar)) $(MURATA_CYW_FW_DL_DIR)/$(tar) | \
+ 		$(TAR) --strip-components=1 -C $(@D) $(TAR_OPTIONS) -
+ 	)
++	mv $(@D)/firmware/* $(@D)
++	cp $(MURATA_CYW_FW_DL_DIR)/cyfmac43430-sdio.bin $(@D)
+ endef
+ MURATA_CYW_FW_POST_EXTRACT_HOOKS += MURATA_CYW_FW_EXTRACT_NVRAM_PATCH
+ 
+ MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW43012) += \
+-	brcmfmac43012-sdio.bin \
+-	brcmfmac43012-sdio.1LV.clm_blob \
+-	brcmfmac43012-sdio.1LV.txt \
+-	CYW43012C0.1LV.hcd
+-MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW43340) += \
+-	brcmfmac43340-sdio.bin \
+-	brcmfmac43340-sdio.1BW.txt \
+-	CYW43341B0.1BW.hcd
+-MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW43362) += \
+-	brcmfmac43362-sdio.bin \
+-	brcmfmac43362-sdio.SN8000.txt
+-MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW4339) += \
+-	brcmfmac4339-sdio.bin
+-MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW4339_1CK) += \
+-	brcmfmac4339-sdio.1CK.txt
+-MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW4339_ZP) += \
+-	brcmfmac4339-sdio.ZP.txt \
+-	CYW4335C0.ZP.hcd
++	cyfmac43012-sdio.bin \
++	cyfmac43012-sdio.1LV.clm_blob \
++	cyfmac43012-sdio.1LV.txt \
++	BCM43012C0_003.001.015.0300.0266.1LV.dAnt.hcd \
++	BCM43012C0_003.001.015.0303.0267.1LV.sAnt.hcd
+ MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW43430) += \
+-	brcmfmac43430-sdio.bin
++	cyfmac43430-sdio.bin
+ MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW43430_1DX) += \
+-	brcmfmac43430-sdio.1DX.clm_blob \
+-	brcmfmac43430-sdio.1DX.txt \
+-	CYW43430A1.1DX.hcd
++	cyfmac43430-sdio.1DX.clm_blob \
++	cyfmac43430-sdio.1DX.txt \
++	BCM43430A1_001.002.009.0159.0528.1DX.hcd
+ MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW43430_1FX) += \
+-	brcmfmac43430-sdio.1FX.clm_blob \
+-	brcmfmac43430-sdio.1FX.txt
++	cyfmac43430-sdio.1FX.clm_blob \
++	cyfmac43430-sdio.1FX.txt
+ MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW43430_1LN) += \
+-	brcmfmac43430-sdio.1LN.clm_blob \
+-	brcmfmac43430-sdio.1LN.txt
++	cyfmac43430-sdio.1LN.clm_blob \
++	cyfmac43430-sdio.1LN.txt
++MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW43439) += \
++	cyfmac43439-sdio.bin \
++	cyfmac43439-sdio.1YN.clm_blob \
++	cyfmac43439-sdio.1YN.txt \
++	CYW4343A2_001.003.016.0071.0017.1YN.hcd
+ MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW43455) += \
+-	brcmfmac43455-sdio.bin
++	cyfmac43455-sdio.bin
+ MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW43455_1HK) += \
+-	brcmfmac43455-sdio.1HK.clm_blob \
++	cyfmac43455-sdio.1HK.clm_blob \
+ 	brcmfmac43455-sdio.1HK.txt
+ MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW43455_1LC) += \
+-	brcmfmac43455-sdio.1LC.clm_blob \
+-	brcmfmac43455-sdio.1LC.txt
++	cyfmac43455-sdio.1LC.clm_blob \
++	cyfmac43455-sdio.1LC.txt
+ MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW43455_1MW) += \
+-	brcmfmac43455-sdio.1MW.clm_blob \
+-	brcmfmac43455-sdio.1MW.txt \
+-	CYW4345C0.1MW.hcd
+-MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW4354) += \
+-	brcmfmac4354-sdio.bin \
+-	brcmfmac4354-sdio.1BB.clm_blob \
+-	brcmfmac4354-sdio.1BB.txt \
+-	CYW4350C0.1BB.hcd
+-MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW4356) += \
+-	brcmfmac4356-pcie.bin \
+-	brcmfmac4356-pcie.1CX.clm_blob \
+-	brcmfmac4356-pcie.1CX.txt \
+-	CYW4354A2.1CX.hcd
+-MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW4359) += \
+-	brcmfmac4359-pcie.bin \
+-	brcmfmac4359-pcie.1FD.clm_blob
++	cyfmac43455-sdio.1MW.clm_blob \
++	cyfmac43455-sdio.1MW.txt \
++	BCM4345C0_003.001.025.0187.0366.1MW.hcd
+ 
+ # Helper that assumes filename with model has two dots (CHIP.MODEL.EXT),
+-# but filename without model has only single dot (CHIP.EXT).
+-murata-cyw-fw-strip-model = $(shell echo -n $(1) | sed 's/\..*\./\./')
++# or a underscore with several dots (CHIP_MODEL.MODEL.MODEL.EXT), but
++# filename without model has only single dot (CHIP.EXT).
++murata-cyw-fw-strip-model = $(shell echo -n $(1) | sed -e 's/\..*\./\./' -e 's/_.*\./\./')
+ 
+ # Helper that strips model name and renames Bluetooth patch files to the ones
+ # expected by Linux kernel.
+-murata-cyw-fw-file-rename = $(call murata-cyw-fw-strip-model,$(patsubst CYW%,BCM%,$(f)))
++murata-cyw-fw-file-rename = $(call murata-cyw-fw-strip-model,$(patsubst CYW%,BCM%,$(patsubst cy%,brcm%,$(f))))
+ 
+ define MURATA_CYW_FW_INSTALL_TARGET_CMDS
+ 	$(foreach f,$(MURATA_CYW_FW_FILES_y), \
+-- 
+2.49.1
+
diff --git a/patches/buildroot/2025.02/cleanup_buildroot.sh b/patches/buildroot/2025.02/cleanup_buildroot.sh
index 05537f013..c14992816 100755
--- a/patches/buildroot/2025.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2025.02/cleanup_buildroot.sh
@@ -81,6 +81,9 @@ rm -rf buildroot/package/marble/marble.mk
 rm -rf buildroot/package/matiec/Config.in
 rm -rf buildroot/package/matiec/host-matiec-001-fix_bison_compilation_error.patch
 rm -rf buildroot/package/matiec/matiec.mk
+rm -rf buildroot/package/murata-cyw-fw/Config.in
+rm -rf buildroot/package/murata-cyw-fw/murata-cyw-fw.hash
+rm -rf buildroot/package/murata-cyw-fw/murata-cyw-fw.mk
 rm -rf buildroot/package/optee-client/Config.in
 rm -rf buildroot/package/optee-client/optee-client.hash
 rm -rf buildroot/package/optee-examples/Config.in
diff --git a/patches/linux/5.10/0827-Bluetooth-btbcm-Add-entry-for-BCM4343A2-UART-Bluetoo.patch b/patches/linux/5.10/0827-Bluetooth-btbcm-Add-entry-for-BCM4343A2-UART-Bluetoo.patch
new file mode 100644
index 000000000..b9b06162b
--- /dev/null
+++ b/patches/linux/5.10/0827-Bluetooth-btbcm-Add-entry-for-BCM4343A2-UART-Bluetoo.patch
@@ -0,0 +1,34 @@
+From f1da7b27d29a75694c8e26c365ed6c5910f9882a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Tue, 9 Sep 2025 14:59:54 +0200
+Subject: [PATCH 827/827] Bluetooth: btbcm: Add entry for BCM4343A2 UART
+ Bluetooth
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This patch adds the device ID for the BCM4343A2 module, found e.g. in
+the Infineon (Cypress) CYW43439 chip. The required firmware file is
+named 'BCM43430A1.hcd'.
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ drivers/bluetooth/btbcm.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/bluetooth/btbcm.c b/drivers/bluetooth/btbcm.c
+index d263eac784da..5da4bd91f931 100644
+--- a/drivers/bluetooth/btbcm.c
++++ b/drivers/bluetooth/btbcm.c
+@@ -406,6 +406,7 @@ static const struct bcm_subver_table bcm_uart_subver_table[] = {
+ 	{ 0x4217, "BCM4329B1"   },	/* 002.002.023 */
+ 	{ 0x6106, "BCM4359C0"	},	/* 003.001.006 */
+ 	{ 0x4106, "BCM4335A0"	},	/* 002.001.006 */
++	{ 0x2310, "BCM4343A2"   },      /* 001.003.016 */
+ 	{ }
+ };
+ 
+-- 
+2.49.1
+


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-489-g3e383ce00

[sszy <ss...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  3e383ce003c80c3c9c1bb6524b857f4ebf771d59 (commit)
      from  fccd918f0670392e2182480f4307de7540d48751 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3e383ce003c80c3c9c1bb6524b857f4ebf771d59
Author: Sébastien Szymanski <seb...@ar...>
Date:   Tue Aug 12 11:50:46 2025 +0200

    [LINUX] 5.10: backport patches to add LBEE5KL1YN support

-----------------------------------------------------------------------

Summary of changes:
 ...ac-Add-clm_blob-firmware-files-to-modinfo.patch |  89 ++++
 ...mac-add-43439-SDIO-ids-and-initialization.patch | 131 ++++++
 ...ac-add-function-to-unbind-device-to-bus-l.patch | 104 +++++
 ...ac-add-firmware-vendor-info-in-driver-inf.patch | 193 ++++++++
 ...ac-add-support-for-vendor-specific-firmwa.patch | 490 +++++++++++++++++++++
 ...fmac-add-support-for-Cypress-firmware-api.patch | 246 +++++++++++
 ...-wifi-brcmfmac-add-Cypress-43439-SDIO-ids.patch |  98 +++++
 7 files changed, 1351 insertions(+)
 create mode 100644 patches/linux/5.10/0820-brcmfmac-Add-clm_blob-firmware-files-to-modinfo.patch
 create mode 100644 patches/linux/5.10/0821-wifi-brcmfmac-add-43439-SDIO-ids-and-initialization.patch
 create mode 100644 patches/linux/5.10/0822-wifi-brcmfmac-add-function-to-unbind-device-to-bus-l.patch
 create mode 100644 patches/linux/5.10/0823-wifi-brcmfmac-add-firmware-vendor-info-in-driver-inf.patch
 create mode 100644 patches/linux/5.10/0824-wifi-brcmfmac-add-support-for-vendor-specific-firmwa.patch
 create mode 100644 patches/linux/5.10/0825-wifi-brcmfmac-add-support-for-Cypress-firmware-api.patch
 create mode 100644 patches/linux/5.10/0826-wifi-brcmfmac-add-Cypress-43439-SDIO-ids.patch

diff --git a/patches/linux/5.10/0820-brcmfmac-Add-clm_blob-firmware-files-to-modinfo.patch b/patches/linux/5.10/0820-brcmfmac-Add-clm_blob-firmware-files-to-modinfo.patch
new file mode 100644
index 000000000..f2bd4676d
--- /dev/null
+++ b/patches/linux/5.10/0820-brcmfmac-Add-clm_blob-firmware-files-to-modinfo.patch
@@ -0,0 +1,89 @@
+From 362d42bfb1693afcd55ced140977340e1626721b Mon Sep 17 00:00:00 2001
+From: Matthias Brugger <mbr...@su...>
+Date: Mon, 7 Jun 2021 12:34:33 +0200
+Subject: [PATCH 820/826] brcmfmac: Add clm_blob firmware files to modinfo
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Cypress Wi-Fi chipsets include information regarding regulatory
+constraints. These are provided to the driver through "Country Local
+Matrix" (CLM) blobs. Files present in Linux firmware repository are
+on a generic world-wide safe version with conservative power
+settings which is designed to comply with regulatory but may not
+provide best performance on all boards. Never the less, a better
+functionality can be expected with the file present, so add it to the
+modinfo of the driver.
+
+Signed-off-by: Matthias Brugger <mbr...@su...>
+Reviewed-by: Hans de Goede <hde...@re...>
+Signed-off-by: Kalle Valo <kv...@co...>
+Link: https://lore.kernel.org/r/202...@ke...
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ .../wireless/broadcom/brcm80211/brcmfmac/firmware.h  |  7 +++++++
+ .../net/wireless/broadcom/brcm80211/brcmfmac/pcie.c  |  4 ++--
+ .../net/wireless/broadcom/brcm80211/brcmfmac/sdio.c  | 12 ++++++------
+ 3 files changed, 15 insertions(+), 8 deletions(-)
+
+diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h
+index 46c66415b4a6..e290dec9c53d 100644
+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h
++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h
+@@ -32,6 +32,13 @@ static const char BRCM_ ## fw_name ## _FIRMWARE_BASENAME[] = \
+ 	BRCMF_FW_DEFAULT_PATH fw_base; \
+ MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH fw_base ".bin")
+ 
++/* Firmware and Country Local Matrix files */
++#define BRCMF_FW_CLM_DEF(fw_name, fw_base) \
++static const char BRCM_ ## fw_name ## _FIRMWARE_BASENAME[] = \
++	BRCMF_FW_DEFAULT_PATH fw_base; \
++MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH fw_base ".bin"); \
++MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH fw_base ".clm_blob")
++
+ #define BRCMF_FW_ENTRY(chipid, mask, name) \
+ 	{ chipid, mask, BRCM_ ## name ## _FIRMWARE_BASENAME }
+ 
+diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
+index 721d587425c7..00b354e31f23 100644
+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
+@@ -49,8 +49,8 @@ enum brcmf_pcie_state {
+ BRCMF_FW_DEF(43602, "brcmfmac43602-pcie");
+ BRCMF_FW_DEF(4350, "brcmfmac4350-pcie");
+ BRCMF_FW_DEF(4350C, "brcmfmac4350c2-pcie");
+-BRCMF_FW_DEF(4356, "brcmfmac4356-pcie");
+-BRCMF_FW_DEF(43570, "brcmfmac43570-pcie");
++BRCMF_FW_CLM_DEF(4356, "brcmfmac4356-pcie");
++BRCMF_FW_CLM_DEF(43570, "brcmfmac43570-pcie");
+ BRCMF_FW_DEF(4358, "brcmfmac4358-pcie");
+ BRCMF_FW_DEF(4359, "brcmfmac4359-pcie");
+ BRCMF_FW_DEF(4364, "brcmfmac4364-pcie");
+diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
+index 99cd54d72fc8..29796563e894 100644
+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
+@@ -616,14 +616,14 @@ BRCMF_FW_DEF(43362, "brcmfmac43362-sdio");
+ BRCMF_FW_DEF(4339, "brcmfmac4339-sdio");
+ BRCMF_FW_DEF(43430A0, "brcmfmac43430a0-sdio");
+ /* Note the names are not postfixed with a1 for backward compatibility */
+-BRCMF_FW_DEF(43430A1, "brcmfmac43430-sdio");
+-BRCMF_FW_DEF(43455, "brcmfmac43455-sdio");
++BRCMF_FW_CLM_DEF(43430A1, "brcmfmac43430-sdio");
++BRCMF_FW_CLM_DEF(43455, "brcmfmac43455-sdio");
+ BRCMF_FW_DEF(43456, "brcmfmac43456-sdio");
+-BRCMF_FW_DEF(4354, "brcmfmac4354-sdio");
+-BRCMF_FW_DEF(4356, "brcmfmac4356-sdio");
++BRCMF_FW_CLM_DEF(4354, "brcmfmac4354-sdio");
++BRCMF_FW_CLM_DEF(4356, "brcmfmac4356-sdio");
+ BRCMF_FW_DEF(4359, "brcmfmac4359-sdio");
+-BRCMF_FW_DEF(4373, "brcmfmac4373-sdio");
+-BRCMF_FW_DEF(43012, "brcmfmac43012-sdio");
++BRCMF_FW_CLM_DEF(4373, "brcmfmac4373-sdio");
++BRCMF_FW_CLM_DEF(43012, "brcmfmac43012-sdio");
+ 
+ static const struct brcmf_firmware_mapping brcmf_sdio_fwnames[] = {
+ 	BRCMF_FW_ENTRY(BRCM_CC_43143_CHIP_ID, 0xFFFFFFFF, 43143),
+-- 
+2.49.1
+
diff --git a/patches/linux/5.10/0821-wifi-brcmfmac-add-43439-SDIO-ids-and-initialization.patch b/patches/linux/5.10/0821-wifi-brcmfmac-add-43439-SDIO-ids-and-initialization.patch
new file mode 100644
index 000000000..7bc7f7cb0
--- /dev/null
+++ b/patches/linux/5.10/0821-wifi-brcmfmac-add-43439-SDIO-ids-and-initialization.patch
@@ -0,0 +1,131 @@
+From ac9db207a42ce67c780a8f755edbaa43c27a85c5 Mon Sep 17 00:00:00 2001
+From: Marek Vasut <ma...@de...>
+Date: Sat, 27 Aug 2022 04:49:03 +0200
+Subject: [PATCH 821/826] wifi: brcmfmac: add 43439 SDIO ids and initialization
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add HW and SDIO ids for use with the muRata 1YN (Cypress CYW43439).
+Add the firmware mapping structures for the CYW43439 chipset.
+The 43439 needs some things setup similar to the 43430 chipset.
+
+Signed-off-by: Marek Vasut <ma...@de...>
+Signed-off-by: Kalle Valo <kv...@ke...>
+Link: https://lore.kernel.org/r/202...@de...
+(cherry picked from commit be376df724aa3b7abdf79390eaab60c58a92f4f0)
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c    | 1 +
+ drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c      | 5 ++++-
+ drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c   | 3 ++-
+ drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c      | 4 +++-
+ .../net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h    | 1 +
+ include/linux/mmc/sdio_ids.h                                 | 1 +
+ 6 files changed, 12 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
+index 75dc7904a4bd..641d5daad31e 100644
+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
+@@ -990,6 +990,7 @@ static const struct sdio_device_id brcmf_sdmmc_ids[] = {
+ 	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4359),
+ 	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_4373),
+ 	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_43012),
++	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_43439),
+ 	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_89359),
+ 	{ /* end: all zeroes */ }
+ };
+diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
+index 5bf11e46fc49..08a06a34b727 100644
+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
+@@ -639,6 +639,7 @@ static void brcmf_chip_socram_ramsize(struct brcmf_core_priv *sr, u32 *ramsize,
+ 			*srsize = (32 * 1024);
+ 		break;
+ 	case BRCM_CC_43430_CHIP_ID:
++	case CY_CC_43439_CHIP_ID:
+ 		/* assume sr for now as we can not check
+ 		 * firmware sr capability at this point.
+ 		 */
+@@ -1244,7 +1245,8 @@ brcmf_chip_cm3_set_passive(struct brcmf_chip_priv *chip)
+ 	brcmf_chip_resetcore(core, 0, 0, 0);
+ 
+ 	/* disable bank #3 remap for this device */
+-	if (chip->pub.chip == BRCM_CC_43430_CHIP_ID) {
++	if (chip->pub.chip == BRCM_CC_43430_CHIP_ID ||
++	    chip->pub.chip == CY_CC_43439_CHIP_ID) {
+ 		sr = container_of(core, struct brcmf_core_priv, pub);
+ 		brcmf_chip_core_write32(sr, SOCRAMREGOFFS(bankidx), 3);
+ 		brcmf_chip_core_write32(sr, SOCRAMREGOFFS(bankpda), 0);
+@@ -1401,6 +1403,7 @@ bool brcmf_chip_sr_capable(struct brcmf_chip *pub)
+ 		reg = chip->ops->read32(chip->ctx, addr);
+ 		return (reg & pmu_cc3_mask) != 0;
+ 	case BRCM_CC_43430_CHIP_ID:
++	case CY_CC_43439_CHIP_ID:
+ 		addr = CORE_CC_REG(base, sr_control1);
+ 		reg = chip->ops->read32(chip->ctx, addr);
+ 		return reg != 0;
+diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c
+index 7c68d9849324..5cf490c61101 100644
+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c
++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c
+@@ -248,7 +248,8 @@ void brcmf_feat_attach(struct brcmf_pub *drvr)
+ 	brcmf_feat_firmware_capabilities(ifp);
+ 	memset(&gscan_cfg, 0, sizeof(gscan_cfg));
+ 	if (drvr->bus_if->chip != BRCM_CC_43430_CHIP_ID &&
+-	    drvr->bus_if->chip != BRCM_CC_4345_CHIP_ID)
++	    drvr->bus_if->chip != BRCM_CC_4345_CHIP_ID &&
++	    drvr->bus_if->chip != CY_CC_43439_CHIP_ID)
+ 		brcmf_feat_iovar_data_set(ifp, BRCMF_FEAT_GSCAN,
+ 					  "pfn_gscan_cfg",
+ 					  &gscan_cfg, sizeof(gscan_cfg));
+diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
+index 29796563e894..5ba89191fae1 100644
+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
+@@ -617,6 +617,7 @@ BRCMF_FW_DEF(4339, "brcmfmac4339-sdio");
+ BRCMF_FW_DEF(43430A0, "brcmfmac43430a0-sdio");
+ /* Note the names are not postfixed with a1 for backward compatibility */
+ BRCMF_FW_CLM_DEF(43430A1, "brcmfmac43430-sdio");
++BRCMF_FW_CLM_DEF(43439, "brcmfmac43439-sdio");
+ BRCMF_FW_CLM_DEF(43455, "brcmfmac43455-sdio");
+ BRCMF_FW_DEF(43456, "brcmfmac43456-sdio");
+ BRCMF_FW_CLM_DEF(4354, "brcmfmac4354-sdio");
+@@ -646,7 +647,8 @@ static const struct brcmf_firmware_mapping brcmf_sdio_fwnames[] = {
+ 	BRCMF_FW_ENTRY(BRCM_CC_4356_CHIP_ID, 0xFFFFFFFF, 4356),
+ 	BRCMF_FW_ENTRY(BRCM_CC_4359_CHIP_ID, 0xFFFFFFFF, 4359),
+ 	BRCMF_FW_ENTRY(CY_CC_4373_CHIP_ID, 0xFFFFFFFF, 4373),
+-	BRCMF_FW_ENTRY(CY_CC_43012_CHIP_ID, 0xFFFFFFFF, 43012)
++	BRCMF_FW_ENTRY(CY_CC_43012_CHIP_ID, 0xFFFFFFFF, 43012),
++	BRCMF_FW_ENTRY(CY_CC_43439_CHIP_ID, 0xFFFFFFFF, 43439)
+ };
+ 
+ #define TXCTL_CREDITS	2
+diff --git a/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h b/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h
+index c6c4be05159d..2ec2857cb319 100644
+--- a/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h
++++ b/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h
+@@ -51,6 +51,7 @@
+ #define BRCM_CC_4371_CHIP_ID		0x4371
+ #define CY_CC_4373_CHIP_ID		0x4373
+ #define CY_CC_43012_CHIP_ID		43012
++#define CY_CC_43439_CHIP_ID		43439
+ 
+ /* USB Device IDs */
+ #define BRCM_USB_43143_DEVICE_ID	0xbd1e
+diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h
+index 12036619346c..35dd1d073171 100644
+--- a/include/linux/mmc/sdio_ids.h
++++ b/include/linux/mmc/sdio_ids.h
+@@ -74,6 +74,7 @@
+ #define SDIO_DEVICE_ID_BROADCOM_43362		0xa962
+ #define SDIO_DEVICE_ID_BROADCOM_43364		0xa9a4
+ #define SDIO_DEVICE_ID_BROADCOM_43430		0xa9a6
++#define SDIO_DEVICE_ID_BROADCOM_CYPRESS_43439	0xa9af
+ #define SDIO_DEVICE_ID_BROADCOM_43455		0xa9bf
+ 
+ #define SDIO_VENDOR_ID_MARVELL			0x02df
+-- 
+2.49.1
+
diff --git a/patches/linux/5.10/0822-wifi-brcmfmac-add-function-to-unbind-device-to-bus-l.patch b/patches/linux/5.10/0822-wifi-brcmfmac-add-function-to-unbind-device-to-bus-l.patch
new file mode 100644
index 000000000..039405cd8
--- /dev/null
+++ b/patches/linux/5.10/0822-wifi-brcmfmac-add-function-to-unbind-device-to-bus-l.patch
@@ -0,0 +1,104 @@
+From 3f3cb1b7ff7e3117ef3a8134c118072231a8e082 Mon Sep 17 00:00:00 2001
+From: Arend van Spriel <are...@br...>
+Date: Tue, 29 Nov 2022 14:54:40 +0100
+Subject: [PATCH 822/826] wifi: brcmfmac: add function to unbind device to bus
+ layer api
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Introduce a new bus callback .remove() which will unbind the device
+from the driver. This allows the common driver layer to stop handling
+a device.
+
+Reviewed-by: Hante Meuleman <han...@br...>
+Reviewed-by: Pieter-Paul Giesberts <pie...@br...>
+Reviewed-by: Franky Lin <fra...@br...>
+Signed-off-by: Arend van Spriel <are...@br...>
+Signed-off-by: Kalle Valo <kv...@ke...>
+Link: https://lore.kernel.org/r/202...@br...
+(cherry picked from commit 76821aad49cebc69eca86800f41e8133104e91d3)
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ .../net/wireless/broadcom/brcm80211/brcmfmac/bus.h  | 13 +++++++++++++
+ .../net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 12 +++++++++++-
+ 2 files changed, 24 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h
+index 3f5da3bb6aa5..a9363de809ea 100644
+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h
++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h
+@@ -6,6 +6,7 @@
+ #ifndef BRCMFMAC_BUS_H
+ #define BRCMFMAC_BUS_H
+ 
++#include <linux/device.h>
+ #include "debug.h"
+ 
+ /* IDs of the 6 default common rings of msgbuf protocol */
+@@ -61,6 +62,7 @@ struct brcmf_bus_dcmd {
+  * @get_ramsize: obtain size of device memory.
+  * @get_memdump: obtain device memory dump in provided buffer.
+  * @get_fwname: obtain firmware name.
++ * @remove: initiate unbind of the device.
+  *
+  * This structure provides an abstract interface towards the
+  * bus specific driver. For control messages to common driver
+@@ -81,6 +83,7 @@ struct brcmf_bus_ops {
+ 			  unsigned char *fw_name);
+ 	void (*debugfs_create)(struct device *dev);
+ 	int (*reset)(struct device *dev);
++	void (*remove)(struct device *dev);
+ };
+ 
+ 
+@@ -244,6 +247,16 @@ int brcmf_bus_reset(struct brcmf_bus *bus)
+ 	return bus->ops->reset(bus->dev);
+ }
+ 
++static inline void brcmf_bus_remove(struct brcmf_bus *bus)
++{
++	if (!bus->ops->remove) {
++		device_release_driver(bus->dev);
++		return;
++	}
++
++	bus->ops->remove(bus->dev);
++}
++
+ /*
+  * interface functions from common layer
+  */
+diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
+index 5ba89191fae1..f77d6c018b78 100644
+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
+@@ -4165,6 +4165,15 @@ static int brcmf_sdio_bus_reset(struct device *dev)
+ 	return ret;
+ }
+ 
++static void brcmf_sdio_bus_remove(struct device *dev)
++{
++	struct brcmf_bus *bus_if = dev_get_drvdata(dev);
++	struct brcmf_sdio_dev *sdiod = bus_if->bus_priv.sdio;
++
++	device_release_driver(&sdiod->func2->dev);
++	device_release_driver(&sdiod->func1->dev);
++}
++
+ static const struct brcmf_bus_ops brcmf_sdio_bus_ops = {
+ 	.stop = brcmf_sdio_bus_stop,
+ 	.preinit = brcmf_sdio_bus_preinit,
+@@ -4177,7 +4186,8 @@ static const struct brcmf_bus_ops brcmf_sdio_bus_ops = {
+ 	.get_memdump = brcmf_sdio_bus_get_memdump,
+ 	.get_fwname = brcmf_sdio_get_fwname,
+ 	.debugfs_create = brcmf_sdio_debugfs_create,
+-	.reset = brcmf_sdio_bus_reset
++	.reset = brcmf_sdio_bus_reset,
++	.remove = brcmf_sdio_bus_remove,
+ };
+ 
+ #define BRCMF_SDIO_FW_CODE	0
+-- 
+2.49.1
+
diff --git a/patches/linux/5.10/0823-wifi-brcmfmac-add-firmware-vendor-info-in-driver-inf.patch b/patches/linux/5.10/0823-wifi-brcmfmac-add-firmware-vendor-info-in-driver-inf.patch
new file mode 100644
index 000000000..c8c71b737
--- /dev/null
+++ b/patches/linux/5.10/0823-wifi-brcmfmac-add-firmware-vendor-info-in-driver-inf.patch
@@ -0,0 +1,193 @@
+From e8cb119b99d021e0ae753f3406b535395dbc0d28 Mon Sep 17 00:00:00 2001
+From: Arend van Spriel <are...@br...>
+Date: Tue, 29 Nov 2022 14:54:41 +0100
+Subject: [PATCH 823/826] wifi: brcmfmac: add firmware vendor info in driver
+ info
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+In order to determine the vendor that released a firmware image for
+a specific device, the device table now sets the vendor identifier
+in driver info and it is stored in struct brcmf_bus::fwvid during
+probe.
+
+Reviewed-by: Hante Meuleman <han...@br...>
+Reviewed-by: Pieter-Paul Giesberts <pie...@br...>
+Reviewed-by: Franky Lin <fra...@br...>
+Signed-off-by: Arend van Spriel <are...@br...>
+Signed-off-by: Kalle Valo <kv...@ke...>
+Link: https://lore.kernel.org/r/202...@br...
+(cherry picked from commit da6d9c8ecd00e20218461007948f2b0a8e7fa242)
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ .../broadcom/brcm80211/brcmfmac/bcmsdh.c      |  6 ++++-
+ .../broadcom/brcm80211/brcmfmac/bus.h         | 11 +++++++-
+ .../broadcom/brcm80211/brcmfmac/pcie.c        | 20 ++++++++++----
+ .../broadcom/brcm80211/brcmfmac/usb.c         | 27 +++++++++++++------
+ 4 files changed, 49 insertions(+), 15 deletions(-)
+
+diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
+index 641d5daad31e..fa4a726744ef 100644
+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
+@@ -967,7 +967,10 @@ int brcmf_sdiod_probe(struct brcmf_sdio_dev *sdiodev)
+ }
+ 
+ #define BRCMF_SDIO_DEVICE(dev_id)	\
+-	{SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, dev_id)}
++	{ \
++		SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, dev_id), \
++		.driver_data = BRCMF_FWVENDOR_WCC \
++	}
+ 
+ /* devices we support, null terminated */
+ static const struct sdio_device_id brcmf_sdmmc_ids[] = {
+@@ -1057,6 +1060,7 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func,
+ 	sdiodev->bus_if = bus_if;
+ 	bus_if->bus_priv.sdio = sdiodev;
+ 	bus_if->proto_type = BRCMF_PROTO_BCDC;
++	bus_if->fwvid = id->driver_data;
+ 	dev_set_drvdata(&func->dev, bus_if);
+ 	dev_set_drvdata(&sdiodev->func1->dev, bus_if);
+ 	sdiodev->dev = &sdiodev->func1->dev;
+diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h
+index a9363de809ea..2008fde3ff4e 100644
+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h
++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h
+@@ -23,6 +23,13 @@
+ #define BRCMF_NROF_COMMON_MSGRINGS	(BRCMF_NROF_H2D_COMMON_MSGRINGS + \
+ 					 BRCMF_NROF_D2H_COMMON_MSGRINGS)
+ 
++enum brcmf_fwvendor {
++	BRCMF_FWVENDOR_WCC,
++	/* keep last */
++	BRCMF_FWVENDOR_NUM,
++	BRCMF_FWVENDOR_INVALID
++};
++
+ /* The level of bus communication with the dongle */
+ enum brcmf_bus_state {
+ 	BRCMF_BUS_DOWN,		/* Not ready for frame transfers */
+@@ -131,9 +138,10 @@ struct brcmf_bus_stats {
+  * @stats: statistics shared between common and bus layer.
+  * @maxctl: maximum size for rxctl request message.
+  * @chip: device identifier of the dongle chip.
++ * @chiprev: revision of the dongle chip.
++ * @fwvid: firmware vendor-support identifier of the device.
+  * @always_use_fws_queue: bus wants use queue also when fwsignal is inactive.
+  * @wowl_supported: is wowl supported by bus driver.
+- * @chiprev: revision of the dongle chip.
+  * @msgbuf: msgbuf protocol parameters provided by bus layer.
+  */
+ struct brcmf_bus {
+@@ -150,6 +158,7 @@ struct brcmf_bus {
+ 	uint maxctl;
+ 	u32 chip;
+ 	u32 chiprev;
++	enum brcmf_fwvendor fwvid;
+ 	bool always_use_fws_queue;
+ 	bool wowl_supported;
+ 
+diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
+index 00b354e31f23..5f593be07ac1 100644
+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
+@@ -1901,6 +1901,7 @@ brcmf_pcie_probe(struct pci_dev *pdev, const struct pci_device_id *id)
+ 	bus->bus_priv.pcie = pcie_bus_dev;
+ 	bus->ops = &brcmf_pcie_bus_ops;
+ 	bus->proto_type = BRCMF_PROTO_MSGBUF;
++	bus->fwvid = id->driver_data;
+ 	bus->chip = devinfo->coreid;
+ 	bus->wowl_supported = pci_pme_capable(pdev, PCI_D3hot);
+ 	dev_set_drvdata(&pdev->dev, bus);
+@@ -2066,11 +2067,20 @@ static const struct dev_pm_ops brcmf_pciedrvr_pm = {
+ #endif /* CONFIG_PM */
+ 
+ 
+-#define BRCMF_PCIE_DEVICE(dev_id)	{ BRCM_PCIE_VENDOR_ID_BROADCOM, dev_id,\
+-	PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_NETWORK_OTHER << 8, 0xffff00, 0 }
+-#define BRCMF_PCIE_DEVICE_SUB(dev_id, subvend, subdev)	{ \
+-	BRCM_PCIE_VENDOR_ID_BROADCOM, dev_id,\
+-	subvend, subdev, PCI_CLASS_NETWORK_OTHER << 8, 0xffff00, 0 }
++#define BRCMF_PCIE_DEVICE(dev_id) \
++	{ \
++		BRCM_PCIE_VENDOR_ID_BROADCOM, (dev_id), \
++		PCI_ANY_ID, PCI_ANY_ID, \
++		PCI_CLASS_NETWORK_OTHER << 8, 0xffff00, \
++		BRCMF_FWVENDOR_WCC \
++	}
++#define BRCMF_PCIE_DEVICE_SUB(dev_id, subvend, subdev) \
++	{ \
++		BRCM_PCIE_VENDOR_ID_BROADCOM, (dev_id), \
++		(subvend), (subdev), \
++		PCI_CLASS_NETWORK_OTHER << 8, 0xffff00, \
++		BRCMF_FWVENDOR_WCC \
++	}
+ 
+ static const struct pci_device_id brcmf_pcie_devid_table[] = {
+ 	BRCMF_PCIE_DEVICE(BRCM_PCIE_4350_DEVICE_ID),
+diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
+index 8c12aaffe719..fef6474f1ad2 100644
+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
+@@ -1255,7 +1255,8 @@ brcmf_usb_prepare_fw_request(struct brcmf_usbdev_info *devinfo)
+ 	return fwreq;
+ }
+ 
+-static int brcmf_usb_probe_cb(struct brcmf_usbdev_info *devinfo)
++static int brcmf_usb_probe_cb(struct brcmf_usbdev_info *devinfo,
++			      enum brcmf_fwvendor fwvid)
+ {
+ 	struct brcmf_bus *bus = NULL;
+ 	struct brcmf_usbdev *bus_pub = NULL;
+@@ -1280,6 +1281,7 @@ static int brcmf_usb_probe_cb(struct brcmf_usbdev_info *devinfo)
+ 	dev_set_drvdata(dev, bus);
+ 	bus->ops = &brcmf_usb_bus_ops;
+ 	bus->proto_type = BRCMF_PROTO_BCDC;
++	bus->fwvid = fwvid;
+ 	bus->always_use_fws_queue = true;
+ #ifdef CONFIG_PM
+ 	bus->wowl_supported = true;
+@@ -1438,7 +1440,7 @@ brcmf_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
+ 	else
+ 		brcmf_dbg(USB, "Broadcom full speed USB WLAN interface detected\n");
+ 
+-	ret = brcmf_usb_probe_cb(devinfo);
++	ret = brcmf_usb_probe_cb(devinfo, id->driver_info);
+ 	if (ret)
+ 		goto fail;
+ 
+@@ -1526,14 +1528,23 @@ static int brcmf_usb_reset_resume(struct usb_interface *intf)
+ 	return ret;
+ }
+ 
+-#define BRCMF_USB_DEVICE(dev_id)	\
+-	{ USB_DEVICE(BRCM_USB_VENDOR_ID_BROADCOM, dev_id) }
++#define BRCMF_USB_DEVICE(dev_id) \
++	{ \
++		USB_DEVICE(BRCM_USB_VENDOR_ID_BROADCOM, dev_id), \
++		.driver_info = BRCMF_FWVENDOR_WCC \
++	}
+ 
+-#define LINKSYS_USB_DEVICE(dev_id)	\
+-	{ USB_DEVICE(BRCM_USB_VENDOR_ID_LINKSYS, dev_id) }
++#define LINKSYS_USB_DEVICE(dev_id) \
++	{ \
++		USB_DEVICE(BRCM_USB_VENDOR_ID_LINKSYS, dev_id), \
++		.driver_info = BRCMF_FWVENDOR_WCC \
++	}
+ 
+-#define CYPRESS_USB_DEVICE(dev_id)	\
+-	{ USB_DEVICE(CY_USB_VENDOR_ID_CYPRESS, dev_id) }
++#define CYPRESS_USB_DEVICE(dev_id) \
++	{ \
++		USB_DEVICE(CY_USB_VENDOR_ID_CYPRESS, dev_id), \
++		.driver_info = BRCMF_FWVENDOR_WCC \
++	}
+ 
+ static const struct usb_device_id brcmf_usb_devid_table[] = {
+ 	BRCMF_USB_DEVICE(BRCM_USB_43143_DEVICE_ID),
+-- 
+2.49.1
+
diff --git a/patches/linux/5.10/0824-wifi-brcmfmac-add-support-for-vendor-specific-firmwa.patch b/patches/linux/5.10/0824-wifi-brcmfmac-add-support-for-vendor-specific-firmwa.patch
new file mode 100644
index 000000000..1a2fe233b
--- /dev/null
+++ b/patches/linux/5.10/0824-wifi-brcmfmac-add-support-for-vendor-specific-firmwa.patch
@@ -0,0 +1,490 @@
+From 42d783a3f12b8d1db3b0f20fb982e95b007004e5 Mon Sep 17 00:00:00 2001
+From: Arend van Spriel <are...@br...>
+Date: Tue, 29 Nov 2022 14:54:42 +0100
+Subject: [PATCH 824/826] wifi: brcmfmac: add support for vendor-specific
+ firmware api
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The driver is being used by multiple vendors who develop the firmware
+api independently. So far the firmware api as used by the driver has
+not diverged (yet). This change adds framework for supporting multiple
+firmware apis. The vendor-specific support code has to provide a number
+of callback operations. Right now it is only attach and detach callbacks
+so no real functionality as the api is still common. This code only
+adds WCC variant anyway, which is selected for all devices right now.
+The vendor-specific part will be built in a separate module when the
+driver is configured to be built as a module through Kconfig, ie. when
+CONFIG_BRCMFMAC=m.
+
+Reviewed-by: Hante Meuleman <han...@br...>
+Reviewed-by: Pieter-Paul Giesberts <pie...@br...>
+Reviewed-by: Franky Lin <fra...@br...>
+Signed-off-by: Arend van Spriel <are...@br...>
+Signed-off-by: Kalle Valo <kv...@ke...>
+Link: https://lore.kernel.org/r/202...@br...
+(cherry picked from commit d6a5c562214f26e442c8ec3ff1e28e16675d1bcf)
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ .../broadcom/brcm80211/brcmfmac/Makefile      |   7 +
+ .../broadcom/brcm80211/brcmfmac/bus.h         |   4 +
+ .../broadcom/brcm80211/brcmfmac/core.c        |   9 +
+ .../broadcom/brcm80211/brcmfmac/core.h        |   2 +
+ .../broadcom/brcm80211/brcmfmac/fwvid.c       | 190 ++++++++++++++++++
+ .../broadcom/brcm80211/brcmfmac/fwvid.h       |  46 +++++
+ .../broadcom/brcm80211/brcmfmac/wcc/Makefile  |  12 ++
+ .../broadcom/brcm80211/brcmfmac/wcc/core.c    |  27 +++
+ .../broadcom/brcm80211/brcmfmac/wcc/module.c  |  26 +++
+ .../broadcom/brcm80211/brcmfmac/wcc/vops.h    |  11 +
+ 10 files changed, 334 insertions(+)
+ create mode 100644 drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.c
+ create mode 100644 drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.h
+ create mode 100644 drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/Makefile
+ create mode 100644 drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/core.c
+ create mode 100644 drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/module.c
+ create mode 100644 drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/vops.h
+
+diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile
+index 9b15bc3f6054..031086ea9c9a 100644
+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile
++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile
+@@ -20,6 +20,7 @@ brcmfmac-objs += \
+ 		common.o \
+ 		core.o \
+ 		firmware.o \
++		fwvid.o \
+ 		feature.o \
+ 		btcoex.o \
+ 		vendor.o \
+@@ -46,3 +47,9 @@ brcmfmac-$(CONFIG_OF) += \
+ 		of.o
+ brcmfmac-$(CONFIG_DMI) += \
+ 		dmi.o
++
++ifeq ($(CONFIG_BRCMFMAC),m)
++obj-m += wcc/
++else
++brcmfmac-$(CONFIG_BRCMFMAC) += wcc/core.o
++endif
+diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h
+index 2008fde3ff4e..a2759171fcc9 100644
+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h
++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h
+@@ -142,7 +142,9 @@ struct brcmf_bus_stats {
+  * @fwvid: firmware vendor-support identifier of the device.
+  * @always_use_fws_queue: bus wants use queue also when fwsignal is inactive.
+  * @wowl_supported: is wowl supported by bus driver.
++ * @ops: callbacks for this bus instance.
+  * @msgbuf: msgbuf protocol parameters provided by bus layer.
++ * @list: member used to add this bus instance to linked list.
+  */
+ struct brcmf_bus {
+ 	union {
+@@ -164,6 +166,8 @@ struct brcmf_bus {
+ 
+ 	const struct brcmf_bus_ops *ops;
+ 	struct brcmf_bus_msgbuf *msgbuf;
++
++	struct list_head list;
+ };
+ 
+ /*
+diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
+index 35dd99dd7dfd..d3846918f942 100644
+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
+@@ -17,6 +17,7 @@
+ 
+ #include "core.h"
+ #include "bus.h"
++#include "fwvid.h"
+ #include "debug.h"
+ #include "fwil_types.h"
+ #include "p2p.h"
+@@ -1343,6 +1344,12 @@ int brcmf_attach(struct device *dev)
+ 	/* Link to bus module */
+ 	drvr->hdrlen = 0;
+ 
++	ret = brcmf_fwvid_attach(drvr);
++	if (ret != 0) {
++		bphy_err(drvr, "brcmf_fwvid_attach failed\n");
++		goto fail;
++	}
++
+ 	/* Attach and link in the protocol */
+ 	ret = brcmf_proto_attach(drvr);
+ 	if (ret != 0) {
+@@ -1453,6 +1460,8 @@ void brcmf_detach(struct device *dev)
+ 		brcmf_cfg80211_detach(drvr->config);
+ 		drvr->config = NULL;
+ 	}
++
++	brcmf_fwvid_detach(drvr);
+ }
+ 
+ void brcmf_free(struct device *dev)
+diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h
+index 5767d665cee5..b1b8fab88035 100644
+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h
++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h
+@@ -136,6 +136,8 @@ struct brcmf_pub {
+ 	struct work_struct bus_reset;
+ 
+ 	u8 clmver[BRCMF_DCMD_SMLEN];
++	const struct brcmf_fwvid_ops *vops;
++	void *vdata;
+ };
+ 
+ /* forward declarations */
+diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.c
+new file mode 100644
+index 000000000000..f5cbb09b1c83
+--- /dev/null
++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.c
+@@ -0,0 +1,190 @@
++// SPDX-License-Identifier: ISC
++/*
++ * Copyright (c) 2022 Broadcom Corporation
++ */
++#include <linux/errno.h>
++#include <linux/export.h>
++#include <linux/module.h>
++#include <linux/kmod.h>
++#include <linux/list.h>
++#include <linux/completion.h>
++#include <linux/mutex.h>
++#include <linux/printk.h>
++#include <linux/jiffies.h>
++#include <linux/workqueue.h>
++
++#include "core.h"
++#include "bus.h"
++#include "debug.h"
++#include "fwvid.h"
++
++#include "wcc/vops.h"
++
++struct brcmf_fwvid_entry {
++	const char *name;
++	const struct brcmf_fwvid_ops *vops;
++	struct list_head drvr_list;
++#if IS_MODULE(CONFIG_BRCMFMAC)
++	struct module *vmod;
++	struct completion reg_done;
++#endif
++};
++
++static DEFINE_MUTEX(fwvid_list_lock);
++
++#if IS_MODULE(CONFIG_BRCMFMAC)
++#define FWVID_ENTRY_INIT(_vid, _name) \
++	[BRCMF_FWVENDOR_ ## _vid] = { \
++		.name = #_name, \
++		.reg_done = COMPLETION_INITIALIZER(fwvid_list[BRCMF_FWVENDOR_ ## _vid].reg_done), \
++		.drvr_list = LIST_HEAD_INIT(fwvid_list[BRCMF_FWVENDOR_ ## _vid].drvr_list), \
++	}
++#else
++#define FWVID_ENTRY_INIT(_vid, _name) \
++	[BRCMF_FWVENDOR_ ## _vid] = { \
++		.name = #_name, \
++		.drvr_list = LIST_HEAD_INIT(fwvid_list[BRCMF_FWVENDOR_ ## _vid].drvr_list), \
++		.vops = _vid ## _VOPS \
++	}
++#endif /* IS_MODULE(CONFIG_BRCMFMAC) */
++
++static struct brcmf_fwvid_entry fwvid_list[BRCMF_FWVENDOR_NUM] = {
++	FWVID_ENTRY_INIT(WCC, wcc),
++};
++
++#if IS_MODULE(CONFIG_BRCMFMAC)
++static int brcmf_fwvid_request_module(enum brcmf_fwvendor fwvid)
++{
++	int ret;
++
++	if (!fwvid_list[fwvid].vmod) {
++		struct completion *reg_done = &fwvid_list[fwvid].reg_done;
++
++		mutex_unlock(&fwvid_list_lock);
++
++		ret = request_module("brcmfmac-%s", fwvid_list[fwvid].name);
++		if (ret)
++			goto fail;
++
++		ret = wait_for_completion_interruptible(reg_done);
++		if (ret)
++			goto fail;
++
++		mutex_lock(&fwvid_list_lock);
++	}
++	return 0;
++
++fail:
++	brcmf_err("mod=%s: failed %d\n", fwvid_list[fwvid].name, ret);
++	return ret;
++}
++
++int brcmf_fwvid_register_vendor(enum brcmf_fwvendor fwvid, struct module *vmod,
++				const struct brcmf_fwvid_ops *vops)
++{
++	if (fwvid >= BRCMF_FWVENDOR_NUM)
++		return -ERANGE;
++
++	if (WARN_ON(!vmod) || WARN_ON(!vops) ||
++	    WARN_ON(!vops->attach) || WARN_ON(!vops->detach))
++		return -EINVAL;
++
++	if (WARN_ON(fwvid_list[fwvid].vmod))
++		return -EEXIST;
++
++	brcmf_dbg(TRACE, "mod=%s: enter\n", fwvid_list[fwvid].name);
++
++	mutex_lock(&fwvid_list_lock);
++
++	fwvid_list[fwvid].vmod = vmod;
++	fwvid_list[fwvid].vops = vops;
++
++	mutex_unlock(&fwvid_list_lock);
++
++	complete_all(&fwvid_list[fwvid].reg_done);
++
++	return 0;
++}
++EXPORT_SYMBOL(brcmf_fwvid_register_vendor);
++
++int brcmf_fwvid_unregister_vendor(enum brcmf_fwvendor fwvid, struct module *mod)
++{
++	struct brcmf_bus *bus, *tmp;
++
++	if (fwvid >= BRCMF_FWVENDOR_NUM)
++		return -ERANGE;
++
++	if (WARN_ON(fwvid_list[fwvid].vmod != mod))
++		return -ENOENT;
++
++	mutex_lock(&fwvid_list_lock);
++
++	list_for_each_entry_safe(bus, tmp, &fwvid_list[fwvid].drvr_list, list) {
++		mutex_unlock(&fwvid_list_lock);
++
++		brcmf_dbg(INFO, "mod=%s: removing %s\n", fwvid_list[fwvid].name,
++			  dev_name(bus->dev));
++		brcmf_bus_remove(bus);
++
++		mutex_lock(&fwvid_list_lock);
++	}
++
++	fwvid_list[fwvid].vmod = NULL;
++	fwvid_list[fwvid].vops = NULL;
++	reinit_completion(&fwvid_list[fwvid].reg_done);
++
++	brcmf_dbg(TRACE, "mod=%s: exit\n", fwvid_list[fwvid].name);
++	mutex_unlock(&fwvid_list_lock);
++
++	return 0;
++}
++EXPORT_SYMBOL(brcmf_fwvid_unregister_vendor);
++#else
++static inline int brcmf_fwvid_request_module(enum brcmf_fwvendor fwvid)
++{
++	return 0;
++}
++#endif
++
++int brcmf_fwvid_attach_ops(struct brcmf_pub *drvr)
++{
++	enum brcmf_fwvendor fwvid = drvr->bus_if->fwvid;
++	int ret;
++
++	if (fwvid >= ARRAY_SIZE(fwvid_list))
++		return -ERANGE;
++
++	brcmf_dbg(TRACE, "mod=%s: enter: dev %s\n", fwvid_list[fwvid].name,
++		  dev_name(drvr->bus_if->dev));
++
++	mutex_lock(&fwvid_list_lock);
++
++	ret = brcmf_fwvid_request_module(fwvid);
++	if (ret)
++		return ret;
++
++	drvr->vops = fwvid_list[fwvid].vops;
++	list_add(&drvr->bus_if->list, &fwvid_list[fwvid].drvr_list);
++
++	mutex_unlock(&fwvid_list_lock);
++
++	return ret;
++}
++
++void brcmf_fwvid_detach_ops(struct brcmf_pub *drvr)
++{
++	enum brcmf_fwvendor fwvid = drvr->bus_if->fwvid;
++
++	if (fwvid >= ARRAY_SIZE(fwvid_list))
++		return;
++
++	brcmf_dbg(TRACE, "mod=%s: enter: dev %s\n", fwvid_list[fwvid].name,
++		  dev_name(drvr->bus_if->dev));
++
++	mutex_lock(&fwvid_list_lock);
++
++	drvr->vops = NULL;
++	list_del(&drvr->bus_if->list);
++
++	mutex_unlock(&fwvid_list_lock);
++}
+diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.h
+new file mode 100644
+index 000000000000..6b3aec190023
+--- /dev/null
++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.h
+@@ -0,0 +1,46 @@
++/* SPDX-License-Identifier: ISC */
++/*
++ * Copyright (c) 2022 Broadcom Corporation
++ */
++#ifndef FWVID_H_
++#define FWVID_H_
++
++#include "firmware.h"
++
++struct brcmf_pub;
++
++struct brcmf_fwvid_ops {
++	int (*attach)(struct brcmf_pub *drvr);
++	void (*detach)(struct brcmf_pub *drvr);
++};
++
++/* exported functions */
++int brcmf_fwvid_register_vendor(enum brcmf_fwvendor fwvid, struct module *mod,
++				const struct brcmf_fwvid_ops *ops);
++int brcmf_fwvid_unregister_vendor(enum brcmf_fwvendor fwvid, struct module *mod);
++
++/* core driver functions */
++int brcmf_fwvid_attach_ops(struct brcmf_pub *drvr);
++void brcmf_fwvid_detach_ops(struct brcmf_pub *drvr);
++
++static inline int brcmf_fwvid_attach(struct brcmf_pub *drvr)
++{
++	int ret;
++
++	ret = brcmf_fwvid_attach_ops(drvr);
++	if (ret)
++		return ret;
++
++	return drvr->vops->attach(drvr);
++}
++
++static inline void brcmf_fwvid_detach(struct brcmf_pub *drvr)
++{
++	if (!drvr->vops)
++		return;
++
++	drvr->vops->detach(drvr);
++	brcmf_fwvid_detach_ops(drvr);
++}
++
++#endif /* FWVID_H_ */
+diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/Makefile b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/Makefile
+new file mode 100644
+index 000000000000..7f455a19a2b1
+--- /dev/null
++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/Makefile
+@@ -0,0 +1,12 @@
++# SPDX-License-Identifier: ISC
++#
++# Copyright (c) 2022 Broadcom Corporation
++
++ccflags-y += \
++	-I $(srctree)/$(src) \
++	-I $(srctree)/$(src)/.. \
++	-I $(srctree)/$(src)/../../include
++
++obj-m += brcmfmac-wcc.o
++brcmfmac-wcc-objs += \
++		core.o module.o
+diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/core.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/core.c
+new file mode 100644
+index 000000000000..02de99818efa
+--- /dev/null
++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/core.c
+@@ -0,0 +1,27 @@
++// SPDX-License-Identifier: ISC
++/*
++ * Copyright (c) 2022 Broadcom Corporation
++ */
++#include <linux/errno.h>
++#include <linux/types.h>
++#include <core.h>
++#include <bus.h>
++#include <fwvid.h>
++
++#include "vops.h"
++
++static int brcmf_wcc_attach(struct brcmf_pub *drvr)
++{
++	pr_err("%s: executing\n", __func__);
++	return 0;
++}
++
++static void brcmf_wcc_detach(struct brcmf_pub *drvr)
++{
++	pr_err("%s: executing\n", __func__);
++}
++
++const struct brcmf_fwvid_ops brcmf_wcc_ops = {
++	.attach = brcmf_wcc_attach,
++	.detach = brcmf_wcc_detach,
++};
+diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/module.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/module.c
+new file mode 100644
+index 000000000000..23e3a4557880
+--- /dev/null
++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/module.c
+@@ -0,0 +1,26 @@
++// SPDX-License-Identifier: ISC
++/*
++ * Copyright (c) 2022 Broadcom Corporation
++ */
++#include <linux/module.h>
++#include <bus.h>
++#include <core.h>
++#include <fwvid.h>
++
++#include "vops.h"
++
++static int __init brcmf_wcc_init(void)
++{
++	return brcmf_fwvid_register_vendor(BRCMF_FWVENDOR_WCC, THIS_MODULE,
++					   &brcmf_wcc_ops);
++}
++
++static void __exit brcmf_wcc_exit(void)
++{
++	brcmf_fwvid_unregister_vendor(BRCMF_FWVENDOR_WCC, THIS_MODULE);
++}
++
++MODULE_LICENSE("Dual BSD/GPL");
++
++module_init(brcmf_wcc_init);
++module_exit(brcmf_wcc_exit);
+diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/vops.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/vops.h
+new file mode 100644
+index 000000000000..3aec44f80600
+--- /dev/null
++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/vops.h
+@@ -0,0 +1,11 @@
++/* SPDX-License-Identifier: ISC */
++/*
++ * Copyright (c) 2022 Broadcom Corporation
++ */
++#ifndef _BRCMFMAC_WCC_VOPS_H
++#define _BRCMFMAC_WCC_VOPS_H
++
++extern const struct brcmf_fwvid_ops brcmf_wcc_ops;
++#define WCC_VOPS	(&brcmf_wcc_ops)
++
++#endif /* _BRCMFMAC_WCC_VOPS_H */
+-- 
+2.49.1
+
diff --git a/patches/linux/5.10/0825-wifi-brcmfmac-add-support-for-Cypress-firmware-api.patch b/patches/linux/5.10/0825-wifi-brcmfmac-add-support-for-Cypress-firmware-api.patch
new file mode 100644
index 000000000..fc801936e
--- /dev/null
+++ b/patches/linux/5.10/0825-wifi-brcmfmac-add-support-for-Cypress-firmware-api.patch
@@ -0,0 +1,246 @@
+From 65e0a5eccdb4f99dd2cbcb333ada918e608c243a Mon Sep 17 00:00:00 2001
+From: Arend van Spriel <are...@br...>
+Date: Tue, 29 Nov 2022 14:54:43 +0100
+Subject: [PATCH 825/826] wifi: brcmfmac: add support for Cypress firmware api
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Cypress uses the brcmfmac driver and releases firmware which will
+likely diverge over time (or already has). So adding support for
+handling that.
+
+Reviewed-by: Hante Meuleman <han...@br...>
+Reviewed-by: Pieter-Paul Giesberts <pie...@br...>
+Reviewed-by: Franky Lin <fra...@br...>
+Signed-off-by: Arend van Spriel <are...@br...>
+Signed-off-by: Kalle Valo <kv...@ke...>
+Link: https://lore.kernel.org/r/202...@br...
+(cherry picked from commit f74f1ec22dc232be0296739148d126e9158eadf9)
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ .../broadcom/brcm80211/brcmfmac/Makefile      |  2 +
+ .../broadcom/brcm80211/brcmfmac/bcmsdh.c      | 46 +++++++++----------
+ .../broadcom/brcm80211/brcmfmac/bus.h         |  1 +
+ .../broadcom/brcm80211/brcmfmac/cyw/Makefile  | 12 +++++
+ .../broadcom/brcm80211/brcmfmac/cyw/core.c    | 27 +++++++++++
+ .../broadcom/brcm80211/brcmfmac/cyw/module.c  | 26 +++++++++++
+ .../broadcom/brcm80211/brcmfmac/cyw/vops.h    | 11 +++++
+ .../broadcom/brcm80211/brcmfmac/fwvid.c       |  2 +
+ 8 files changed, 104 insertions(+), 23 deletions(-)
+ create mode 100644 drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/Makefile
+ create mode 100644 drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/core.c
+ create mode 100644 drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/module.c
+ create mode 100644 drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/vops.h
+
+diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile
+index 031086ea9c9a..c4b45a44b246 100644
+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile
++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile
+@@ -50,6 +50,8 @@ brcmfmac-$(CONFIG_DMI) += \
+ 
+ ifeq ($(CONFIG_BRCMFMAC),m)
+ obj-m += wcc/
++obj-m += cyw/
+ else
+ brcmfmac-$(CONFIG_BRCMFMAC) += wcc/core.o
++brcmfmac-$(CONFIG_BRCMFMAC) += cyw/core.o
+ endif
+diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
+index fa4a726744ef..dc084cd81f8b 100644
+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
+@@ -966,35 +966,35 @@ int brcmf_sdiod_probe(struct brcmf_sdio_dev *sdiodev)
+ 	return ret;
+ }
+ 
+-#define BRCMF_SDIO_DEVICE(dev_id)	\
++#define BRCMF_SDIO_DEVICE(dev_id, fw_vend) \
+ 	{ \
+ 		SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, dev_id), \
+-		.driver_data = BRCMF_FWVENDOR_WCC \
++		.driver_data = BRCMF_FWVENDOR_ ## fw_vend \
+ 	}
+ 
+ /* devices we support, null terminated */
+ static const struct sdio_device_id brcmf_sdmmc_ids[] = {
+-	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43143),
+-	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43241),
+-	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4329),
+-	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4330),
+-	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4334),
+-	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43340),
+-	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43341),
+-	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43362),
+-	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43364),
+-	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4335_4339),
+-	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4339),
+-	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43430),
+-	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4345),
+-	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43455),
+-	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4354),
+-	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4356),
+-	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4359),
+-	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_4373),
+-	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_43012),
+-	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_43439),
+-	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_89359),
++	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43143, WCC),
++	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43241, WCC),
++	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4329, WCC),
++	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4330, WCC),
++	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4334, WCC),
++	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43340, WCC),
++	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43341, WCC),
++	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43362, WCC),
++	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43364, WCC),
++	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4335_4339, WCC),
++	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4339, WCC),
++	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43430, WCC),
++	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4345, WCC),
++	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43455, WCC),
++	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4354, WCC),
++	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4356, WCC),
++	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4359, WCC),
++	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_4373, CYW),
++	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_43012, CYW),
++	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_43439, CYW),
++	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_89359, CYW),
+ 	{ /* end: all zeroes */ }
+ };
+ MODULE_DEVICE_TABLE(sdio, brcmf_sdmmc_ids);
+diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h
+index a2759171fcc9..e114c65a75d7 100644
+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h
++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h
+@@ -25,6 +25,7 @@
+ 
+ enum brcmf_fwvendor {
+ 	BRCMF_FWVENDOR_WCC,
++	BRCMF_FWVENDOR_CYW,
+ 	/* keep last */
+ 	BRCMF_FWVENDOR_NUM,
+ 	BRCMF_FWVENDOR_INVALID
+diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/Makefile b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/Makefile
+new file mode 100644
+index 000000000000..5e1fddaff79e
+--- /dev/null
++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/Makefile
+@@ -0,0 +1,12 @@
++# SPDX-License-Identifier: ISC
++#
++# Copyright (c) 2022 Broadcom Corporation
++
++ccflags-y += \
++	-I $(srctree)/$(src) \
++	-I $(srctree)/$(src)/.. \
++	-I $(srctree)/$(src)/../../include
++
++obj-m += brcmfmac-cyw.o
++brcmfmac-cyw-objs += \
++		core.o module.o
+diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/core.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/core.c
+new file mode 100644
+index 000000000000..b75652ba9359
+--- /dev/null
++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/core.c
+@@ -0,0 +1,27 @@
++// SPDX-License-Identifier: ISC
++/*
++ * Copyright (c) 2022 Broadcom Corporation
++ */
++#include <linux/errno.h>
++#include <linux/types.h>
++#include <core.h>
++#include <bus.h>
++#include <fwvid.h>
++
++#include "vops.h"
++
++static int brcmf_cyw_attach(struct brcmf_pub *drvr)
++{
++	pr_err("%s: executing\n", __func__);
++	return 0;
++}
++
++static void brcmf_cyw_detach(struct brcmf_pub *drvr)
++{
++	pr_err("%s: executing\n", __func__);
++}
++
++const struct brcmf_fwvid_ops brcmf_cyw_ops = {
++	.attach = brcmf_cyw_attach,
++	.detach = brcmf_cyw_detach,
++};
+diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/module.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/module.c
+new file mode 100644
+index 000000000000..34294724a1f8
+--- /dev/null
++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/module.c
+@@ -0,0 +1,26 @@
++// SPDX-License-Identifier: ISC
++/*
++ * Copyright (c) 2022 Broadcom Corporation
++ */
++#include <linux/module.h>
++#include <bus.h>
++#include <core.h>
++#include <fwvid.h>
++
++#include "vops.h"
++
++static int __init brcmf_cyw_init(void)
++{
++	return brcmf_fwvid_register_vendor(BRCMF_FWVENDOR_CYW, THIS_MODULE,
++					   &brcmf_cyw_ops);
++}
++
++static void __exit brcmf_cyw_exit(void)
++{
++	brcmf_fwvid_unregister_vendor(BRCMF_FWVENDOR_CYW, THIS_MODULE);
++}
++
++MODULE_LICENSE("Dual BSD/GPL");
++
++module_init(brcmf_cyw_init);
++module_exit(brcmf_cyw_exit);
+diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/vops.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/vops.h
+new file mode 100644
+index 000000000000..870b5bead436
+--- /dev/null
++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/vops.h
+@@ -0,0 +1,11 @@
++/* SPDX-License-Identifier: ISC */
++/*
++ * Copyright (c) 2022 Broadcom Corporation
++ */
++#ifndef _BRCMFMAC_CYW_VOPS_H
++#define _BRCMFMAC_CYW_VOPS_H
++
++extern const struct brcmf_fwvid_ops brcmf_cyw_ops;
++#define CYW_VOPS	(&brcmf_cyw_ops)
++
++#endif /* _BRCMFMAC_CYW_VOPS_H */
+diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.c
+index f5cbb09b1c83..ee23eb1809c4 100644
+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.c
++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.c
+@@ -19,6 +19,7 @@
+ #include "fwvid.h"
+ 
+ #include "wcc/vops.h"
++#include "cyw/vops.h"
+ 
+ struct brcmf_fwvid_entry {
+ 	const char *name;
+@@ -50,6 +51,7 @@ static DEFINE_MUTEX(fwvid_list_lock);
+ 
+ static struct brcmf_fwvid_entry fwvid_list[BRCMF_FWVENDOR_NUM] = {
+ 	FWVID_ENTRY_INIT(WCC, wcc),
++	FWVID_ENTRY_INIT(CYW, cyw),
+ };
+ 
+ #if IS_MODULE(CONFIG_BRCMFMAC)
+-- 
+2.49.1
+
diff --git a/patches/linux/5.10/0826-wifi-brcmfmac-add-Cypress-43439-SDIO-ids.patch b/patches/linux/5.10/0826-wifi-brcmfmac-add-Cypress-43439-SDIO-ids.patch
new file mode 100644
index 000000000..92c7bcaca
--- /dev/null
+++ b/patches/linux/5.10/0826-wifi-brcmfmac-add-Cypress-43439-SDIO-ids.patch
@@ -0,0 +1,98 @@
+From 9ea606ccf9be9d612d1743112928dad67867dc7b Mon Sep 17 00:00:00 2001
+From: Marek Vasut <ma...@de...>
+Date: Fri, 7 Apr 2023 22:37:52 +0200
+Subject: [PATCH 826/826] wifi: brcmfmac: add Cypress 43439 SDIO ids
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add SDIO ids for use with the muRata 1YN (Cypress CYW43439).
+The odd thing about this is that the previous 1YN populated
+on M.2 card for evaluation purposes had BRCM SDIO vendor ID,
+while the chip populated on real hardware has a Cypress one.
+The device ID also differs between the two devices. But they
+are both 43439 otherwise, so add the IDs for both.
+
+On-device 1YN (43439), the new one, chip label reads "1YN":
+```
+/sys/.../mmc_host/mmc2/mmc2:0001 # cat vendor device
+0x04b4
+0xbd3d
+```
+
+EA M.2 evaluation board 1YN (43439), the old one, chip label reads "1YN ES1.4":
+```
+/sys/.../mmc_host/mmc0/mmc0:0001/# cat vendor device
+0x02d0
+0xa9a6
+```
+
+Reviewed-by: Hans de Goede <hde...@re...>
+Cc: st...@vg...
+Signed-off-by: Marek Vasut <ma...@de...>
+Reviewed-by: Simon Horman <sim...@co...>
+Signed-off-by: Kalle Valo <kv...@ke...>
+Link: https://lore.kernel.org/r/202...@de...
+(cherry picked from commit cc4cffc3c142d57df48c07851862444e1d33bdaa)
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ .../net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c    | 9 ++++++++-
+ include/linux/mmc/sdio_ids.h                             | 5 ++++-
+ 2 files changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
+index dc084cd81f8b..788e9e55721d 100644
+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
+@@ -972,6 +972,12 @@ int brcmf_sdiod_probe(struct brcmf_sdio_dev *sdiodev)
+ 		.driver_data = BRCMF_FWVENDOR_ ## fw_vend \
+ 	}
+ 
++#define CYW_SDIO_DEVICE(dev_id, fw_vend) \
++	{ \
++		SDIO_DEVICE(SDIO_VENDOR_ID_CYPRESS, dev_id), \
++		.driver_data = BRCMF_FWVENDOR_ ## fw_vend \
++	}
++
+ /* devices we support, null terminated */
+ static const struct sdio_device_id brcmf_sdmmc_ids[] = {
+ 	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43143, WCC),
+@@ -986,6 +992,7 @@ static const struct sdio_device_id brcmf_sdmmc_ids[] = {
+ 	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4335_4339, WCC),
+ 	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4339, WCC),
+ 	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43430, WCC),
++	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43439, WCC),
+ 	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4345, WCC),
+ 	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43455, WCC),
+ 	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4354, WCC),
+@@ -993,8 +1000,8 @@ static const struct sdio_device_id brcmf_sdmmc_ids[] = {
+ 	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4359, WCC),
+ 	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_4373, CYW),
+ 	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_43012, CYW),
+-	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_43439, CYW),
+ 	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_89359, CYW),
++	CYW_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_43439, CYW),
+ 	{ /* end: all zeroes */ }
+ };
+ MODULE_DEVICE_TABLE(sdio, brcmf_sdmmc_ids);
+diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h
+index 35dd1d073171..c579bc63cf0f 100644
+--- a/include/linux/mmc/sdio_ids.h
++++ b/include/linux/mmc/sdio_ids.h
+@@ -74,9 +74,12 @@
+ #define SDIO_DEVICE_ID_BROADCOM_43362		0xa962
+ #define SDIO_DEVICE_ID_BROADCOM_43364		0xa9a4
+ #define SDIO_DEVICE_ID_BROADCOM_43430		0xa9a6
+-#define SDIO_DEVICE_ID_BROADCOM_CYPRESS_43439	0xa9af
++#define SDIO_DEVICE_ID_BROADCOM_43439		0xa9af
+ #define SDIO_DEVICE_ID_BROADCOM_43455		0xa9bf
+ 
++#define SDIO_VENDOR_ID_CYPRESS			0x04b4
++#define SDIO_DEVICE_ID_BROADCOM_CYPRESS_43439	0xbd3d
++
+ #define SDIO_VENDOR_ID_MARVELL			0x02df
+ #define SDIO_DEVICE_ID_MARVELL_LIBERTAS		0x9103
+ #define SDIO_DEVICE_ID_MARVELL_8688_WLAN	0x9104
+-- 
+2.49.1
+


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-488-gfccd918f0

[sszy <ss...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  fccd918f0670392e2182480f4307de7540d48751 (commit)
       via  6b17520bfdbabbbda58db818279eee5393c43841 (commit)
      from  96a4b19e494b22c6030c97b5c3c9ae5d200f625a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit fccd918f0670392e2182480f4307de7540d48751
Author: Sébastien Szymanski <seb...@ar...>
Date:   Thu Aug 14 17:36:40 2025 +0200

    [BUILDROOT] 2025.02: opos93sp: bump Linux to e6494020ade6f5196e058e76f00ae1a7751dff49

commit 6b17520bfdbabbbda58db818279eee5393c43841
Author: Sébastien Szymanski <seb...@ar...>
Date:   Thu Aug 14 17:35:28 2025 +0200

    [BUILDROOT] 2025.02: opos93sp: add default bitstream

-----------------------------------------------------------------------

Summary of changes:
 buildroot/configs/opos93sp-legacy-6.1_defconfig        |   4 ++--
 .../opos93sp/opos93sp-linux-legacy-6.1.fragment        |   1 +
 .../rootfs_overlay/lib/firmware/fpga/bitstream.bin     |   1 +
 .../rootfs_overlay/lib/firmware/fpga/opos93sp-test.bin | Bin 0 -> 679188 bytes
 4 files changed, 4 insertions(+), 2 deletions(-)
 create mode 120000 buildroot/target/device/armadeus/opos93sp/rootfs_overlay/lib/firmware/fpga/bitstream.bin
 create mode 100644 buildroot/target/device/armadeus/opos93sp/rootfs_overlay/lib/firmware/fpga/opos93sp-test.bin

diff --git a/buildroot/configs/opos93sp-legacy-6.1_defconfig b/buildroot/configs/opos93sp-legacy-6.1_defconfig
index 31030e3c9..8c561c30e 100644
--- a/buildroot/configs/opos93sp-legacy-6.1_defconfig
+++ b/buildroot/configs/opos93sp-legacy-6.1_defconfig
@@ -13,7 +13,7 @@ BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
 BR2_TARGET_GENERIC_GETTY_PORT="ttyLP0"
 BR2_TARGET_TZ_ZONELIST="europe etcetera"
 BR2_TARGET_LOCALTIME="Europe/Paris"
-BR2_ROOTFS_OVERLAY="$(ARMADEUS_PATH)/rootfs/target_overlay"
+BR2_ROOTFS_OVERLAY="$(ARMADEUS_PATH)/rootfs/target_overlay $(ARMADEUS_PATH)/opos93sp/rootfs_overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx9-bootloader-prepare.sh $(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="opos93sp imx93"
@@ -24,7 +24,7 @@ BR2_TARGET_ARMADEUS_SDRAM_SIZE="512"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://gitlab.com/armadeus/armadeus-linux.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="8b271b60612be1549f3c143387c5f3039bea4712"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="e6494020ade6f5196e058e76f00ae1a7751dff49"
 BR2_LINUX_KERNEL_DEFCONFIG="imx_v8"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-legacy-6.1.fragment"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
diff --git a/buildroot/target/device/armadeus/opos93sp/opos93sp-linux-legacy-6.1.fragment b/buildroot/target/device/armadeus/opos93sp/opos93sp-linux-legacy-6.1.fragment
index 92d98bb6d..75a6b2730 100644
--- a/buildroot/target/device/armadeus/opos93sp/opos93sp-linux-legacy-6.1.fragment
+++ b/buildroot/target/device/armadeus/opos93sp/opos93sp-linux-legacy-6.1.fragment
@@ -1,5 +1,6 @@
 CONFIG_DRM_PANEL_ILITEK_ILI9881C=y
 CONFIG_FLEXIO_ARMABUS=m
+CONFIG_GPIO_FLEXIO_ARMABUS=m
 CONFIG_PWM_IMX_TPM=y
 # CONFIG_FW_LOADER_USER_HELPER is not set
 # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is no set
diff --git a/buildroot/target/device/armadeus/opos93sp/rootfs_overlay/lib/firmware/fpga/bitstream.bin b/buildroot/target/device/armadeus/opos93sp/rootfs_overlay/lib/firmware/fpga/bitstream.bin
new file mode 120000
index 000000000..9595c0c9e
--- /dev/null
+++ b/buildroot/target/device/armadeus/opos93sp/rootfs_overlay/lib/firmware/fpga/bitstream.bin
@@ -0,0 +1 @@
+opos93sp-test.bin
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/opos93sp/rootfs_overlay/lib/firmware/fpga/opos93sp-test.bin b/buildroot/target/device/armadeus/opos93sp/rootfs_overlay/lib/firmware/fpga/opos93sp-test.bin
new file mode 100644
index 000000000..f98be0b05
Binary files /dev/null and b/buildroot/target/device/armadeus/opos93sp/rootfs_overlay/lib/firmware/fpga/opos93sp-test.bin differ


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-486-g96a4b19e4

[sszy <ss...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  96a4b19e494b22c6030c97b5c3c9ae5d200f625a (commit)
      from  90fd74bcd644d853f10282bbb0d25ce17e9b3229 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 96a4b19e494b22c6030c97b5c3c9ae5d200f625a
Author: Sébastien Szymanski <seb...@ar...>
Date:   Thu Aug 14 14:19:08 2025 +0200

    [BUILDROOT] 2025.02: patch to fix python-numpy build

-----------------------------------------------------------------------

Summary of changes:
 ...hon-numpy-fix-build-with-python-cython-3..patch | 78 ++++++++++++++++++++++
 patches/buildroot/2025.02/cleanup_buildroot.sh     |  1 +
 2 files changed, 79 insertions(+)
 create mode 100644 patches/buildroot/2025.02/0480-package-python-numpy-fix-build-with-python-cython-3..patch

diff --git a/patches/buildroot/2025.02/0480-package-python-numpy-fix-build-with-python-cython-3..patch b/patches/buildroot/2025.02/0480-package-python-numpy-fix-build-with-python-cython-3..patch
new file mode 100644
index 000000000..7f4749267
--- /dev/null
+++ b/patches/buildroot/2025.02/0480-package-python-numpy-fix-build-with-python-cython-3..patch
@@ -0,0 +1,78 @@
+From 7480dea7ab0102054f328099e8c680ef7415dc1a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Thu, 14 Aug 2025 13:49:17 +0200
+Subject: [PATCH 480/480] package/python-numpy: fix build with python-cython >=
+ 3.1
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Since commit b536caaec0d8 ("package/python-cython: bump to version
+3.1.2"), python-numpy fails to build:
+
+Error compiling Cython file:
+------------------------------------------------------------
+...
+                np.issubdtype(cov.dtype, np.complexfloating)):
+            raise TypeError("mean and cov must not be complex")
+        if size is None:
+            shape = []
+        elif isinstance(size, (int, long, np.integer)):
+                                    ^
+------------------------------------------------------------
+numpy/random/_generator.pyx:3760:36: undeclared name not builtin: long
+
+Backport upstream patch to fix that build failure.
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+Backport to: 2025.05.x, 2025.02.x
+---
+ .../0001-MNT-do-not-use-long-type.patch       | 34 +++++++++++++++++++
+ 1 file changed, 34 insertions(+)
+ create mode 100644 package/python-numpy/0001-MNT-do-not-use-long-type.patch
+
+diff --git a/package/python-numpy/0001-MNT-do-not-use-long-type.patch b/package/python-numpy/0001-MNT-do-not-use-long-type.patch
+new file mode 100644
+index 000000000000..d813a4d51b26
+--- /dev/null
++++ b/package/python-numpy/0001-MNT-do-not-use-long-type.patch
+@@ -0,0 +1,34 @@
++From 6dc2fd31f8a5a4ef502cb7734f004f5bce94e671 Mon Sep 17 00:00:00 2001
++From: Thomas A Caswell <tca...@gm...>
++Date: Sat, 18 Nov 2023 16:46:52 -0500
++Subject: [PATCH] MNT: do not use `long` type
++MIME-Version: 1.0
++Content-Type: text/plain; charset=UTF-8
++Content-Transfer-Encoding: 8bit
++
++Removed as type at language level 3 in ed7e95912b6ed7d20e190fbf1aecb9f2a997d479
++in cython
++
++Upstream: https://github.com/numpy/numpy/commit/6dc2fd31f8a5a4ef502cb7734f004f5bce94e671
++
++Signed-off-by: Sébastien Szymanski <seb...@ar...>
++---
++ numpy/random/_generator.pyx | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/numpy/random/_generator.pyx b/numpy/random/_generator.pyx
++index d067e795eb5c..ae481d69d696 100644
++--- a/numpy/random/_generator.pyx
+++++ b/numpy/random/_generator.pyx
++@@ -3757,7 +3757,7 @@ def multivariate_normal(self, mean, cov, size=None, check_valid='warn',
++ 
++         if size is None:
++             shape = []
++-        elif isinstance(size, (int, long, np.integer)):
+++        elif isinstance(size, (int, np.integer)):
++             shape = [size]
++         else:
++             shape = size
++-- 
++2.49.1
++
+-- 
+2.49.1
+
diff --git a/patches/buildroot/2025.02/cleanup_buildroot.sh b/patches/buildroot/2025.02/cleanup_buildroot.sh
index ec870fea0..05537f013 100755
--- a/patches/buildroot/2025.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2025.02/cleanup_buildroot.sh
@@ -96,6 +96,7 @@ rm -rf buildroot/package/pwmmusic/pwmmusic.mk
 rm -rf buildroot/package/python-flask-socketio/Config.in
 rm -rf buildroot/package/python-flask-socketio/python-flask-socketio.hash
 rm -rf buildroot/package/python-flask-socketio/python-flask-socketio.mk
+rm -rf buildroot/package/python-numpy/0001-MNT-do-not-use-long-type.patch
 rm -rf buildroot/package/pywebradio/Config.in
 rm -rf buildroot/package/pywebradio/pywebradio.mk
 rm -rf buildroot/package/quake-pak/Config.in


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-485-g90fd74bcd

[sszy <ss...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  90fd74bcd644d853f10282bbb0d25ce17e9b3229 (commit)
      from  39a8b6d40cc0f753acc50d0095648042af29cdf0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 90fd74bcd644d853f10282bbb0d25ce17e9b3229
Author: Sébastien Szymanski <seb...@ar...>
Date:   Wed Aug 13 16:21:58 2025 +0200

    BUILDROOT] 2025.02: patch to bump gst1-plugins-bayer2rgb-neon

-----------------------------------------------------------------------

Summary of changes:
 ...reamer1-gst1-plugins-bayer2rgb-neon-bump-.patch | 45 ++++++++++++++++++++++
 patches/buildroot/2025.02/cleanup_buildroot.sh     |  2 +
 2 files changed, 47 insertions(+)
 create mode 100644 patches/buildroot/2025.02/0479-package-gstreamer1-gst1-plugins-bayer2rgb-neon-bump-.patch

diff --git a/patches/buildroot/2025.02/0479-package-gstreamer1-gst1-plugins-bayer2rgb-neon-bump-.patch b/patches/buildroot/2025.02/0479-package-gstreamer1-gst1-plugins-bayer2rgb-neon-bump-.patch
new file mode 100644
index 000000000..913c9fee5
--- /dev/null
+++ b/patches/buildroot/2025.02/0479-package-gstreamer1-gst1-plugins-bayer2rgb-neon-bump-.patch
@@ -0,0 +1,45 @@
+From 1fd08adfd3b6bf43d3e5434e11bfa0e223fcd1b5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Tisserand?=
+ <seb...@ar...>
+Date: Wed, 13 Aug 2025 10:18:13 +0200
+Subject: [PATCH 479/479] package/gstreamer1/gst1-plugins-bayer2rgb-neon: bump
+ to latest git commit
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Lastest git commit supports more bayer formats:
+https://gitlab-ext.sigma-chemnitz.de/ensc/gst-bayer2rgb-neon/-/commit/b5ad78a1c6bfaa3adce5f0f69493efcce106e953
+
+Signed-off-by: Sébastien Tisserand <seb...@ar...>
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ .../gst1-plugins-bayer2rgb-neon.hash                            | 2 +-
+ .../gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.mk  | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.hash b/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.hash
+index 1efaf6421d6e..e495061999a8 100644
+--- a/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.hash
++++ b/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.hash
+@@ -1,3 +1,3 @@
+ # Locally calculated
+-sha256  6ae89adf1979edf5760bbf2fb589dcaa905cff55bb828e6b271bc3d1e403a130  gst1-plugins-bayer2rgb-neon-b630798efcd611879e7cb1c246052e5ba1acc41d-git4.tar.gz
++sha256  a9e2c9efb0c255f16ed75d2555128513be54ac9c1fc58bffb48921b4eb1f9945  gst1-plugins-bayer2rgb-neon-7e06aa310805b1600d12f1d3bb0058aa02ab8f83-git4.tar.gz
+ sha256  8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  COPYING
+diff --git a/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.mk b/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.mk
+index 0d4aeac7f56a..cde25ad45e41 100644
+--- a/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.mk
++++ b/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.mk
+@@ -4,7 +4,7 @@
+ #
+ ################################################################################
+ 
+-GST1_PLUGINS_BAYER2RGB_NEON_VERSION = b630798efcd611879e7cb1c246052e5ba1acc41d
++GST1_PLUGINS_BAYER2RGB_NEON_VERSION = 7e06aa310805b1600d12f1d3bb0058aa02ab8f83
+ GST1_PLUGINS_BAYER2RGB_NEON_SITE = https://gitlab-ext.sigma-chemnitz.de/ensc/gst-bayer2rgb-neon.git
+ GST1_PLUGINS_BAYER2RGB_NEON_SITE_METHOD = git
+ GST1_PLUGINS_BAYER2RGB_NEON_LICENSE = GPL-3.0
+-- 
+2.49.1
+
diff --git a/patches/buildroot/2025.02/cleanup_buildroot.sh b/patches/buildroot/2025.02/cleanup_buildroot.sh
index 52be85aba..ec870fea0 100755
--- a/patches/buildroot/2025.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2025.02/cleanup_buildroot.sh
@@ -58,6 +58,8 @@ rm -rf buildroot/package/gstreamer1/Config.in
 rm -rf buildroot/package/gstreamer1/gst1-imx2/Config.in
 rm -rf buildroot/package/gstreamer1/gst1-imx2/gst1-imx2.hash
 rm -rf buildroot/package/gstreamer1/gst1-imx2/gst1-imx2.mk
+rm -rf buildroot/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.hash
+rm -rf buildroot/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.mk
 rm -rf buildroot/package/leptonmodule/0001-flirpi-add-missing-dependency-to-leptcam-target.patch
 rm -rf buildroot/package/leptonmodule/Config.in
 rm -rf buildroot/package/leptonmodule/leptonmodule.mk


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-484-g39a8b6d40

[sszy <ss...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  39a8b6d40cc0f753acc50d0095648042af29cdf0 (commit)
       via  e6ac35939caac524548d51f892365f7d1a732bcc (commit)
       via  b0bafab9d34e0c7e94c5d568f24b381610d4f1b3 (commit)
      from  f173ad32c7b876e6ea5b5cf6d8a7aaf9edf78ccd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 39a8b6d40cc0f753acc50d0095648042af29cdf0
Author: Sébastien Szymanski <seb...@ar...>
Date:   Wed Aug 13 13:34:22 2025 +0200

    [BUILDROOT] opos93: add opos93-optee-legacy-6.1_defconfig

commit e6ac35939caac524548d51f892365f7d1a732bcc
Author: Sébastien Szymanski <seb...@ar...>
Date:   Wed Aug 13 13:41:20 2025 +0200

    [BUILDROOT] 2025.02: backport patches to bump optee packages to 4.6.0

commit b0bafab9d34e0c7e94c5d568f24b381610d4f1b3
Author: Sébastien Szymanski <seb...@ar...>
Date:   Tue Aug 12 16:17:37 2025 +0200

    Makefile: fix help message when BR is not configured

-----------------------------------------------------------------------

Summary of changes:
 Makefile                                           |  4 +-
 ...defconfig => opos93-optee-legacy-6.1_defconfig} | 21 ++++++---
 .../armadeus/opos93/opos93-bootloader-prepare.sh   | 43 +++++++++++++++++++
 .../opos93/opos93-optee-linux-legacy-6.1.fragment  |  2 +
 .../0469-package-optee-client-bump-to-4.5.0.patch  | 50 ++++++++++++++++++++++
 ...0470-package-optee-examples-bump-to-4.5.0.patch | 50 ++++++++++++++++++++++
 .../0471-package-optee-test-bump-to-4.5.0.patch    | 50 ++++++++++++++++++++++
 .../0472-package-optee-test-fix-license-hash.patch | 47 ++++++++++++++++++++
 .../0473-package-optee-test-bump-to-4.6.0.patch    | 50 ++++++++++++++++++++++
 ...0474-package-optee-examples-bump-to-4.6.0.patch | 48 +++++++++++++++++++++
 .../0475-package-optee-client-bump-to-4.6.0.patch  | 48 +++++++++++++++++++++
 ...76-boot-move-package-options-to-a-submenu.patch | 41 ++++++++++++++++++
 .../2025.02/0477-boot-optee-os-bump-to-4.5.0.patch | 50 ++++++++++++++++++++++
 .../2025.02/0478-boot-optee-os-bump-to-4.6.0.patch | 48 +++++++++++++++++++++
 patches/buildroot/2025.02/cleanup_buildroot.sh     |  9 ++++
 15 files changed, 553 insertions(+), 8 deletions(-)
 copy buildroot/configs/{opos93-legacy-6.1_defconfig => opos93-optee-legacy-6.1_defconfig} (83%)
 create mode 100755 buildroot/target/device/armadeus/opos93/opos93-bootloader-prepare.sh
 create mode 100644 buildroot/target/device/armadeus/opos93/opos93-optee-linux-legacy-6.1.fragment
 create mode 100644 patches/buildroot/2025.02/0469-package-optee-client-bump-to-4.5.0.patch
 create mode 100644 patches/buildroot/2025.02/0470-package-optee-examples-bump-to-4.5.0.patch
 create mode 100644 patches/buildroot/2025.02/0471-package-optee-test-bump-to-4.5.0.patch
 create mode 100644 patches/buildroot/2025.02/0472-package-optee-test-fix-license-hash.patch
 create mode 100644 patches/buildroot/2025.02/0473-package-optee-test-bump-to-4.6.0.patch
 create mode 100644 patches/buildroot/2025.02/0474-package-optee-examples-bump-to-4.6.0.patch
 create mode 100644 patches/buildroot/2025.02/0475-package-optee-client-bump-to-4.6.0.patch
 create mode 100644 patches/buildroot/2025.02/0476-boot-move-package-options-to-a-submenu.patch
 create mode 100644 patches/buildroot/2025.02/0477-boot-optee-os-bump-to-4.5.0.patch
 create mode 100644 patches/buildroot/2025.02/0478-boot-optee-os-bump-to-4.6.0.patch

diff --git a/Makefile b/Makefile
index 51d491873..e2ef703b6 100644
--- a/Makefile
+++ b/Makefile
@@ -72,9 +72,9 @@ ECHO_CONFIGURATION_NOT_DEFINED:= echo -en "\033[1m"; \
                 echo " opos8mm: " >&2; \
                 echo "     "$(shell find $(ARMADEUS_CONFIG_DIR) -name "opos8mm*_defconfig" | sed 's/.*\///');\
                 echo " opos93: " >&2; \
-                echo "     "$(shell find $(ARMADEUS_CONFIG_DIR) -name "opos93*_defconfig" | sed 's/.*\///' | sed 's/opos93sp.*/ /g');\
+                echo "     "$(shell find $(ARMADEUS_CONFIG_DIR) -name "opos93-*_defconfig" | sed 's/.*\///');\
                 echo " opos93sp: " >&2; \
-                echo "     "$(shell find $(ARMADEUS_CONFIG_DIR) -name "opos93*_defconfig" | sed 's/.*\///');\
+                echo "     "$(shell find $(ARMADEUS_CONFIG_DIR) -name "opos93sp*_defconfig" | sed 's/.*\///');\
                 echo "                                                   "; \
 		echo -en "\033[0m";
 
diff --git a/buildroot/configs/opos93-legacy-6.1_defconfig b/buildroot/configs/opos93-optee-legacy-6.1_defconfig
similarity index 83%
copy from buildroot/configs/opos93-legacy-6.1_defconfig
copy to buildroot/configs/opos93-optee-legacy-6.1_defconfig
index 49950011e..0f5c6e163 100644
--- a/buildroot/configs/opos93-legacy-6.1_defconfig
+++ b/buildroot/configs/opos93-optee-legacy-6.1_defconfig
@@ -15,7 +15,7 @@ BR2_TARGET_TZ_ZONELIST="europe etcetera"
 BR2_TARGET_LOCALTIME="Europe/Paris"
 BR2_ROOTFS_OVERLAY="$(ARMADEUS_PATH)/rootfs/target_overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx9-bootloader-prepare.sh $(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="$(ARMADEUS_PATH)/opos93/opos93-bootloader-prepare.sh $(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="opos93 imx93"
 BR2_TARGET_ARMADEUS=y
 BR2_BOARD_NAME="opos93"
@@ -26,7 +26,7 @@ BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://gitlab.com/armadeus/armadeus-linux.git"
 BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="038a4fac803e8c682c0bba645ab4cf78078d7dee"
 BR2_LINUX_KERNEL_DEFCONFIG="imx_v8"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-legacy-6.1.fragment"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-legacy-6.1.fragment $(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-optee-linux-legacy-6.1.fragment"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx93-opos93dev"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
@@ -118,6 +118,7 @@ BR2_PACKAGE_WPA_SUPPLICANT_WPA3=y
 BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
 BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
 BR2_PACKAGE_WPA_SUPPLICANT_DBUS=y
+BR2_PACKAGE_OPTEE_TEST=y
 BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_UTIL_LINUX_BINARIES=y
 BR2_PACKAGE_UTIL_LINUX_FSCK=y
@@ -128,17 +129,25 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="256M"
 BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O ^64bit,^metadata_csum,uninit_bg"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/nxp-imx/imx-atf"
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="8dbe28631802a51b3ec8179b2c5635b00393ad97"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://gitlab.com/armadeus/armadeus-atf.git"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="a87503b583d7085380cfd0cfc811beb3980f5517"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx93"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="SPD=opteed"
+BR2_TARGET_OPTEE_OS=y
+BR2_TARGET_OPTEE_OS_CUSTOM_GIT=y
+BR2_TARGET_OPTEE_OS_CUSTOM_REPO_URL="https://gitlab.com/armadeus/armadeus-op-tee.git"
+BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION="9162355eaeb2783c4cdb67d79f8fd2ae0ec37424"
+BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY=y
+BR2_TARGET_OPTEE_OS_PLATFORM="imx-opos93"
+BR2_TARGET_OPTEE_OS_CORE_IMAGES="tee-raw.bin"
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://gitlab.com/armadeus/armadeus-u-boot.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="4be1b355534698ab738ab74e82d2000550ce7d04"
-BR2_TARGET_UBOOT_BOARD_DEFCONFIG="opos93dev"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="e39996f02c7c877d024098216795283f63de3903"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="opos93dev_optee"
 BR2_TARGET_UBOOT_SPL=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_GENIMAGE=y
diff --git a/buildroot/target/device/armadeus/opos93/opos93-bootloader-prepare.sh b/buildroot/target/device/armadeus/opos93/opos93-bootloader-prepare.sh
new file mode 100755
index 000000000..76afc29fe
--- /dev/null
+++ b/buildroot/target/device/armadeus/opos93/opos93-bootloader-prepare.sh
@@ -0,0 +1,43 @@
+#!/usr/bin/env bash
+
+main ()
+{
+	SPL_LOAD_ADDR=0x2049A000
+	ATF_LOAD_ADDR=0x204E0000
+	if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91=y$" "${BR2_CONFIG}"; then
+		SPL_LOAD_ADDR=0x204A0000
+		ATF_LOAD_ADDR=0x204C0000
+	fi
+
+	dd if="${BINARIES_DIR}/u-boot-spl.bin" of="${BINARIES_DIR}/u-boot-spl-padded.bin" bs=4 conv=sync
+	cat "${BINARIES_DIR}/u-boot-spl-padded.bin" "${BINARIES_DIR}/ddr_fw.bin" > "${BINARIES_DIR}/u-boot-spl-ddr.bin"
+
+	"${HOST_DIR}/bin/mkimage_imx8" -commit > "${BINARIES_DIR}/mkimg.commit"
+	cat "${BINARIES_DIR}/u-boot.bin" "${BINARIES_DIR}/mkimg.commit" > "${BINARIES_DIR}/u-boot-hash.bin"
+	rm -f "${BINARIES_DIR}/mkimg.commit"
+
+	if grep -Eq "^BR2_TARGET_OPTEE_OS=y$" "${BR2_CONFIG}"; then
+		"${HOST_DIR}/bin/mkimage_imx8" -soc IMX9 -c \
+			-ap "${BINARIES_DIR}/bl31.bin" a55 ${ATF_LOAD_ADDR} \
+			-ap "${BINARIES_DIR}/u-boot-hash.bin" a55 0x82000000 \
+			-ap "${BINARIES_DIR}/tee-raw.bin" a55 0x80000000 \
+			-out "${BINARIES_DIR}/u-boot-atf-container.img"
+	else
+		"${HOST_DIR}/bin/mkimage_imx8" -soc IMX9 -c \
+			-ap "${BINARIES_DIR}/bl31.bin" a55 ${ATF_LOAD_ADDR} \
+			-ap "${BINARIES_DIR}/u-boot-hash.bin" a55 0x80200000 \
+			-out "${BINARIES_DIR}/u-boot-atf-container.img"
+	fi
+
+	"${HOST_DIR}/bin/mkimage_imx8" -soc IMX9 -append "${BINARIES_DIR}/ahab-container.img" -c \
+		-ap "${BINARIES_DIR}/u-boot-spl-ddr.bin" a55 ${SPL_LOAD_ADDR} \
+		-out "${BINARIES_DIR}/imx9-boot-sd.bin"
+
+	flashbin_size="$(wc -c "${BINARIES_DIR}/imx9-boot-sd.bin" | awk '{print $1}')"
+	pad_cnt=$(($((flashbin_size + 0x400 - 1)) / 0x400))
+	dd if="${BINARIES_DIR}/u-boot-atf-container.img" of="${BINARIES_DIR}/imx9-boot-sd.bin" bs=1K seek=${pad_cnt}
+
+	exit $?
+}
+
+main "$@"
diff --git a/buildroot/target/device/armadeus/opos93/opos93-optee-linux-legacy-6.1.fragment b/buildroot/target/device/armadeus/opos93/opos93-optee-linux-legacy-6.1.fragment
new file mode 100644
index 000000000..4b1f23286
--- /dev/null
+++ b/buildroot/target/device/armadeus/opos93/opos93-optee-linux-legacy-6.1.fragment
@@ -0,0 +1,2 @@
+# CONFIG_IMX_EL_ENCLAVE is not set
+# CONFIG_IMX_ELE_TRNG is not set
diff --git a/patches/buildroot/2025.02/0469-package-optee-client-bump-to-4.5.0.patch b/patches/buildroot/2025.02/0469-package-optee-client-bump-to-4.5.0.patch
new file mode 100644
index 000000000..b69bfd301
--- /dev/null
+++ b/patches/buildroot/2025.02/0469-package-optee-client-bump-to-4.5.0.patch
@@ -0,0 +1,50 @@
+From 280162a468dd6bc88e428636a4c3c47d58b0042e Mon Sep 17 00:00:00 2001
+From: Nayab Sayed <nay...@mi...>
+Date: Fri, 4 Apr 2025 16:37:54 +0530
+Subject: [PATCH 469/475] package/optee-client: bump to 4.5.0
+
+Bump to the latest version of optee-client
+
+Signed-off-by: Nayab Sayed <nay...@mi...>
+[Julien: move package archive hash to the "Locally computed" section]
+Signed-off-by: Julien Olivain <ju...@fr...>
+---
+ package/optee-client/Config.in         | 4 ++--
+ package/optee-client/optee-client.hash | 3 +--
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/package/optee-client/Config.in b/package/optee-client/Config.in
+index efed800a87f6..865b0d8f31f7 100644
+--- a/package/optee-client/Config.in
++++ b/package/optee-client/Config.in
+@@ -30,7 +30,7 @@ config BR2_PACKAGE_OPTEE_CLIENT_AS_OS
+ 	depends on BR2_TARGET_OPTEE_OS_CUSTOM_VERSION
+ 
+ config BR2_PACKAGE_OPTEE_CLIENT_LATEST
+-	bool "4.3.0"
++	bool "4.5.0"
+ 	help
+ 	  Use the latest release tag from the optee-client official Git
+ 	  repository.
+@@ -60,7 +60,7 @@ config BR2_PACKAGE_OPTEE_CLIENT_VERSION
+ 	string
+ 	default BR2_TARGET_OPTEE_OS_CUSTOM_VERSION_VALUE \
+ 				if BR2_PACKAGE_OPTEE_CLIENT_AS_OS
+-	default "4.3.0"		if BR2_PACKAGE_OPTEE_CLIENT_LATEST
++	default "4.5.0"		if BR2_PACKAGE_OPTEE_CLIENT_LATEST
+ 	default "custom"	if BR2_PACKAGE_OPTEE_CLIENT_CUSTOM_TARBALL
+ 
+ config BR2_PACKAGE_OPTEE_CLIENT_TEE_FS_PATH
+diff --git a/package/optee-client/optee-client.hash b/package/optee-client/optee-client.hash
+index 8904c930ee67..2ef793c9d6b5 100644
+--- a/package/optee-client/optee-client.hash
++++ b/package/optee-client/optee-client.hash
+@@ -1,4 +1,3 @@
+-# From https://github.com/OP-TEE/optee_client/archive/4.3.0/optee-client-4.3.0.tar.gz
+-sha256  a9a91bdb433df795c87a6d15198effbd648e3671ae611f2a3f8b41229d61cce0  optee-client-4.3.0.tar.gz
+ # Locally computed
++sha256  ac6dc2c0c253ea228ea230e537211a45475771050faf4e66fe64321de3a0a652  optee-client-4.5.0.tar.gz
+ sha256  fda8385993f112d7ca61b88b54ba5b4cbeec7e43a0f9b317d5186703c1985e8f  LICENSE
+-- 
+2.49.1
+
diff --git a/patches/buildroot/2025.02/0470-package-optee-examples-bump-to-4.5.0.patch b/patches/buildroot/2025.02/0470-package-optee-examples-bump-to-4.5.0.patch
new file mode 100644
index 000000000..5384c0ed8
--- /dev/null
+++ b/patches/buildroot/2025.02/0470-package-optee-examples-bump-to-4.5.0.patch
@@ -0,0 +1,50 @@
+From 70035cbb1e9223a703317c6e466a7216158bcf2f Mon Sep 17 00:00:00 2001
+From: Nayab Sayed <nay...@mi...>
+Date: Fri, 4 Apr 2025 16:37:55 +0530
+Subject: [PATCH 470/475] package/optee-examples: bump to 4.5.0
+
+Update optee-examples to the latest tagged release
+
+Signed-off-by: Nayab Sayed <nay...@mi...>
+[Julien: move package archive hash to the "Locally computed" section]
+Signed-off-by: Julien Olivain <ju...@fr...>
+---
+ package/optee-examples/Config.in           | 4 ++--
+ package/optee-examples/optee-examples.hash | 3 +--
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/package/optee-examples/Config.in b/package/optee-examples/Config.in
+index 5c5b0ce5ba4a..222beb2af10c 100644
+--- a/package/optee-examples/Config.in
++++ b/package/optee-examples/Config.in
+@@ -42,7 +42,7 @@ config BR2_PACKAGE_OPTEE_EXAMPLES_AS_OS
+ 	depends on BR2_TARGET_OPTEE_OS_CUSTOM_VERSION
+ 
+ config BR2_PACKAGE_OPTEE_EXAMPLES_LATEST
+-	bool "4.3.0"
++	bool "4.5.0"
+ 	help
+ 	  Use the latest release tag from the optee-examples official
+ 	  Git repository.
+@@ -72,7 +72,7 @@ config BR2_PACKAGE_OPTEE_EXAMPLES_VERSION
+ 	string
+ 	default BR2_TARGET_OPTEE_OS_CUSTOM_VERSION_VALUE \
+ 				if BR2_PACKAGE_OPTEE_EXAMPLES_AS_OS
+-	default "4.3.0"		if BR2_PACKAGE_OPTEE_EXAMPLES_LATEST
++	default "4.5.0"		if BR2_PACKAGE_OPTEE_EXAMPLES_LATEST
+ 	default "custom"	if BR2_PACKAGE_OPTEE_EXAMPLES_CUSTOM_TARBALL
+ 
+ endif # BR2_PACKAGE_OPTEE_EXAMPLES
+diff --git a/package/optee-examples/optee-examples.hash b/package/optee-examples/optee-examples.hash
+index a6ecd2caec54..5a12bb22ba19 100644
+--- a/package/optee-examples/optee-examples.hash
++++ b/package/optee-examples/optee-examples.hash
+@@ -1,4 +1,3 @@
+-# From https://github.com/linaro-swg/optee_examples/archive/4.3.0/optee-examples-4.3.0.tar.gz
+-sha256  ee1576617365b5fe9d20d72c16cf6b39159eb79b1401189bd37a91ef03371820  optee-examples-4.3.0.tar.gz
+ # Locally computed
++sha256  3fcf1f9eab8d094f898bbb3e2a69a0ca321765f39c832749fdb571a21063bcfc  optee-examples-4.5.0.tar.gz
+ sha256  6f1ef8449cb82ae79d2155605f7985bdf0f08e7ab5007de9b4362e8bf28733b9  LICENSE
+-- 
+2.49.1
+
diff --git a/patches/buildroot/2025.02/0471-package-optee-test-bump-to-4.5.0.patch b/patches/buildroot/2025.02/0471-package-optee-test-bump-to-4.5.0.patch
new file mode 100644
index 000000000..14b5bc2d7
--- /dev/null
+++ b/patches/buildroot/2025.02/0471-package-optee-test-bump-to-4.5.0.patch
@@ -0,0 +1,50 @@
+From 8c2b2314df768a0add1fe45a9ad7dbcf2192d26f Mon Sep 17 00:00:00 2001
+From: Nayab Sayed <nay...@mi...>
+Date: Fri, 4 Apr 2025 16:37:56 +0530
+Subject: [PATCH 471/475] package/optee-test: bump to 4.5.0
+
+Update optee-test to the latest tagged release
+
+Signed-off-by: Nayab Sayed <nay...@mi...>
+[Julien: move package archive hash to the "Locally computed" section]
+Signed-off-by: Julien Olivain <ju...@fr...>
+---
+ package/optee-test/Config.in       | 4 ++--
+ package/optee-test/optee-test.hash | 3 +--
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/package/optee-test/Config.in b/package/optee-test/Config.in
+index 03b532e3380c..c01e3c06a7f6 100644
+--- a/package/optee-test/Config.in
++++ b/package/optee-test/Config.in
+@@ -48,7 +48,7 @@ config BR2_PACKAGE_OPTEE_TEST_AS_OS
+ 	depends on BR2_TARGET_OPTEE_OS_CUSTOM_VERSION
+ 
+ config BR2_PACKAGE_OPTEE_TEST_LATEST
+-	bool "4.3.0"
++	bool "4.5.0"
+ 	help
+ 	  Use the latest release tag from the optee-test official Git
+ 	  repository.
+@@ -77,7 +77,7 @@ config BR2_PACKAGE_OPTEE_TEST_VERSION
+ 	string
+ 	default BR2_TARGET_OPTEE_OS_CUSTOM_VERSION_VALUE \
+ 				if BR2_PACKAGE_OPTEE_TEST_AS_OS
+-	default "4.3.0"		if BR2_PACKAGE_OPTEE_TEST_LATEST
++	default "4.5.0"		if BR2_PACKAGE_OPTEE_TEST_LATEST
+ 	default "custom"	if BR2_PACKAGE_OPTEE_TEST_CUSTOM_TARBALL
+ 
+ endif # BR2_PACKAGE_OPTEE_TEST
+diff --git a/package/optee-test/optee-test.hash b/package/optee-test/optee-test.hash
+index 5922487a6275..ba2cbaaa15be 100644
+--- a/package/optee-test/optee-test.hash
++++ b/package/optee-test/optee-test.hash
+@@ -1,4 +1,3 @@
+-# From https://github.com/OP-TEE/optee_test/archive/4.3.0/optee-test-4.3.0.tar.gz
+-sha256  7bb181b74be88593df48321b816837acaad8e4d45e883f25a2e039978e5ec415  optee-test-4.3.0.tar.gz
+ # Locally computed
++sha256  cda3a4280a919cc6cd3cd3060e8c176cd42b968a9008305a6881e1fd433a6f1e  optee-test-4.5.0.tar.gz
+ sha256  6e6810981f0ddab9e0d44399d0700a15d9f760a3c2843cc866659c2074139ae7  LICENSE.md
+-- 
+2.49.1
+
diff --git a/patches/buildroot/2025.02/0472-package-optee-test-fix-license-hash.patch b/patches/buildroot/2025.02/0472-package-optee-test-fix-license-hash.patch
new file mode 100644
index 000000000..eec66a737
--- /dev/null
+++ b/patches/buildroot/2025.02/0472-package-optee-test-fix-license-hash.patch
@@ -0,0 +1,47 @@
+From 726150b0e666bd6ce052bb631ac6034c6a2dd13e Mon Sep 17 00:00:00 2001
+From: Julien Olivain <ju...@fr...>
+Date: Sun, 6 Apr 2025 17:46:19 +0200
+Subject: [PATCH 472/475] package/optee-test: fix license hash
+
+Commit [1] updated optee-test version but forgot to update
+the license hash which was changed upstream in [2] to include
+copies of the GPL-2.0 and BSD-2-Clause license files. While at
+it, this commit also include those two new files in the license
+hash file.
+
+[1] https://gitlab.com/buildroot.org/buildroot/-/commit/8c2b2314df768a0add1fe45a9ad7dbcf2192d26f
+[2] https://github.com/OP-TEE/optee_test/commit/a748f5fcd9ec8a574dc86a5aa56d05bc6ac174e7
+
+Signed-off-by: Julien Olivain <ju...@fr...>
+---
+ package/optee-test/optee-test.hash | 4 +++-
+ package/optee-test/optee-test.mk   | 2 +-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/package/optee-test/optee-test.hash b/package/optee-test/optee-test.hash
+index ba2cbaaa15be..3192c72b93d5 100644
+--- a/package/optee-test/optee-test.hash
++++ b/package/optee-test/optee-test.hash
+@@ -1,3 +1,5 @@
+ # Locally computed
+ sha256  cda3a4280a919cc6cd3cd3060e8c176cd42b968a9008305a6881e1fd433a6f1e  optee-test-4.5.0.tar.gz
+-sha256  6e6810981f0ddab9e0d44399d0700a15d9f760a3c2843cc866659c2074139ae7  LICENSE.md
++sha256  2b36458cd0292200e406a608efe7dfda17aae39646a86b730a2776b61d0fa410  LICENSE-BSD
++sha256  a094472b51f57d0403953d087e410793519cb6f3a7cea2be34eb44e09a426a73  LICENSE-GPL
++sha256  a562ab14c307d0e02b7bf6f1bdb0d1cf789409e6375a500e15dc7a0503e5c2c3  LICENSE.md
+diff --git a/package/optee-test/optee-test.mk b/package/optee-test/optee-test.mk
+index c250639d0613..23874b51b945 100644
+--- a/package/optee-test/optee-test.mk
++++ b/package/optee-test/optee-test.mk
+@@ -6,7 +6,7 @@
+ 
+ OPTEE_TEST_VERSION = $(call qstrip,$(BR2_PACKAGE_OPTEE_TEST_VERSION))
+ OPTEE_TEST_LICENSE = GPL-2.0, BSD-2-Clause,
+-OPTEE_TEST_LICENSE_FILES = LICENSE.md
++OPTEE_TEST_LICENSE_FILES = LICENSE-BSD LICENSE-GPL LICENSE.md
+ 
+ ifeq ($(BR2_PACKAGE_OPTEE_TEST_CUSTOM_TARBALL),y)
+ OPTEE_TEST_TARBALL = $(call qstrip,$(BR2_PACKAGE_OPTEE_TEST_CUSTOM_TARBALL_LOCATION))
+-- 
+2.49.1
+
diff --git a/patches/buildroot/2025.02/0473-package-optee-test-bump-to-4.6.0.patch b/patches/buildroot/2025.02/0473-package-optee-test-bump-to-4.6.0.patch
new file mode 100644
index 000000000..9e6df5e4f
--- /dev/null
+++ b/patches/buildroot/2025.02/0473-package-optee-test-bump-to-4.6.0.patch
@@ -0,0 +1,50 @@
+From d4e5b293d87b491815ec58d6c0405893681e0722 Mon Sep 17 00:00:00 2001
+From: Nayab Sayed <nay...@mi...>
+Date: Tue, 29 Apr 2025 12:11:28 +0530
+Subject: [PATCH 473/475] package/optee-test: bump to 4.6.0
+
+Update optee-test to the latest tagged release
+
+Signed-off-by: Nayab Sayed <nay...@mi...>
+Signed-off-by: Julien Olivain <ju...@fr...>
+---
+ package/optee-test/Config.in       | 4 ++--
+ package/optee-test/optee-test.hash | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/package/optee-test/Config.in b/package/optee-test/Config.in
+index c01e3c06a7f6..dd1160ea485d 100644
+--- a/package/optee-test/Config.in
++++ b/package/optee-test/Config.in
+@@ -48,7 +48,7 @@ config BR2_PACKAGE_OPTEE_TEST_AS_OS
+ 	depends on BR2_TARGET_OPTEE_OS_CUSTOM_VERSION
+ 
+ config BR2_PACKAGE_OPTEE_TEST_LATEST
+-	bool "4.5.0"
++	bool "4.6.0"
+ 	help
+ 	  Use the latest release tag from the optee-test official Git
+ 	  repository.
+@@ -77,7 +77,7 @@ config BR2_PACKAGE_OPTEE_TEST_VERSION
+ 	string
+ 	default BR2_TARGET_OPTEE_OS_CUSTOM_VERSION_VALUE \
+ 				if BR2_PACKAGE_OPTEE_TEST_AS_OS
+-	default "4.5.0"		if BR2_PACKAGE_OPTEE_TEST_LATEST
++	default "4.6.0"		if BR2_PACKAGE_OPTEE_TEST_LATEST
+ 	default "custom"	if BR2_PACKAGE_OPTEE_TEST_CUSTOM_TARBALL
+ 
+ endif # BR2_PACKAGE_OPTEE_TEST
+diff --git a/package/optee-test/optee-test.hash b/package/optee-test/optee-test.hash
+index 3192c72b93d5..058d95e29b20 100644
+--- a/package/optee-test/optee-test.hash
++++ b/package/optee-test/optee-test.hash
+@@ -1,5 +1,5 @@
+ # Locally computed
+-sha256  cda3a4280a919cc6cd3cd3060e8c176cd42b968a9008305a6881e1fd433a6f1e  optee-test-4.5.0.tar.gz
++sha256  db4de73fa955a7db70a64a2c4ad1d2c48ddcb54c369821aba670fec6131a6f61  optee-test-4.6.0.tar.gz
+ sha256  2b36458cd0292200e406a608efe7dfda17aae39646a86b730a2776b61d0fa410  LICENSE-BSD
+ sha256  a094472b51f57d0403953d087e410793519cb6f3a7cea2be34eb44e09a426a73  LICENSE-GPL
+ sha256  a562ab14c307d0e02b7bf6f1bdb0d1cf789409e6375a500e15dc7a0503e5c2c3  LICENSE.md
+-- 
+2.49.1
+
diff --git a/patches/buildroot/2025.02/0474-package-optee-examples-bump-to-4.6.0.patch b/patches/buildroot/2025.02/0474-package-optee-examples-bump-to-4.6.0.patch
new file mode 100644
index 000000000..18eceaf3c
--- /dev/null
+++ b/patches/buildroot/2025.02/0474-package-optee-examples-bump-to-4.6.0.patch
@@ -0,0 +1,48 @@
+From 972bbabdcb785932c94a2908368a3e0473aef8bf Mon Sep 17 00:00:00 2001
+From: Nayab Sayed <nay...@mi...>
+Date: Tue, 29 Apr 2025 12:11:29 +0530
+Subject: [PATCH 474/475] package/optee-examples: bump to 4.6.0
+
+Update optee-examples to the latest tagged release
+
+Signed-off-by: Nayab Sayed <nay...@mi...>
+Signed-off-by: Julien Olivain <ju...@fr...>
+---
+ package/optee-examples/Config.in           | 4 ++--
+ package/optee-examples/optee-examples.hash | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/package/optee-examples/Config.in b/package/optee-examples/Config.in
+index 222beb2af10c..702adc84db3c 100644
+--- a/package/optee-examples/Config.in
++++ b/package/optee-examples/Config.in
+@@ -42,7 +42,7 @@ config BR2_PACKAGE_OPTEE_EXAMPLES_AS_OS
+ 	depends on BR2_TARGET_OPTEE_OS_CUSTOM_VERSION
+ 
+ config BR2_PACKAGE_OPTEE_EXAMPLES_LATEST
+-	bool "4.5.0"
++	bool "4.6.0"
+ 	help
+ 	  Use the latest release tag from the optee-examples official
+ 	  Git repository.
+@@ -72,7 +72,7 @@ config BR2_PACKAGE_OPTEE_EXAMPLES_VERSION
+ 	string
+ 	default BR2_TARGET_OPTEE_OS_CUSTOM_VERSION_VALUE \
+ 				if BR2_PACKAGE_OPTEE_EXAMPLES_AS_OS
+-	default "4.5.0"		if BR2_PACKAGE_OPTEE_EXAMPLES_LATEST
++	default "4.6.0"		if BR2_PACKAGE_OPTEE_EXAMPLES_LATEST
+ 	default "custom"	if BR2_PACKAGE_OPTEE_EXAMPLES_CUSTOM_TARBALL
+ 
+ endif # BR2_PACKAGE_OPTEE_EXAMPLES
+diff --git a/package/optee-examples/optee-examples.hash b/package/optee-examples/optee-examples.hash
+index 5a12bb22ba19..54b98868d799 100644
+--- a/package/optee-examples/optee-examples.hash
++++ b/package/optee-examples/optee-examples.hash
+@@ -1,3 +1,3 @@
+ # Locally computed
+-sha256  3fcf1f9eab8d094f898bbb3e2a69a0ca321765f39c832749fdb571a21063bcfc  optee-examples-4.5.0.tar.gz
++sha256  6891390aefa2046d500d3ffec05c327d7763e89645b2e99ef2330b561ba645f5  optee-examples-4.6.0.tar.gz
+ sha256  6f1ef8449cb82ae79d2155605f7985bdf0f08e7ab5007de9b4362e8bf28733b9  LICENSE
+-- 
+2.49.1
+
diff --git a/patches/buildroot/2025.02/0475-package-optee-client-bump-to-4.6.0.patch b/patches/buildroot/2025.02/0475-package-optee-client-bump-to-4.6.0.patch
new file mode 100644
index 000000000..83e8ac600
--- /dev/null
+++ b/patches/buildroot/2025.02/0475-package-optee-client-bump-to-4.6.0.patch
@@ -0,0 +1,48 @@
+From 4e271e6dccdd9b712077c12a4aa5aa8d82527531 Mon Sep 17 00:00:00 2001
+From: Nayab Sayed <nay...@mi...>
+Date: Tue, 29 Apr 2025 12:11:30 +0530
+Subject: [PATCH 475/475] package/optee-client: bump to 4.6.0
+
+Bump to the latest version of optee-client
+
+Signed-off-by: Nayab Sayed <nay...@mi...>
+Signed-off-by: Julien Olivain <ju...@fr...>
+---
+ package/optee-client/Config.in         | 4 ++--
+ package/optee-client/optee-client.hash | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/package/optee-client/Config.in b/package/optee-client/Config.in
+index 865b0d8f31f7..ac3b680743f4 100644
+--- a/package/optee-client/Config.in
++++ b/package/optee-client/Config.in
+@@ -30,7 +30,7 @@ config BR2_PACKAGE_OPTEE_CLIENT_AS_OS
+ 	depends on BR2_TARGET_OPTEE_OS_CUSTOM_VERSION
+ 
+ config BR2_PACKAGE_OPTEE_CLIENT_LATEST
+-	bool "4.5.0"
++	bool "4.6.0"
+ 	help
+ 	  Use the latest release tag from the optee-client official Git
+ 	  repository.
+@@ -60,7 +60,7 @@ config BR2_PACKAGE_OPTEE_CLIENT_VERSION
+ 	string
+ 	default BR2_TARGET_OPTEE_OS_CUSTOM_VERSION_VALUE \
+ 				if BR2_PACKAGE_OPTEE_CLIENT_AS_OS
+-	default "4.5.0"		if BR2_PACKAGE_OPTEE_CLIENT_LATEST
++	default "4.6.0"		if BR2_PACKAGE_OPTEE_CLIENT_LATEST
+ 	default "custom"	if BR2_PACKAGE_OPTEE_CLIENT_CUSTOM_TARBALL
+ 
+ config BR2_PACKAGE_OPTEE_CLIENT_TEE_FS_PATH
+diff --git a/package/optee-client/optee-client.hash b/package/optee-client/optee-client.hash
+index 2ef793c9d6b5..a5d98521a382 100644
+--- a/package/optee-client/optee-client.hash
++++ b/package/optee-client/optee-client.hash
+@@ -1,3 +1,3 @@
+ # Locally computed
+-sha256  ac6dc2c0c253ea228ea230e537211a45475771050faf4e66fe64321de3a0a652  optee-client-4.5.0.tar.gz
++sha256  a970338c9f69861901336716d89684646e4480b9970996a5b3581ae7d49fdaa3  optee-client-4.6.0.tar.gz
+ sha256  fda8385993f112d7ca61b88b54ba5b4cbeec7e43a0f9b317d5186703c1985e8f  LICENSE
+-- 
+2.49.1
+
diff --git a/patches/buildroot/2025.02/0476-boot-move-package-options-to-a-submenu.patch b/patches/buildroot/2025.02/0476-boot-move-package-options-to-a-submenu.patch
new file mode 100644
index 000000000..7247d2c8b
--- /dev/null
+++ b/patches/buildroot/2025.02/0476-boot-move-package-options-to-a-submenu.patch
@@ -0,0 +1,41 @@
+From 06dc0cc3537b0a1b1f04c63de9caed993ce737dc Mon Sep 17 00:00:00 2001
+From: Luca Ceresoli <luc...@bo...>
+Date: Mon, 17 Mar 2025 18:40:24 +0100
+Subject: [PATCH 476/478] boot: move package options to a submenu
+
+Change all Kconfig entries for packages in the "Bootloaders" menu to
+submenus.
+
+Currently many bootloaders and firmwares in this menu use a 'config'
+keyword and thus menuconfig presents their sub-options as a flat list in
+the same menu. This is not very convenient as some have a lot of
+sub-options, and in (more and more common) configurations with multiple
+such packages enabled the menuconfig screen becomes very crowded. Moreover
+options of 'string' type don't have a visible indentation when their value
+exceeds a few characters, thus making it visually hard to grasp which
+package the various options belong to.
+
+Non-bootloader packages having suboptions usually use a 'menuconfig'
+keywork to have sub-options in a submenu. Do the same for packages in the
+"Bootloaders" menu which have more than one sub-option.
+
+Signed-off-by: Luca Ceresoli <luc...@bo...>
+Reviewed-by: Neal Frager <nea...@am...>
+Signed-off-by: Julien Olivain <ju...@fr...>
+---
+ boot/optee-os/Config.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in
+index 6c4afccc7ade..563f192b187e 100644
+--- a/boot/optee-os/Config.in
++++ b/boot/optee-os/Config.in
+@@ -1,4 +1,4 @@
+-config BR2_TARGET_OPTEE_OS
++menuconfig BR2_TARGET_OPTEE_OS
+ 	bool "optee_os"
+ 	depends on BR2_ARM_CPU_ARMV8A || BR2_ARM_CPU_ARMV7A || BR2_RISCV_64
+ 	help
+-- 
+2.49.1
+
diff --git a/patches/buildroot/2025.02/0477-boot-optee-os-bump-to-4.5.0.patch b/patches/buildroot/2025.02/0477-boot-optee-os-bump-to-4.5.0.patch
new file mode 100644
index 000000000..40098efba
--- /dev/null
+++ b/patches/buildroot/2025.02/0477-boot-optee-os-bump-to-4.5.0.patch
@@ -0,0 +1,50 @@
+From 14ef1ed7d27ba2f6d99bbdd0d80f67df50fccce9 Mon Sep 17 00:00:00 2001
+From: Nayab Sayed <nay...@mi...>
+Date: Fri, 4 Apr 2025 16:37:53 +0530
+Subject: [PATCH 477/478] boot/optee-os: bump to 4.5.0
+
+Update OP-TEE to its latest tag
+
+Signed-off-by: Nayab Sayed <nay...@mi...>
+[Julien: move package archive hash to the "Locally computed" section]
+Signed-off-by: Julien Olivain <ju...@fr...>
+---
+ boot/optee-os/Config.in     | 4 ++--
+ boot/optee-os/optee-os.hash | 3 +--
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in
+index 563f192b187e..de0ed3168b1d 100644
+--- a/boot/optee-os/Config.in
++++ b/boot/optee-os/Config.in
+@@ -18,7 +18,7 @@ choice
+ 	  Select the version of OP-TEE OS you want to use
+ 
+ config BR2_TARGET_OPTEE_OS_LATEST
+-	bool "4.3.0"
++	bool "4.5.0"
+ 	depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS
+ 	select BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY
+ 	help
+@@ -79,7 +79,7 @@ endif
+ 
+ config BR2_TARGET_OPTEE_OS_VERSION
+ 	string
+-	default "4.3.0"		if BR2_TARGET_OPTEE_OS_LATEST
++	default "4.5.0"		if BR2_TARGET_OPTEE_OS_LATEST
+ 	default BR2_TARGET_OPTEE_OS_CUSTOM_VERSION_VALUE \
+ 		if BR2_TARGET_OPTEE_OS_CUSTOM_VERSION
+ 	default "custom"	if BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL
+diff --git a/boot/optee-os/optee-os.hash b/boot/optee-os/optee-os.hash
+index 16b3d7430e0a..685826d2f9dc 100644
+--- a/boot/optee-os/optee-os.hash
++++ b/boot/optee-os/optee-os.hash
+@@ -1,4 +1,3 @@
+-# From https://github.com/OP-TEE/optee_os/archive/4.3.0/optee-os-4.3.0.tar.gz
+-sha256  390b271905c828d6def9fa6a77bbaa425f3b434d733c8eb18f582ccbc6896096  optee-os-4.3.0.tar.gz
+ # Locally computed
++sha256  43c389f0505e8bc21d6fbaa8ea83ec67d1746ed14a537e3f505cd0e5b4cc2db9  optee-os-4.5.0.tar.gz
+ sha256  1247ee90858f4037b6cac63cbffddfed435d0d73c631b37d78c1e6e6ab3e5d1a  LICENSE
+-- 
+2.49.1
+
diff --git a/patches/buildroot/2025.02/0478-boot-optee-os-bump-to-4.6.0.patch b/patches/buildroot/2025.02/0478-boot-optee-os-bump-to-4.6.0.patch
new file mode 100644
index 000000000..ec400497c
--- /dev/null
+++ b/patches/buildroot/2025.02/0478-boot-optee-os-bump-to-4.6.0.patch
@@ -0,0 +1,48 @@
+From d521d87ee5fea1d78b93fb5593b2a79e64336a6c Mon Sep 17 00:00:00 2001
+From: Nayab Sayed <nay...@mi...>
+Date: Tue, 29 Apr 2025 12:11:27 +0530
+Subject: [PATCH 478/478] boot/optee-os: bump to 4.6.0
+
+Update OP-TEE to its latest tag
+
+Signed-off-by: Nayab Sayed <nay...@mi...>
+Signed-off-by: Julien Olivain <ju...@fr...>
+---
+ boot/optee-os/Config.in     | 4 ++--
+ boot/optee-os/optee-os.hash | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in
+index de0ed3168b1d..433dae90d8be 100644
+--- a/boot/optee-os/Config.in
++++ b/boot/optee-os/Config.in
+@@ -18,7 +18,7 @@ choice
+ 	  Select the version of OP-TEE OS you want to use
+ 
+ config BR2_TARGET_OPTEE_OS_LATEST
+-	bool "4.5.0"
++	bool "4.6.0"
+ 	depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS
+ 	select BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY
+ 	help
+@@ -79,7 +79,7 @@ endif
+ 
+ config BR2_TARGET_OPTEE_OS_VERSION
+ 	string
+-	default "4.5.0"		if BR2_TARGET_OPTEE_OS_LATEST
++	default "4.6.0"		if BR2_TARGET_OPTEE_OS_LATEST
+ 	default BR2_TARGET_OPTEE_OS_CUSTOM_VERSION_VALUE \
+ 		if BR2_TARGET_OPTEE_OS_CUSTOM_VERSION
+ 	default "custom"	if BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL
+diff --git a/boot/optee-os/optee-os.hash b/boot/optee-os/optee-os.hash
+index 685826d2f9dc..c86bd1e0d996 100644
+--- a/boot/optee-os/optee-os.hash
++++ b/boot/optee-os/optee-os.hash
+@@ -1,3 +1,3 @@
+ # Locally computed
+-sha256  43c389f0505e8bc21d6fbaa8ea83ec67d1746ed14a537e3f505cd0e5b4cc2db9  optee-os-4.5.0.tar.gz
++sha256  0c947c6972bf50c483cb993af01041d4094b1e03711c7246cdde6ba2ffc351fe  optee-os-4.6.0.tar.gz
+ sha256  1247ee90858f4037b6cac63cbffddfed435d0d73c631b37d78c1e6e6ab3e5d1a  LICENSE
+-- 
+2.49.1
+
diff --git a/patches/buildroot/2025.02/cleanup_buildroot.sh b/patches/buildroot/2025.02/cleanup_buildroot.sh
index ea0d5935c..52be85aba 100755
--- a/patches/buildroot/2025.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2025.02/cleanup_buildroot.sh
@@ -14,6 +14,8 @@ rm -rf buildroot/Makefile
 rm -rf buildroot/arch/Config.in.arm
 rm -rf buildroot/boot/arm-trusted-firmware/Config.in
 rm -rf buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.mk
+rm -rf buildroot/boot/optee-os/Config.in
+rm -rf buildroot/boot/optee-os/optee-os.hash
 rm -rf buildroot/boot/uboot/Config.in
 rm -rf buildroot/boot/uboot/uboot.mk
 rm -rf buildroot/package/Config.in
@@ -77,6 +79,13 @@ rm -rf buildroot/package/marble/marble.mk
 rm -rf buildroot/package/matiec/Config.in
 rm -rf buildroot/package/matiec/host-matiec-001-fix_bison_compilation_error.patch
 rm -rf buildroot/package/matiec/matiec.mk
+rm -rf buildroot/package/optee-client/Config.in
+rm -rf buildroot/package/optee-client/optee-client.hash
+rm -rf buildroot/package/optee-examples/Config.in
+rm -rf buildroot/package/optee-examples/optee-examples.hash
+rm -rf buildroot/package/optee-test/Config.in
+rm -rf buildroot/package/optee-test/optee-test.hash
+rm -rf buildroot/package/optee-test/optee-test.mk
 rm -rf buildroot/package/pci_debug/Config.in
 rm -rf buildroot/package/pci_debug/pci_debug.hash
 rm -rf buildroot/package/pci_debug/pci_debug.mk


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus/u-boot branch, armadeus-2024.01, updated. e39996f02c7c877d024098216795283f63de3903

[sszy <ss...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus/u-boot".

The branch, armadeus-2024.01 has been updated
       via  e39996f02c7c877d024098216795283f63de3903 (commit)
      from  d2d7e2061eb7720eea7a75b72aa90c0f1a9cec81 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e39996f02c7c877d024098216795283f63de3903
Author: Sébastien Szymanski <seb...@ar...>
Date:   Wed Aug 13 14:05:54 2025 +0200

    configs: opos93dev_optee_defconfig: set loadaddr to 0x82000000

-----------------------------------------------------------------------

Summary of changes:
 configs/opos93dev_optee_defconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configs/opos93dev_optee_defconfig b/configs/opos93dev_optee_defconfig
index 73aedd9eeb..e4f0f031f7 100644
--- a/configs/opos93dev_optee_defconfig
+++ b/configs/opos93dev_optee_defconfig
@@ -21,7 +21,7 @@ CONFIG_SPL=y
 CONFIG_ENV_OFFSET_REDUND=0x20000
 CONFIG_IMX_ELE_DEK_ENCAP=y
 CONFIG_SPL_IMX_ROMAPI_LOADADDR=0x88000000
-CONFIG_SYS_LOAD_ADDR=0x82400000
+CONFIG_SYS_LOAD_ADDR=0x82000000
 CONFIG_SYS_MEMTEST_START=0x82000000
 CONFIG_SYS_MEMTEST_END=0x90000000
 CONFIG_REMAKE_ELF=y
@@ -107,7 +107,7 @@ CONFIG_CPU=y
 CONFIG_CPU_IMX=y
 CONFIG_IMX9_LPDDR4X=y
 CONFIG_USB_FUNCTION_FASTBOOT=y
-CONFIG_FASTBOOT_BUF_ADDR=0x80400000
+CONFIG_FASTBOOT_BUF_ADDR=0x82000000
 CONFIG_FASTBOOT_BUF_SIZE=0x1E000000
 CONFIG_FASTBOOT_FLASH=y
 CONFIG_FASTBOOT_UUU_SUPPORT=y


hooks/post-receive
-- 
armadeus/u-boot

[Armadeus-commitlog] armadeus/u-boot branch, armadeus-2024.01, updated. d2d7e2061eb7720eea7a75b72aa90c0f1a9cec81

[sszy <ss...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus/u-boot".

The branch, armadeus-2024.01 has been updated
       via  d2d7e2061eb7720eea7a75b72aa90c0f1a9cec81 (commit)
       via  587d9d5e27654026866637ee969da204af491d08 (commit)
       via  b8f6f02cfe1e06da2e2b1639ba02bb107bd9bc27 (commit)
       via  cc4d3b2f0f23eb7715a4c6e8049b4adf69cb9124 (commit)
       via  b5ccb5afef8a931b09460b357b92d58dcf402dad (commit)
      from  886242537cd3bb768edf424e2fae6ebb439e5e92 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d2d7e2061eb7720eea7a75b72aa90c0f1a9cec81
Author: Sébastien Szymanski <seb...@ar...>
Date:   Mon Aug 11 10:47:05 2025 +0200

    imx9: opos93: add OP-TEE support

commit 587d9d5e27654026866637ee969da204af491d08
Author: Clement Faure <cle...@nx...>
Date:   Tue May 31 16:45:04 2022 +0200

    LFOPTEE-158 imx9: add OPTEE device tree node support
    
    Add the FDT overlay support for OPTEE.
    
    Signed-off-by: Clement Faure <cle...@nx...>

commit b8f6f02cfe1e06da2e2b1639ba02bb107bd9bc27
Author: Silvano di Ninno <sil...@nx...>
Date:   Wed Jan 29 17:52:00 2020 +0100

    TEE-502 imx: refactor optee bindings addition
    
    - Remove code duplication betwee imx8 and imx8m support
    - add reserved memory node to prevent Linux accessing optee reserved memory
    
    Signed-off-by: Silvano di Ninno <sil...@nx...>
    Reviewed-by: Ye Li <ye...@nx...>
    (cherry picked from commit 8beac7ef22c16b72ad337b44a0516436a4a0d00c)
    (cherry picked from commit 07be6f855bdcbca200e4685ea557b2529187e29f)
    (cherry picked from commit 1bfbbac316e3d7ac051f81264b66425a86d95c4d)
    (cherry picked from commit 6a27dd9792900a6512b05eca85d22aab120c74a6)

commit cc4d3b2f0f23eb7715a4c6e8049b4adf69cb9124
Author: Ye Li <ye...@nx...>
Date:   Wed Apr 22 02:29:20 2020 -0700

    MLK-23574-40 imx8: Rename boot_pointer to share optee codes
    
    To share some common optee codes for iMX8 and iMX8M, we need same
    name for parameters passed from ATF. Currently iMX8 uses boot_pointer
    but iMX8M use rom_pointer. So rename boot_pointer to rom_pointer.
    
    Signed-off-by: Ye Li <ye...@nx...>
    (cherry picked from commit 47a04423cb09d84ba7558ba9570515901f124c0f)
    (cherry picked from commit 7d1fe0e66e9537c05a2abff6f16c555ddff63bad)
    (cherry picked from commit d49149dba994f75675c674770d0c0f54e3f56bbf)

commit b5ccb5afef8a931b09460b357b92d58dcf402dad
Author: Ye Li <ye...@nx...>
Date:   Tue Oct 29 00:11:33 2019 -0700

    MLK-22866 imx8: Remove the optee shared memory from DDR banks
    
    Optee has 4MB shared memory at its top space which was assigned to
    non-secure OS partition in ATF. By default this memory is added to
    u-boot DDR banks and will pass to kernel. This means kernel has possibility
    to allocate from this memory for system usage. At same time this memory is
    used by optee and mem-remapped by optee kernel driver. So it is possible to
    have conflict and cause kernel crash.
    
    Fix the issue by removing the shared memory from u-boot DDR banks. Then it
    is not visible for both u-boot and kernel and can avoid such issue.
    
    Signed-off-by: Ye Li <ye...@nx...>
    Reviewed-by: Anson Huang <Ans...@nx...>
    (cherry picked from commit 164279c42de0d058b7abe198cc154ee683087e6a)
    (cherry picked from commit 2c1016db0c08b8ade597146782c4267d77f77973)
    (cherry picked from commit eddcf372d416b8c72b2f5f0960b3f174fabf0f41)

-----------------------------------------------------------------------

Summary of changes:
 arch/arm/dts/imx93-opos93-u-boot.dtsi              |   9 ++
 arch/arm/include/asm/arch-imx8/sys_proto.h         |   2 +-
 arch/arm/include/asm/mach-imx/optee.h              |  14 ++
 arch/arm/mach-imx/Makefile                         |   3 +
 arch/arm/mach-imx/dt_optee.c                       | 154 +++++++++++++++++++++
 arch/arm/mach-imx/imx8/cpu.c                       |  23 ++-
 arch/arm/mach-imx/imx8/fdt.c                       |  51 +------
 arch/arm/mach-imx/imx8/lowlevel_init.S             |   6 +-
 arch/arm/mach-imx/imx8m/soc.c                      |  77 +----------
 arch/arm/mach-imx/imx9/soc.c                       |  50 ++++---
 ...os93dev_defconfig => opos93dev_optee_defconfig} |  12 +-
 include/configs/opos93.h                           |   8 +-
 12 files changed, 256 insertions(+), 153 deletions(-)
 create mode 100644 arch/arm/include/asm/mach-imx/optee.h
 create mode 100644 arch/arm/mach-imx/dt_optee.c
 copy configs/{opos93dev_defconfig => opos93dev_optee_defconfig} (94%)

diff --git a/arch/arm/dts/imx93-opos93-u-boot.dtsi b/arch/arm/dts/imx93-opos93-u-boot.dtsi
index aa95106ae1..8ca834b026 100644
--- a/arch/arm/dts/imx93-opos93-u-boot.dtsi
+++ b/arch/arm/dts/imx93-opos93-u-boot.dtsi
@@ -12,6 +12,15 @@
 		bootph-pre-ram;
 		bootph-all;
 	};
+
+#ifdef CONFIG_OPTEE
+	firmware {
+		optee {
+			compatible = "linaro,optee-tz";
+			method = "smc";
+		};
+	};
+#endif
 };
 
 &A55_0 {
diff --git a/arch/arm/include/asm/arch-imx8/sys_proto.h b/arch/arm/include/asm/arch-imx8/sys_proto.h
index e7625c4298..fd1ed09720 100644
--- a/arch/arm/include/asm/arch-imx8/sys_proto.h
+++ b/arch/arm/include/asm/arch-imx8/sys_proto.h
@@ -21,7 +21,7 @@ struct pass_over_info_t {
 	u32 g_ap_mu;
 };
 
-extern unsigned long boot_pointer[];
+extern unsigned long rom_pointer[];
 void build_info(void);
 int print_bootinfo(void);
 int sc_pm_setup_uart(sc_rsrc_t uart_rsrc, sc_pm_clock_rate_t clk_rate);
diff --git a/arch/arm/include/asm/mach-imx/optee.h b/arch/arm/include/asm/mach-imx/optee.h
new file mode 100644
index 0000000000..9f45bda549
--- /dev/null
+++ b/arch/arm/include/asm/mach-imx/optee.h
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright 2020 NXP
+ */
+#ifndef __IMX_OPTEE_H__
+#define __IMX_OPTEE_H__
+
+#if defined(CONFIG_IMX93_OPOS93)
+#define OPTEE_SHM_SIZE 0x00200000
+#else
+#define OPTEE_SHM_SIZE 0x00400000
+#endif
+int ft_add_optee_node(void *fdt, struct bd_info *bd);
+#endif
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
index ab6d370add..a06aec762f 100644
--- a/arch/arm/mach-imx/Makefile
+++ b/arch/arm/mach-imx/Makefile
@@ -41,6 +41,9 @@ obj-y	+= misc.o
 obj-$(CONFIG_CMD_PRIBLOB) += priblob.o
 obj-$(CONFIG_SPL_BUILD)	+= spl.o
 endif
+ifeq ($(SOC),$(filter $(SOC),imx8m imx8 imx9))
+obj-y	+= dt_optee.o
+endif
 ifeq ($(SOC),$(filter $(SOC),mx7))
 obj-y	+= cpu.o
 obj-$(CONFIG_SYS_I2C_MXC) += i2c-mxv7.o
diff --git a/arch/arm/mach-imx/dt_optee.c b/arch/arm/mach-imx/dt_optee.c
new file mode 100644
index 0000000000..3d63de0e74
--- /dev/null
+++ b/arch/arm/mach-imx/dt_optee.c
@@ -0,0 +1,154 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright 2020 NXP
+ */
+#include <asm/arch/sys_proto.h>
+#include <asm/mach-imx/optee.h>
+#include <errno.h>
+#include <fdt_support.h>
+
+#ifdef CONFIG_OF_SYSTEM_SETUP
+static void set_dt_val(void *data, uint32_t cell_size, uint64_t val)
+{
+	if (cell_size == 1) {
+		fdt32_t v = cpu_to_fdt32((uint32_t)val);
+
+		memcpy(data, &v, sizeof(v));
+	} else {
+		fdt64_t v = cpu_to_fdt64(val);
+
+		memcpy(data, &v, sizeof(v));
+	}
+}
+
+static int add_dt_path_subnode(void *fdt, const char *path, const char *subnode)
+{
+	int offs;
+
+	offs = fdt_path_offset(fdt, path);
+	if (offs < 0)
+		return -1;
+
+	offs = fdt_add_subnode(fdt, offs, subnode);
+	if (offs < 0)
+		return -1;
+	return offs;
+}
+
+static int add_res_mem_dt_node(void *fdt, const char *name, phys_addr_t pa,
+			       size_t size)
+{
+	int offs = 0;
+	int ret = 0;
+	int addr_size = -1;
+	int len_size = -1;
+	bool found = true;
+	char subnode_name[80] = { 0 };
+
+	offs = fdt_path_offset(fdt, "/reserved-memory");
+
+	if (offs < 0) {
+		found = false;
+		offs = 0;
+	}
+
+	len_size = fdt_size_cells(fdt, offs);
+	if (len_size < 0)
+		return -1;
+	addr_size = fdt_address_cells(fdt, offs);
+	if (addr_size < 0)
+		return -1;
+
+	if (!found) {
+		offs = add_dt_path_subnode(fdt, "/", "reserved-memory");
+		if (offs < 0)
+			return -1;
+
+		ret = fdt_setprop_cell(fdt, offs, "#address-cells", addr_size);
+		if (ret < 0)
+			return -1;
+		ret = fdt_setprop_cell(fdt, offs, "#size-cells", len_size);
+		if (ret < 0)
+			return -1;
+		ret = fdt_setprop(fdt, offs, "ranges", NULL, 0);
+		if (ret < 0)
+			return -1;
+	}
+
+	snprintf(subnode_name, sizeof(subnode_name), "%s@0x%llx", name, pa);
+	offs = fdt_add_subnode(fdt, offs, subnode_name);
+	if (offs >= 0) {
+		u32 data[FDT_MAX_NCELLS * 2];
+
+		set_dt_val(data, addr_size, pa);
+		set_dt_val(data + addr_size, len_size, size);
+		ret = fdt_setprop(fdt, offs, "reg", data,
+				  sizeof(uint32_t) * (addr_size + len_size));
+		if (ret < 0)
+			return -1;
+		ret = fdt_setprop(fdt, offs, "no-map", NULL, 0);
+		if (ret < 0)
+			return -1;
+	} else {
+		return -1;
+	}
+	return 0;
+}
+
+int ft_add_optee_node(void *fdt, struct bd_info *bd)
+{
+	const char *path, *subpath;
+	int ret = 0;
+	int offs;
+	phys_addr_t optee_start;
+	size_t optee_size;
+
+	/*
+	 * No TEE space allocated indicating no TEE running, so no
+	 * need to add optee node in dts
+	 */
+	if (!rom_pointer[1])
+		return 0;
+
+	optee_start = (phys_addr_t)rom_pointer[0];
+	optee_size = rom_pointer[1] - OPTEE_SHM_SIZE;
+
+	offs = fdt_increase_size(fdt, 512);
+	if (offs) {
+		printf("No Space for dtb\n");
+		return -1;
+	}
+
+	path = "/firmware";
+	offs = fdt_path_offset(fdt, path);
+	if (offs < 0) {
+		offs = add_dt_path_subnode(fdt, "/", "firmware");
+		if (offs < 0)
+			return -1;
+	}
+
+	subpath = "optee";
+	offs = fdt_add_subnode(fdt, offs, subpath);
+	if (offs < 0) {
+		printf("Could not create %s node.\n", subpath);
+		return -1;
+	}
+
+	fdt_setprop_string(fdt, offs, "compatible", "linaro,optee-tz");
+	fdt_setprop_string(fdt, offs, "method", "smc");
+
+	ret = add_res_mem_dt_node(fdt, "optee_core", optee_start, optee_size);
+	if (ret < 0) {
+		printf("Could not create optee_core node.\n");
+		return -1;
+	}
+
+	ret = add_res_mem_dt_node(fdt, "optee_shm", optee_start + optee_size,
+				  OPTEE_SHM_SIZE);
+	if (ret < 0) {
+		printf("Could not create optee_shm node.\n");
+		return -1;
+	}
+	return ret;
+}
+#endif
diff --git a/arch/arm/mach-imx/imx8/cpu.c b/arch/arm/mach-imx/imx8/cpu.c
index 39ac0bc414..718b67c11f 100644
--- a/arch/arm/mach-imx/imx8/cpu.c
+++ b/arch/arm/mach-imx/imx8/cpu.c
@@ -429,6 +429,27 @@ int mmc_get_env_dev(void)
 
 #define MEMSTART_ALIGNMENT  SZ_2M /* Align the memory start with 2MB */
 
+static sc_faddr_t reserve_optee_shm(sc_faddr_t addr_start)
+{
+	/* OPTEE has a share memory at its top address,
+	 * ATF assigns the share memory to non-secure os partition for share with kernel
+	 * We should not add this share memory to DDR bank, as this memory is dedicated for
+	 * optee, optee driver will memremap it and can't be used by system malloc.
+	 */
+
+	sc_faddr_t optee_start = rom_pointer[0];
+	sc_faddr_t optee_size = rom_pointer[1];
+
+	if (optee_size && optee_start <= addr_start &&
+		addr_start < optee_start + optee_size) {
+		debug("optee 0x%llx 0x%llx, addr_start 0x%llx\n",
+			optee_start, optee_size, addr_start);
+		return optee_start + optee_size;
+	}
+
+	return addr_start;
+}
+
 static int get_owned_memreg(sc_rm_mr_t mr, sc_faddr_t *addr_start,
 			    sc_faddr_t *addr_end)
 {
@@ -444,7 +465,7 @@ static int get_owned_memreg(sc_rm_mr_t mr, sc_faddr_t *addr_start,
 			return -EINVAL;
 		}
 		debug("0x%llx -- 0x%llx\n", start, end);
-		*addr_start = start;
+		*addr_start = reserve_optee_shm(start);
 		*addr_end = end;
 
 		return 0;
diff --git a/arch/arm/mach-imx/imx8/fdt.c b/arch/arm/mach-imx/imx8/fdt.c
index c2bed3e0c1..0cc730af2a 100644
--- a/arch/arm/mach-imx/imx8/fdt.c
+++ b/arch/arm/mach-imx/imx8/fdt.c
@@ -8,6 +8,7 @@
 #include <firmware/imx/sci/sci.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/global_data.h>
+#include <asm/mach-imx/optee.h>
 #include <dm/ofnode.h>
 #include <fdt_support.h>
 #include <linux/libfdt.h>
@@ -230,56 +231,6 @@ static int config_smmu_fdt(void *blob)
 	return 0;
 }
 
-static int ft_add_optee_node(void *fdt, struct bd_info *bd)
-{
-	const char *path, *subpath;
-	int offs;
-
-	/*
-	 * No TEE space allocated indicating no TEE running, so no
-	 * need to add optee node in dts
-	 */
-	if (!boot_pointer[1])
-		return 0;
-
-	offs = fdt_increase_size(fdt, 512);
-	if (offs) {
-		printf("No Space for dtb\n");
-		return 1;
-	}
-
-	path = "/firmware";
-	offs = fdt_path_offset(fdt, path);
-	if (offs < 0) {
-		path = "/";
-		offs = fdt_path_offset(fdt, path);
-
-		if (offs < 0) {
-			printf("Could not find root node.\n");
-			return offs;
-		}
-
-		subpath = "firmware";
-		offs = fdt_add_subnode(fdt, offs, subpath);
-		if (offs < 0) {
-			printf("Could not create %s node.\n", subpath);
-			return offs;
-		}
-	}
-
-	subpath = "optee";
-	offs = fdt_add_subnode(fdt, offs, subpath);
-	if (offs < 0) {
-		printf("Could not create %s node.\n", subpath);
-		return offs;
-	}
-
-	fdt_setprop_string(fdt, offs, "compatible", "linaro,optee-tz");
-	fdt_setprop_string(fdt, offs, "method", "smc");
-
-	return 0;
-}
-
 int ft_system_setup(void *blob, struct bd_info *bd)
 {
 	int ret;
diff --git a/arch/arm/mach-imx/imx8/lowlevel_init.S b/arch/arm/mach-imx/imx8/lowlevel_init.S
index a66243c5e4..84798eab6b 100644
--- a/arch/arm/mach-imx/imx8/lowlevel_init.S
+++ b/arch/arm/mach-imx/imx8/lowlevel_init.S
@@ -6,8 +6,8 @@
 #include <config.h>
 
 .align 8
-.global boot_pointer
-boot_pointer:
+.global rom_pointer
+rom_pointer:
 	.space 32
 
 /*
@@ -17,7 +17,7 @@ boot_pointer:
 .global save_boot_params
 save_boot_params:
 	/* The firmware provided ATAG/FDT address can be found in r2/x0 */
-	adr	x0, boot_pointer
+	adr	x0, rom_pointer
 	stp	x1, x2, [x0], #16
 	stp	x3, x4, [x0], #16
 
diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c
index d25b92e46e..2dee688831 100644
--- a/arch/arm/mach-imx/imx8m/soc.c
+++ b/arch/arm/mach-imx/imx8m/soc.c
@@ -17,6 +17,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/mach-imx/hab.h>
 #include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/optee.h>
 #include <asm/mach-imx/syscounter.h>
 #include <asm/ptrace.h>
 #include <asm/armv8/mmu.h>
@@ -1198,82 +1199,6 @@ static int fixup_thermal_trips(void *blob, const char *name)
 	return 0;
 }
 
-#define OPTEE_SHM_SIZE 0x00400000
-static int ft_add_optee_node(void *fdt, struct bd_info *bd)
-{
-	struct fdt_memory carveout;
-	const char *path, *subpath;
-	phys_addr_t optee_start;
-	size_t optee_size;
-	int offs;
-	int ret;
-
-	/*
-	 * No TEE space allocated indicating no TEE running, so no
-	 * need to add optee node in dts
-	 */
-	if (!rom_pointer[1])
-		return 0;
-
-	optee_start = (phys_addr_t)rom_pointer[0];
-	optee_size = rom_pointer[1] - OPTEE_SHM_SIZE;
-
-	offs = fdt_increase_size(fdt, 512);
-	if (offs) {
-		printf("No Space for dtb\n");
-		return 1;
-	}
-
-	path = "/firmware";
-	offs = fdt_path_offset(fdt, path);
-	if (offs < 0) {
-		path = "/";
-		offs = fdt_path_offset(fdt, path);
-
-		if (offs < 0) {
-			printf("Could not find root node.\n");
-			return offs;
-		}
-
-		subpath = "firmware";
-		offs = fdt_add_subnode(fdt, offs, subpath);
-		if (offs < 0) {
-			printf("Could not create %s node.\n", subpath);
-			return offs;
-		}
-	}
-
-	subpath = "optee";
-	offs = fdt_add_subnode(fdt, offs, subpath);
-	if (offs < 0) {
-		printf("Could not create %s node.\n", subpath);
-		return offs;
-	}
-
-	fdt_setprop_string(fdt, offs, "compatible", "linaro,optee-tz");
-	fdt_setprop_string(fdt, offs, "method", "smc");
-
-	carveout.start = optee_start,
-	carveout.end = optee_start + optee_size - 1,
-	ret = fdtdec_add_reserved_memory(fdt, "optee_core", &carveout, NULL, 0,
-					 NULL, FDTDEC_RESERVED_MEMORY_NO_MAP);
-	if (ret < 0) {
-		printf("Could not create optee_core node.\n");
-		return ret;
-	}
-
-	carveout.start = optee_start + optee_size;
-	carveout.end = optee_start + optee_size + OPTEE_SHM_SIZE - 1;
-	ret = fdtdec_add_reserved_memory(fdt, "optee_shm", &carveout, NULL, 0,
-					 NULL, FDTDEC_RESERVED_MEMORY_NO_MAP);
-	if (ret < 0) {
-		printf("Could not create optee_shm node.\n");
-		return ret;
-	}
-
-	return 0;
-}
-
 int ft_system_setup(void *blob, struct bd_info *bd)
 {
 	static const char * const nodes_path[] = {
diff --git a/arch/arm/mach-imx/imx9/soc.c b/arch/arm/mach-imx/imx9/soc.c
index 626c27552a..e51c59d422 100644
--- a/arch/arm/mach-imx/imx9/soc.c
+++ b/arch/arm/mach-imx/imx9/soc.c
@@ -37,6 +37,7 @@
 #include <asm/mach-imx/ele_api.h>
 #include <fuse.h>
 #include <asm/arch/ddr.h>
+#include <asm/mach-imx/optee.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -296,9 +297,16 @@ static struct mm_region imx93_mem_map[] = {
 			 PTE_BLOCK_PXN | PTE_BLOCK_UXN
 	}, {
 		/* DRAM1 */
+		/* OPTEE uses 32MB at the start of the DRAM */
+#if defined(CONFIG_OPTEE) && defined(CONFIG_IMX93_OPOS93)
+		.virt = 0x82000000UL,
+		.phys = 0x82000000UL,
+		.size = PHYS_SDRAM_SIZE - 0x02000000,
+#else
 		.virt = 0x80000000UL,
 		.phys = 0x80000000UL,
 		.size = PHYS_SDRAM_SIZE,
+#endif
 		.attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) |
 			 PTE_BLOCK_OUTER_SHARE
 	}, {
@@ -417,24 +425,29 @@ int dram_init_banksize(void)
 		sdram_b2_size = 0;
 	}
 
-	gd->bd->bi_dram[bank].start = PHYS_SDRAM;
-	if (!IS_ENABLED(CONFIG_SPL_BUILD) && rom_pointer[1]) {
-		phys_addr_t optee_start = (phys_addr_t)rom_pointer[0];
-		phys_size_t optee_size = (size_t)rom_pointer[1];
-
-		gd->bd->bi_dram[bank].size = optee_start - gd->bd->bi_dram[bank].start;
-		if ((optee_start + optee_size) < (PHYS_SDRAM + sdram_b1_size)) {
-			if (++bank >= CONFIG_NR_DRAM_BANKS) {
-				puts("CONFIG_NR_DRAM_BANKS is not enough\n");
-				return -1;
+	if (IS_ENABLED(CONFIG_IMX93_OPOS93)) {
+		gd->bd->bi_dram[bank].start = PHYS_SDRAM + rom_pointer[1];
+		gd->bd->bi_dram[bank].size = sdram_b1_size - rom_pointer[1];
+	} else {
+		gd->bd->bi_dram[bank].start = PHYS_SDRAM;
+		if (!IS_ENABLED(CONFIG_SPL_BUILD) && rom_pointer[1]) {
+			phys_addr_t optee_start = (phys_addr_t)rom_pointer[0];
+			phys_size_t optee_size = (size_t)rom_pointer[1];
+
+			gd->bd->bi_dram[bank].size = optee_start - gd->bd->bi_dram[bank].start;
+			if ((optee_start + optee_size) < (PHYS_SDRAM + sdram_b1_size)) {
+				if (++bank >= CONFIG_NR_DRAM_BANKS) {
+					puts("CONFIG_NR_DRAM_BANKS is not enough\n");
+					return -1;
+				}
+
+				gd->bd->bi_dram[bank].start = optee_start + optee_size;
+				gd->bd->bi_dram[bank].size = PHYS_SDRAM +
+					sdram_b1_size - gd->bd->bi_dram[bank].start;
 			}
-
-			gd->bd->bi_dram[bank].start = optee_start + optee_size;
-			gd->bd->bi_dram[bank].size = PHYS_SDRAM +
-				sdram_b1_size - gd->bd->bi_dram[bank].start;
+		} else {
+			gd->bd->bi_dram[bank].size = sdram_b1_size;
 		}
-	} else {
-		gd->bd->bi_dram[bank].size = sdram_b1_size;
 	}
 
 	if (sdram_b2_size) {
@@ -468,8 +481,11 @@ phys_size_t get_effective_memsize(void)
 			 * 1. At the top of dram1,  Then return the size removed optee size.
 			 * 2. In the middle of dram1, return the size of dram1.
 			 */
+
 			if ((rom_pointer[0] + rom_pointer[1]) == (PHYS_SDRAM + sdram_b1_size))
 				return ((phys_addr_t)rom_pointer[0] - PHYS_SDRAM);
+			else if (rom_pointer[0] == PHYS_SDRAM)
+				return (phys_addr_t) sdram_b1_size - rom_pointer[1];
 		}
 
 		return sdram_b1_size;
@@ -743,7 +759,7 @@ int ft_system_setup(void *blob, struct bd_info *bd)
 		disable_lpm(blob);
 	}
 
-	return 0;
+	return ft_add_optee_node(blob, bd);
 }
 
 #if defined(CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG)
diff --git a/configs/opos93dev_defconfig b/configs/opos93dev_optee_defconfig
similarity index 94%
copy from configs/opos93dev_defconfig
copy to configs/opos93dev_optee_defconfig
index 2ba056cc7f..73aedd9eeb 100644
--- a/configs/opos93dev_defconfig
+++ b/configs/opos93dev_optee_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_ARCH_IMX9=y
-CONFIG_TEXT_BASE=0x80200000
+CONFIG_TEXT_BASE=0x82000000
 CONFIG_SYS_MALLOC_LEN=0x2000000
 CONFIG_SYS_MALLOC_F_LEN=0x18000
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
@@ -19,9 +19,10 @@ CONFIG_SPL_DRIVERS_MISC=y
 CONFIG_SPL_STACK=0x20519dd0
 CONFIG_SPL=y
 CONFIG_ENV_OFFSET_REDUND=0x20000
+CONFIG_IMX_ELE_DEK_ENCAP=y
 CONFIG_SPL_IMX_ROMAPI_LOADADDR=0x88000000
-CONFIG_SYS_LOAD_ADDR=0x80400000
-CONFIG_SYS_MEMTEST_START=0x80000000
+CONFIG_SYS_LOAD_ADDR=0x82400000
+CONFIG_SYS_MEMTEST_START=0x82000000
 CONFIG_SYS_MEMTEST_END=0x90000000
 CONFIG_REMAKE_ELF=y
 # CONFIG_ANDROID_BOOT_IMAGE is not set
@@ -139,6 +140,7 @@ CONFIG_PINCTRL_IMX93=y
 CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
+CONFIG_DM_RNG=y
 CONFIG_DM_RTC=y
 CONFIG_RTC_EMULATION=y
 CONFIG_DM_SERIAL=y
@@ -146,6 +148,9 @@ CONFIG_FSL_LPUART=y
 CONFIG_SYSRESET=y
 CONFIG_SYSRESET_CMD_POWEROFF=y
 CONFIG_SYSRESET_PSCI=y
+CONFIG_TEE=y
+CONFIG_OPTEE=y
+# CONFIG_CHIMP_OPTEE is not set
 CONFIG_DM_THERMAL=y
 CONFIG_IMX_TMU=y
 CONFIG_USB=y
@@ -166,3 +171,4 @@ CONFIG_ULP_WATCHDOG=y
 CONFIG_WDT=y
 CONFIG_LZO=y
 CONFIG_BZIP2=y
+# CONFIG_OPTEE_LIB is not set
diff --git a/include/configs/opos93.h b/include/configs/opos93.h
index 80841794fc..32fef1ed30 100644
--- a/include/configs/opos93.h
+++ b/include/configs/opos93.h
@@ -14,10 +14,14 @@
 	(QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
 
 /* Link Definitions */
+#if defined(CONFIG_OPTEE)
+#define CFG_SYS_INIT_RAM_ADDR		0x82000000
+#define CFG_SYS_SDRAM_BASE		0x82000000
+#else
 #define CFG_SYS_INIT_RAM_ADDR		0x80000000
-#define CFG_SYS_INIT_RAM_SIZE		0x200000
-
 #define CFG_SYS_SDRAM_BASE		0x80000000
+#endif
+#define CFG_SYS_INIT_RAM_SIZE		0x200000
 #define PHYS_SDRAM                      0x80000000
 #define PHYS_SDRAM_SIZE			0x20000000 /* 512MB DDR */
 


hooks/post-receive
-- 
armadeus/u-boot

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-481-gf173ad32c

[sszy <ss...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  f173ad32c7b876e6ea5b5cf6d8a7aaf9edf78ccd (commit)
      from  56ee9be52f1553d74e605efd27e97615f1f1a066 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f173ad32c7b876e6ea5b5cf6d8a7aaf9edf78ccd
Author: Sébastien Szymanski <seb...@ar...>
Date:   Mon Aug 11 16:33:47 2025 +0200

    [BUILDROOT] Bump to BR 2025.02.5

-----------------------------------------------------------------------

Summary of changes:
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 84f16c92c..51d491873 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ export ARMADEUS_TOPDIR
 
 #--- User configurable stuff:
 BUILDROOT_MAJOR_VERSION ?= 2025.02
-BUILDROOT_MINOR_VERSION ?= 4
+BUILDROOT_MINOR_VERSION ?= 5
 ifneq ($(strip $(BUILDROOT_MINOR_VERSION)),)
 BUILDROOT_VERSION := $(BUILDROOT_MAJOR_VERSION).$(BUILDROOT_MINOR_VERSION)
 else


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus/u-boot branch, armadeus-2020.07, updated. 10604757e21c1bc814a8bda2743dee85779cafd9

[sszy <ss...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus/u-boot".

The branch, armadeus-2020.07 has been updated
       via  10604757e21c1bc814a8bda2743dee85779cafd9 (commit)
      from  1cfc09d0dd09985cfe8a5776323c5722ea157946 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 10604757e21c1bc814a8bda2743dee85779cafd9
Author: Sébastien Szymanski <seb...@ar...>
Date:   Tue Jan 19 00:58:32 2021 +0100

    spi: imx: add SPI support on i.MX8MM
    
    Backport of the following upstream commits:
    
    00f0c9d04c27 ("dm: spi: Fix spi_free_slave() freed memory write")
    a8467d3ebd6c ("spi: spi-uclass: Fix spi_claim_bus() speed/mode setup logic")
    9b6f6b37d3ee ("clk-imx8mm: Only build ecspi clocks when CONFIG_DM_SPI=y")
    0979d136bf4b ("clk: imx8mm: Add SPI clocks")
    d21a5c6a4e66 ("spi: imx: Implement set_speed")
    949b92ce0830 ("spi: imx: Use clock framework if enabled")
    6ecb10fedf65 ("spi: imx: Define register bits in the driver")

-----------------------------------------------------------------------

Summary of changes:
 arch/arm/include/asm/arch-mx25/imx-regs.h | 30 ----------
 arch/arm/include/asm/arch-mx31/imx-regs.h | 31 -----------
 arch/arm/include/asm/arch-mx35/imx-regs.h | 30 ----------
 arch/arm/include/asm/arch-mx5/imx-regs.h  | 36 ------------
 arch/arm/include/asm/arch-mx6/imx-regs.h  | 36 ------------
 arch/arm/include/asm/arch-mx7/imx-regs.h  | 37 ------------
 drivers/clk/imx/clk-imx8mm.c              | 28 ++++++++++
 drivers/mmc/mmc_spi.c                     |  1 -
 drivers/spi/mxc_spi.c                     | 93 ++++++++++++++++++++++++++++++-
 drivers/spi/spi-uclass.c                  | 18 ++++--
 include/spi.h                             | 18 ++++--
 11 files changed, 146 insertions(+), 212 deletions(-)

diff --git a/arch/arm/include/asm/arch-mx25/imx-regs.h b/arch/arm/include/asm/arch-mx25/imx-regs.h
index 5d0974f328..57809697c1 100644
--- a/arch/arm/include/asm/arch-mx25/imx-regs.h
+++ b/arch/arm/include/asm/arch-mx25/imx-regs.h
@@ -269,18 +269,6 @@ struct epit_regs {
 	u32 cnr;	/* Counter register */
 };
 
-/* CSPI registers */
-struct cspi_regs {
-	u32 rxdata;
-	u32 txdata;
-	u32 ctrl;
-	u32 intr;
-	u32 dma;
-	u32 stat;
-	u32 period;
-	u32 test;
-};
-
 #endif
 
 #define ARCH_MXC
@@ -508,24 +496,6 @@ struct cspi_regs {
 /*
  * CSPI register definitions
  */
-#define MXC_CSPI
-#define MXC_CSPICTRL_EN		(1 << 0)
-#define MXC_CSPICTRL_MODE	(1 << 1)
-#define MXC_CSPICTRL_XCH	(1 << 2)
-#define MXC_CSPICTRL_SMC	(1 << 3)
-#define MXC_CSPICTRL_POL	(1 << 4)
-#define MXC_CSPICTRL_PHA	(1 << 5)
-#define MXC_CSPICTRL_SSCTL	(1 << 6)
-#define MXC_CSPICTRL_SSPOL	(1 << 7)
-#define MXC_CSPICTRL_CHIPSELECT(x)	(((x) & 0x3) << 12)
-#define MXC_CSPICTRL_BITCOUNT(x)	(((x) & 0xfff) << 20)
-#define MXC_CSPICTRL_DATARATE(x)	(((x) & 0x7) << 16)
-#define MXC_CSPICTRL_TC		(1 << 7)
-#define MXC_CSPICTRL_RXOVF	(1 << 6)
-#define MXC_CSPICTRL_MAXBITS	0xfff
-#define MXC_CSPIPERIOD_32KHZ	(1 << 15)
-#define MAX_SPI_BYTES	4
-
 #define MXC_SPI_BASE_ADDRESSES \
 	IMX_CSPI1_BASE, \
 	IMX_CSPI2_BASE, \
diff --git a/arch/arm/include/asm/arch-mx31/imx-regs.h b/arch/arm/include/asm/arch-mx31/imx-regs.h
index 9e271d6ea2..566db549ec 100644
--- a/arch/arm/include/asm/arch-mx31/imx-regs.h
+++ b/arch/arm/include/asm/arch-mx31/imx-regs.h
@@ -39,17 +39,6 @@ struct clock_control_regs {
 	u32 pdr2;
 };
 
-struct cspi_regs {
-	u32 rxdata;
-	u32 txdata;
-	u32 ctrl;
-	u32 intr;
-	u32 dma;
-	u32 stat;
-	u32 period;
-	u32 test;
-};
-
 /* IIM control registers */
 struct iim_regs {
 	u32 iim_stat;
@@ -889,26 +878,6 @@ struct esdc_regs {
 /*
  * CSPI register definitions
  */
-#define MXC_CSPI
-#define MXC_CSPICTRL_EN		(1 << 0)
-#define MXC_CSPICTRL_MODE	(1 << 1)
-#define MXC_CSPICTRL_XCH	(1 << 2)
-#define MXC_CSPICTRL_SMC	(1 << 3)
-#define MXC_CSPICTRL_POL	(1 << 4)
-#define MXC_CSPICTRL_PHA	(1 << 5)
-#define MXC_CSPICTRL_SSCTL	(1 << 6)
-#define MXC_CSPICTRL_SSPOL	(1 << 7)
-#define MXC_CSPICTRL_CHIPSELECT(x)	(((x) & 0x3) << 24)
-#define MXC_CSPICTRL_BITCOUNT(x)	(((x) & 0x1f) << 8)
-#define MXC_CSPICTRL_DATARATE(x)	(((x) & 0x7) << 16)
-#define MXC_CSPICTRL_TC		(1 << 8)
-#define MXC_CSPICTRL_RXOVF	(1 << 6)
-#define MXC_CSPICTRL_MAXBITS	0x1f
-
-#define MXC_CSPIPERIOD_32KHZ	(1 << 15)
-#define MAX_SPI_BYTES	4
-
-
 #define MXC_SPI_BASE_ADDRESSES \
 	0x43fa4000, \
 	0x50010000, \
diff --git a/arch/arm/include/asm/arch-mx35/imx-regs.h b/arch/arm/include/asm/arch-mx35/imx-regs.h
index 8ee0754c8e..35090047c7 100644
--- a/arch/arm/include/asm/arch-mx35/imx-regs.h
+++ b/arch/arm/include/asm/arch-mx35/imx-regs.h
@@ -170,24 +170,6 @@
 /*
  * CSPI register definitions
  */
-#define MXC_CSPI
-#define MXC_CSPICTRL_EN		(1 << 0)
-#define MXC_CSPICTRL_MODE	(1 << 1)
-#define MXC_CSPICTRL_XCH	(1 << 2)
-#define MXC_CSPICTRL_SMC	(1 << 3)
-#define MXC_CSPICTRL_POL	(1 << 4)
-#define MXC_CSPICTRL_PHA	(1 << 5)
-#define MXC_CSPICTRL_SSCTL	(1 << 6)
-#define MXC_CSPICTRL_SSPOL	(1 << 7)
-#define MXC_CSPICTRL_CHIPSELECT(x)	(((x) & 0x3) << 12)
-#define MXC_CSPICTRL_BITCOUNT(x)	(((x) & 0xfff) << 20)
-#define MXC_CSPICTRL_DATARATE(x)	(((x) & 0x7) << 16)
-#define MXC_CSPICTRL_TC		(1 << 7)
-#define MXC_CSPICTRL_RXOVF	(1 << 6)
-#define MXC_CSPICTRL_MAXBITS	0xfff
-#define MXC_CSPIPERIOD_32KHZ	(1 << 15)
-#define MAX_SPI_BYTES	4
-
 #define MXC_SPI_BASE_ADDRESSES \
 	0x43fa4000, \
 	0x50010000,
@@ -280,18 +262,6 @@ struct gpt_regs {
 	u32 counter;	/* counter */
 };
 
-/* CSPI registers */
-struct cspi_regs {
-	u32 rxdata;
-	u32 txdata;
-	u32 ctrl;
-	u32 intr;
-	u32 dma;
-	u32 stat;
-	u32 period;
-	u32 test;
-};
-
 struct esdc_regs {
 	u32	esdctl0;
 	u32	esdcfg0;
diff --git a/arch/arm/include/asm/arch-mx5/imx-regs.h b/arch/arm/include/asm/arch-mx5/imx-regs.h
index 3d1cc68322..2731b7fb59 100644
--- a/arch/arm/include/asm/arch-mx5/imx-regs.h
+++ b/arch/arm/include/asm/arch-mx5/imx-regs.h
@@ -204,30 +204,6 @@
 /*
  * CSPI register definitions
  */
-#define MXC_ECSPI
-#define MXC_CSPICTRL_EN		(1 << 0)
-#define MXC_CSPICTRL_MODE	(1 << 1)
-#define MXC_CSPICTRL_XCH	(1 << 2)
-#define MXC_CSPICTRL_MODE_MASK	(0xf << 4)
-#define MXC_CSPICTRL_CHIPSELECT(x)	(((x) & 0x3) << 12)
-#define MXC_CSPICTRL_BITCOUNT(x)	(((x) & 0xfff) << 20)
-#define MXC_CSPICTRL_PREDIV(x)	(((x) & 0xF) << 12)
-#define MXC_CSPICTRL_POSTDIV(x)	(((x) & 0xF) << 8)
-#define MXC_CSPICTRL_SELCHAN(x)	(((x) & 0x3) << 18)
-#define MXC_CSPICTRL_MAXBITS	0xfff
-#define MXC_CSPICTRL_TC		(1 << 7)
-#define MXC_CSPICTRL_RXOVF	(1 << 6)
-#define MXC_CSPIPERIOD_32KHZ	(1 << 15)
-#define MAX_SPI_BYTES	32
-
-/* Bit position inside CTRL register to be associated with SS */
-#define MXC_CSPICTRL_CHAN	18
-
-/* Bit position inside CON register to be associated with SS */
-#define MXC_CSPICON_PHA		0  /* SCLK phase control */
-#define MXC_CSPICON_POL		4  /* SCLK polarity */
-#define MXC_CSPICON_SSPOL	12 /* SS polarity */
-#define MXC_CSPICON_CTL		20 /* inactive state of SCLK */
 #define MXC_SPI_BASE_ADDRESSES \
 	CSPI1_BASE_ADDR, \
 	CSPI2_BASE_ADDR, \
@@ -476,18 +452,6 @@ struct srtc_regs {
 	u32	hpienr;		/* 0x38 */
 };
 
-/* CSPI registers */
-struct cspi_regs {
-	u32 rxdata;
-	u32 txdata;
-	u32 ctrl;
-	u32 cfg;
-	u32 intr;
-	u32 dma;
-	u32 stat;
-	u32 period;
-};
-
 struct iim_regs {
 	u32	stat;
 	u32	statm;
diff --git a/arch/arm/include/asm/arch-mx6/imx-regs.h b/arch/arm/include/asm/arch-mx6/imx-regs.h
index ccd48e8305..a8a5bf7a57 100644
--- a/arch/arm/include/asm/arch-mx6/imx-regs.h
+++ b/arch/arm/include/asm/arch-mx6/imx-regs.h
@@ -668,46 +668,10 @@ struct gpc {
 #define IOMUXC_GPR2_LVDS_CH0_MODE_ENABLED_DI0		(IOMUXC_GPR2_MODE_ENABLED_DI0<<IOMUXC_GPR2_LVDS_CH0_MODE_OFFSET)
 #define IOMUXC_GPR2_LVDS_CH0_MODE_ENABLED_DI1		(IOMUXC_GPR2_MODE_ENABLED_DI1<<IOMUXC_GPR2_LVDS_CH0_MODE_OFFSET)
 
-/* ECSPI registers */
-struct cspi_regs {
-	u32 rxdata;
-	u32 txdata;
-	u32 ctrl;
-	u32 cfg;
-	u32 intr;
-	u32 dma;
-	u32 stat;
-	u32 period;
-};
-
 /*
  * CSPI register definitions
  */
-#define MXC_ECSPI
-#define MXC_CSPICTRL_EN		(1 << 0)
-#define MXC_CSPICTRL_MODE	(1 << 1)
-#define MXC_CSPICTRL_XCH	(1 << 2)
-#define MXC_CSPICTRL_MODE_MASK (0xf << 4)
-#define MXC_CSPICTRL_CHIPSELECT(x)	(((x) & 0x3) << 12)
-#define MXC_CSPICTRL_BITCOUNT(x)	(((x) & 0xfff) << 20)
-#define MXC_CSPICTRL_PREDIV(x)	(((x) & 0xF) << 12)
-#define MXC_CSPICTRL_POSTDIV(x)	(((x) & 0xF) << 8)
-#define MXC_CSPICTRL_SELCHAN(x)	(((x) & 0x3) << 18)
-#define MXC_CSPICTRL_MAXBITS	0xfff
-#define MXC_CSPICTRL_TC		(1 << 7)
-#define MXC_CSPICTRL_RXOVF	(1 << 6)
-#define MXC_CSPIPERIOD_32KHZ	(1 << 15)
-#define MAX_SPI_BYTES	32
 #define SPI_MAX_NUM	4
-
-/* Bit position inside CTRL register to be associated with SS */
-#define MXC_CSPICTRL_CHAN	18
-
-/* Bit position inside CON register to be associated with SS */
-#define MXC_CSPICON_PHA		0  /* SCLK phase control */
-#define MXC_CSPICON_POL		4  /* SCLK polarity */
-#define MXC_CSPICON_SSPOL	12 /* SS polarity */
-#define MXC_CSPICON_CTL		20 /* inactive state of SCLK */
 #if defined(CONFIG_MX6SLL) || defined(CONFIG_MX6SL) || \
 	defined(CONFIG_MX6DL) || defined(CONFIG_MX6UL) || defined(CONFIG_MX6ULL)
 #define MXC_SPI_BASE_ADDRESSES \
diff --git a/arch/arm/include/asm/arch-mx7/imx-regs.h b/arch/arm/include/asm/arch-mx7/imx-regs.h
index f37419c07f..5cab12f30d 100644
--- a/arch/arm/include/asm/arch-mx7/imx-regs.h
+++ b/arch/arm/include/asm/arch-mx7/imx-regs.h
@@ -842,46 +842,9 @@ struct iomuxc_gpr_base_regs {
 	u32 gpr[23];        /* 0x000 */
 };
 
-/* ECSPI registers */
-struct cspi_regs {
-	u32 rxdata;
-	u32 txdata;
-	u32 ctrl;
-	u32 cfg;
-	u32 intr;
-	u32 dma;
-	u32 stat;
-	u32 period;
-};
-
 /*
  * CSPI register definitions
  */
-#define MXC_ECSPI
-#define MXC_CSPICTRL_EN		(1 << 0)
-#define MXC_CSPICTRL_MODE	(1 << 1)
-#define MXC_CSPICTRL_XCH	(1 << 2)
-#define MXC_CSPICTRL_MODE_MASK (0xf << 4)
-#define MXC_CSPICTRL_CHIPSELECT(x)	(((x) & 0x3) << 12)
-#define MXC_CSPICTRL_BITCOUNT(x)	(((x) & 0xfff) << 20)
-#define MXC_CSPICTRL_PREDIV(x)	(((x) & 0xF) << 12)
-#define MXC_CSPICTRL_POSTDIV(x)	(((x) & 0xF) << 8)
-#define MXC_CSPICTRL_SELCHAN(x)	(((x) & 0x3) << 18)
-#define MXC_CSPICTRL_MAXBITS	0xfff
-#define MXC_CSPICTRL_TC		(1 << 7)
-#define MXC_CSPICTRL_RXOVF	(1 << 6)
-#define MXC_CSPIPERIOD_32KHZ	(1 << 15)
-#define MAX_SPI_BYTES	32
-
-/* Bit position inside CTRL register to be associated with SS */
-#define MXC_CSPICTRL_CHAN	18
-
-/* Bit position inside CON register to be associated with SS */
-#define MXC_CSPICON_PHA		0  /* SCLK phase control */
-#define MXC_CSPICON_POL		4  /* SCLK polarity */
-#define MXC_CSPICON_SSPOL	12 /* SS polarity */
-#define MXC_CSPICON_CTL		20 /* inactive state of SCLK */
-
 #define MXC_SPI_BASE_ADDRESSES \
 	ECSPI1_BASE_ADDR, \
 	ECSPI2_BASE_ADDR, \
diff --git a/drivers/clk/imx/clk-imx8mm.c b/drivers/clk/imx/clk-imx8mm.c
index bf8ea6dc58..6e97e9e6e5 100644
--- a/drivers/clk/imx/clk-imx8mm.c
+++ b/drivers/clk/imx/clk-imx8mm.c
@@ -131,6 +131,17 @@ static const char *imx8mm_pwm3_sels[] = {"clock-osc-24m", "sys_pll2_100m", "sys_
 static const char *imx8mm_pwm4_sels[] = {"clock-osc-24m", "sys_pll2_100m", "sys_pll1_160m", "sys_pll1_40m",
                                          "sys_pll3_out", "clk_ext2", "sys_pll1_80m", "video_pll1_out", };
 
+#if CONFIG_IS_ENABLED(DM_SPI)
+static const char *imx8mm_ecspi1_sels[] = {"clock-osc-24m", "sys_pll2_200m", "sys_pll1_40m", "sys_pll1_160m",
+					   "sys_pll1_800m", "sys_pll3_out", "sys_pll2_250m", "audio_pll2_out", };
+
+static const char *imx8mm_ecspi2_sels[] = {"clock-osc-24m", "sys_pll2_200m", "sys_pll1_40m", "sys_pll1_160m",
+					   "sys_pll1_800m", "sys_pll3_out", "sys_pll2_250m", "audio_pll2_out", };
+
+static const char *imx8mm_ecspi3_sels[] = {"clock-osc-24m", "sys_pll2_200m", "sys_pll1_40m", "sys_pll1_160m",
+					   "sys_pll1_800m", "sys_pll3_out", "sys_pll2_250m", "audio_pll2_out", };
+#endif
+
 static ulong imx8mm_clk_get_rate(struct clk *clk)
 {
 	struct clk *c;
@@ -402,6 +413,7 @@ static int imx8mm_clk_probe(struct udevice *dev)
 	       imx_clk_gate4("pwm3_root_clk", "pwm3", base + 0x42a0, 0));
 	clk_dm(IMX8MM_CLK_PWM4_ROOT,
 	       imx_clk_gate4("pwm4_root_clk", "pwm4", base + 0x42b0, 0));
+
 	clk_dm(IMX8MM_CLK_I2C1_ROOT,
 	       imx_clk_gate4("i2c1_root_clk", "i2c1", base + 0x4170, 0));
 	clk_dm(IMX8MM_CLK_I2C2_ROOT,
@@ -475,6 +487,22 @@ static int imx8mm_clk_probe(struct udevice *dev)
 	clk_set_rate(clkp1, 1200000000UL);
 #endif
 
+#if CONFIG_IS_ENABLED(DM_SPI)
+	clk_dm(IMX8MM_CLK_ECSPI1,
+	       imx8m_clk_composite("ecspi1", imx8mm_ecspi1_sels, base + 0xb280));
+	clk_dm(IMX8MM_CLK_ECSPI2,
+	       imx8m_clk_composite("ecspi2", imx8mm_ecspi2_sels, base + 0xb300));
+	clk_dm(IMX8MM_CLK_ECSPI3,
+	       imx8m_clk_composite("ecspi3", imx8mm_ecspi3_sels, base + 0xc180));
+
+	clk_dm(IMX8MM_CLK_ECSPI1_ROOT,
+	       imx_clk_gate4("ecspi1_root_clk", "ecspi1", base + 0x4070, 0));
+	clk_dm(IMX8MM_CLK_ECSPI2_ROOT,
+	       imx_clk_gate4("ecspi2_root_clk", "ecspi2", base + 0x4080, 0));
+	clk_dm(IMX8MM_CLK_ECSPI3_ROOT,
+	       imx_clk_gate4("ecspi3_root_clk", "ecspi3", base + 0x4090, 0));
+#endif
+
 	return 0;
 }
 
diff --git a/drivers/mmc/mmc_spi.c b/drivers/mmc/mmc_spi.c
index e76ab54838..9cf1fb341b 100644
--- a/drivers/mmc/mmc_spi.c
+++ b/drivers/mmc/mmc_spi.c
@@ -382,7 +382,6 @@ static int mmc_spi_probe(struct udevice *dev)
 	priv->spi = dev_get_parent_priv(dev);
 	if (!priv->spi->max_hz)
 		priv->spi->max_hz = MMC_SPI_MAX_CLOCK;
-	priv->spi->speed = 0;
 	priv->spi->mode = SPI_MODE_0;
 	priv->spi->wordlen = 8;
 
diff --git a/drivers/spi/mxc_spi.c b/drivers/spi/mxc_spi.c
index f52ebf4d67..06b47e2acf 100644
--- a/drivers/spi/mxc_spi.c
+++ b/drivers/spi/mxc_spi.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <clk.h>
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
@@ -20,6 +21,82 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
+/* MX35 and older is CSPI */
+#if defined(CONFIG_MX25) || defined(CONFIG_MX31) || defined(CONFIG_MX35)
+#define MXC_CSPI
+struct cspi_regs {
+	u32 rxdata;
+	u32 txdata;
+	u32 ctrl;
+	u32 intr;
+	u32 dma;
+	u32 stat;
+	u32 period;
+	u32 test;
+};
+
+#define MXC_CSPICTRL_EN			BIT(0)
+#define MXC_CSPICTRL_MODE		BIT(1)
+#define MXC_CSPICTRL_XCH		BIT(2)
+#define MXC_CSPICTRL_SMC		BIT(3)
+#define MXC_CSPICTRL_POL		BIT(4)
+#define MXC_CSPICTRL_PHA		BIT(5)
+#define MXC_CSPICTRL_SSCTL		BIT(6)
+#define MXC_CSPICTRL_SSPOL		BIT(7)
+#define MXC_CSPICTRL_DATARATE(x)	(((x) & 0x7) << 16)
+#define MXC_CSPICTRL_RXOVF		BIT(6)
+#define MXC_CSPIPERIOD_32KHZ		BIT(15)
+#define MAX_SPI_BYTES			4
+#if defined(CONFIG_MX25) || defined(CONFIG_MX35)
+#define MXC_CSPICTRL_CHIPSELECT(x)	(((x) & 0x3) << 12)
+#define MXC_CSPICTRL_BITCOUNT(x)	(((x) & 0xfff) << 20)
+#define MXC_CSPICTRL_TC			BIT(7)
+#define MXC_CSPICTRL_MAXBITS		0xfff
+#else	/* MX31 */
+#define MXC_CSPICTRL_CHIPSELECT(x)	(((x) & 0x3) << 24)
+#define MXC_CSPICTRL_BITCOUNT(x)	(((x) & 0x1f) << 8)
+#define MXC_CSPICTRL_TC			BIT(8)
+#define MXC_CSPICTRL_MAXBITS		0x1f
+#endif
+
+#else	/* MX51 and newer is ECSPI */
+#define MXC_ECSPI
+struct cspi_regs {
+	u32 rxdata;
+	u32 txdata;
+	u32 ctrl;
+	u32 cfg;
+	u32 intr;
+	u32 dma;
+	u32 stat;
+	u32 period;
+};
+
+#define MXC_CSPICTRL_EN			BIT(0)
+#define MXC_CSPICTRL_MODE		BIT(1)
+#define MXC_CSPICTRL_XCH		BIT(2)
+#define MXC_CSPICTRL_MODE_MASK		(0xf << 4)
+#define MXC_CSPICTRL_CHIPSELECT(x)	(((x) & 0x3) << 12)
+#define MXC_CSPICTRL_BITCOUNT(x)	(((x) & 0xfff) << 20)
+#define MXC_CSPICTRL_PREDIV(x)		(((x) & 0xF) << 12)
+#define MXC_CSPICTRL_POSTDIV(x)		(((x) & 0xF) << 8)
+#define MXC_CSPICTRL_SELCHAN(x)		(((x) & 0x3) << 18)
+#define MXC_CSPICTRL_MAXBITS		0xfff
+#define MXC_CSPICTRL_TC			BIT(7)
+#define MXC_CSPICTRL_RXOVF		BIT(6)
+#define MXC_CSPIPERIOD_32KHZ		BIT(15)
+#define MAX_SPI_BYTES			32
+
+/* Bit position inside CTRL register to be associated with SS */
+#define MXC_CSPICTRL_CHAN	18
+
+/* Bit position inside CON register to be associated with SS */
+#define MXC_CSPICON_PHA		0  /* SCLK phase control */
+#define MXC_CSPICON_POL		4  /* SCLK polarity */
+#define MXC_CSPICON_SSPOL	12 /* SS polarity */
+#define MXC_CSPICON_CTL		20 /* inactive state of SCLK */
+#endif
+
 #ifdef CONFIG_MX27
 /* i.MX27 has a completely wrong register layout and register definitions in the
  * datasheet, the correct one is in the Freescale's Linux driver */
@@ -541,8 +618,19 @@ static int mxc_spi_probe(struct udevice *bus)
 	if (mxcs->base == FDT_ADDR_T_NONE)
 		return -ENODEV;
 
+#if CONFIG_IS_ENABLED(CLK)
+	struct clk clk;
+	ret = clk_get_by_index(bus, 0, &clk);
+	if (ret)
+		return ret;
+
+	clk_enable(&clk);
+
+	mxcs->max_hz = clk_get_rate(&clk);
+#else
 	mxcs->max_hz = fdtdec_get_int(blob, node, "spi-max-frequency",
 				      20000000);
+#endif
 
 	return 0;
 }
@@ -573,7 +661,10 @@ static int mxc_spi_release_bus(struct udevice *dev)
 
 static int mxc_spi_set_speed(struct udevice *bus, uint speed)
 {
-	/* Nothing to do */
+	struct mxc_spi_slave *mxcs = dev_get_platdata(bus);
+
+	mxcs->max_hz = speed;
+
 	return 0;
 }
 
diff --git a/drivers/spi/spi-uclass.c b/drivers/spi/spi-uclass.c
index cffd9cf0b0..9bfcd4758a 100644
--- a/drivers/spi/spi-uclass.c
+++ b/drivers/spi/spi-uclass.c
@@ -51,23 +51,28 @@ int dm_spi_claim_bus(struct udevice *dev)
 	struct dm_spi_ops *ops = spi_get_ops(bus);
 	struct dm_spi_bus *spi = dev_get_uclass_priv(bus);
 	struct spi_slave *slave = dev_get_parent_priv(dev);
-	int speed;
+	uint speed, mode;
 
 	speed = slave->max_hz;
+	mode = slave->mode;
+
 	if (spi->max_hz) {
 		if (speed)
-			speed = min(speed, (int)spi->max_hz);
+			speed = min(speed, spi->max_hz);
 		else
 			speed = spi->max_hz;
 	}
 	if (!speed)
 		speed = SPI_DEFAULT_SPEED_HZ;
-	if (speed != slave->speed) {
+
+	if (speed != spi->speed || mode != spi->mode) {
 		int ret = spi_set_speed_mode(bus, speed, slave->mode);
 
 		if (ret)
 			return log_ret(ret);
-		slave->speed = speed;
+
+		spi->speed = speed;
+		spi->mode = mode;
 	}
 
 	return log_ret(ops->claim_bus ? ops->claim_bus(dev) : 0);
@@ -324,6 +329,7 @@ int spi_get_bus_and_cs(int busnum, int cs, int speed, int mode,
 {
 	struct udevice *bus, *dev;
 	struct dm_spi_slave_platdata *plat;
+	struct dm_spi_bus *bus_data;
 	struct spi_slave *slave;
 	bool created = false;
 	int ret;
@@ -381,12 +387,13 @@ int spi_get_bus_and_cs(int busnum, int cs, int speed, int mode,
 	}
 
 	slave = dev_get_parent_priv(dev);
+	bus_data = dev_get_uclass_priv(bus);
 
 	/*
 	 * In case the operation speed is not yet established by
 	 * dm_spi_claim_bus() ensure the bus is configured properly.
 	 */
-	if (!slave->speed) {
+	if (!bus_data->speed) {
 		ret = spi_claim_bus(slave);
 		if (ret)
 			goto err;
@@ -428,7 +435,6 @@ struct spi_slave *spi_setup_slave(unsigned int busnum, unsigned int cs,
 void spi_free_slave(struct spi_slave *slave)
 {
 	device_remove(slave->dev, DM_REMOVE_NORMAL);
-	slave->dev = NULL;
 }
 
 int spi_slave_ofdata_to_platdata(struct udevice *dev,
diff --git a/include/spi.h b/include/spi.h
index 5cc6d6e008..58ba5b0457 100644
--- a/include/spi.h
+++ b/include/spi.h
@@ -40,9 +40,22 @@
 #define SPI_DEFAULT_WORDLEN	8
 
 #ifdef CONFIG_DM_SPI
-/* TODO(sj...@ch...): Remove this and use max_hz from struct spi_slave */
+/**
+ * struct dm_spi_bus - SPI bus info
+ *
+ * This contains information about a SPI bus. To obtain this structure, use
+ * dev_get_uclass_priv(bus) where bus is the SPI bus udevice.
+ *
+ * @max_hz:	Maximum speed that the bus can tolerate.
+ * @speed:	Current bus speed. This is 0 until the bus is first claimed.
+ * @mode:	Current bus mode. This is 0 until the bus is first claimed.
+ *
+ * TODO(sj...@ch...): Remove this and use max_hz from struct spi_slave.
+ */
 struct dm_spi_bus {
 	uint max_hz;
+	uint speed;
+	uint mode;
 };
 
 /**
@@ -115,8 +128,6 @@ enum spi_polarity {
  *
  * @dev:		SPI slave device
  * @max_hz:		Maximum speed for this slave
- * @speed:		Current bus speed. This is 0 until the bus is first
- *			claimed.
  * @bus:		ID of the bus that the slave is attached to. For
  *			driver model this is the sequence number of the SPI
  *			bus (bus->seq) so does not need to be stored
@@ -134,7 +145,6 @@ struct spi_slave {
 #ifdef CONFIG_DM_SPI
 	struct udevice *dev;	/* struct spi_slave is dev->parentdata */
 	uint max_hz;
-	uint speed;
 #else
 	unsigned int bus;
 	unsigned int cs;


hooks/post-receive
-- 
armadeus/u-boot

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-480-g56ee9be52

[sszy <ss...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  56ee9be52f1553d74e605efd27e97615f1f1a066 (commit)
      from  6746404882eb7f2d3dc5fd668e1d8e438adafc3a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 56ee9be52f1553d74e605efd27e97615f1f1a066
Author: Sébastien Szymanski <seb...@ar...>
Date:   Tue Jun 24 18:30:11 2025 +0200

    [BUILDROOT] Bump to BR 2025.02.4

-----------------------------------------------------------------------

Summary of changes:
 Makefile                                                        | 2 +-
 patches/buildroot/2025.02/0450-armadeus-legacy-br-options.patch | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 801e41f50..84f16c92c 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ export ARMADEUS_TOPDIR
 
 #--- User configurable stuff:
 BUILDROOT_MAJOR_VERSION ?= 2025.02
-BUILDROOT_MINOR_VERSION ?= 3
+BUILDROOT_MINOR_VERSION ?= 4
 ifneq ($(strip $(BUILDROOT_MINOR_VERSION)),)
 BUILDROOT_VERSION := $(BUILDROOT_MAJOR_VERSION).$(BUILDROOT_MINOR_VERSION)
 else
diff --git a/patches/buildroot/2025.02/0450-armadeus-legacy-br-options.patch b/patches/buildroot/2025.02/0450-armadeus-legacy-br-options.patch
index c7c8068f1..253ef7fbf 100644
--- a/patches/buildroot/2025.02/0450-armadeus-legacy-br-options.patch
+++ b/patches/buildroot/2025.02/0450-armadeus-legacy-br-options.patch
@@ -2,9 +2,9 @@ Index: buildroot/Config.in.legacy
 ===================================================================
 --- buildroot.orig/Config.in.legacy
 +++ buildroot/Config.in.legacy
-@@ -144,6 +144,24 @@ endif
- 
- ###############################################################################
+@@ -152,6 +152,24 @@ config BR2_PACKAGE_LIBEBUR128
+ 	help
+ 	  The libebur128 package has been removed from Buildroot.
  
 +comment "Legacy options removed in 2025.02 - Armadeus specifics"
 +


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-479-g674640488

[sszy <ss...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  6746404882eb7f2d3dc5fd668e1d8e438adafc3a (commit)
      from  4d167cb04be3c85b018cbe306f0829a7e42ccd20 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6746404882eb7f2d3dc5fd668e1d8e438adafc3a
Author: Sébastien Szymanski <seb...@ar...>
Date:   Mon May 19 10:04:39 2025 +0200

    [BUILDROOT] Bump to BR 2025.02.3

-----------------------------------------------------------------------

Summary of changes:
 Makefile                                           |  2 +-
 ...-package-dropbear-bump-version-to-2025.87.patch | 57 ----------------------
 ...dropbear-security-bump-to-version-2025.88.patch | 45 -----------------
 patches/buildroot/2025.02/cleanup_buildroot.sh     |  2 -
 4 files changed, 1 insertion(+), 105 deletions(-)
 delete mode 100644 patches/buildroot/2025.02/0469-package-dropbear-bump-version-to-2025.87.patch
 delete mode 100644 patches/buildroot/2025.02/0470-package-dropbear-security-bump-to-version-2025.88.patch

diff --git a/Makefile b/Makefile
index e4ea664bc..801e41f50 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ export ARMADEUS_TOPDIR
 
 #--- User configurable stuff:
 BUILDROOT_MAJOR_VERSION ?= 2025.02
-BUILDROOT_MINOR_VERSION ?= 1
+BUILDROOT_MINOR_VERSION ?= 3
 ifneq ($(strip $(BUILDROOT_MINOR_VERSION)),)
 BUILDROOT_VERSION := $(BUILDROOT_MAJOR_VERSION).$(BUILDROOT_MINOR_VERSION)
 else
diff --git a/patches/buildroot/2025.02/0469-package-dropbear-bump-version-to-2025.87.patch b/patches/buildroot/2025.02/0469-package-dropbear-bump-version-to-2025.87.patch
deleted file mode 100644
index e3958b94b..000000000
--- a/patches/buildroot/2025.02/0469-package-dropbear-bump-version-to-2025.87.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 05fb4526f909aac533ed943977d4eeabd0b9b4ac Mon Sep 17 00:00:00 2001
-From: Bernd Kuhls <be...@ku...>
-Date: Sun, 9 Mar 2025 09:32:16 +0100
-Subject: [PATCH 469/470] package/dropbear: bump version to 2025.87
-
-Changelog: https://matt.ucc.asn.au/dropbear/CHANGES
-
-Upstream disabled sha1 by default:
-https://github.com/mkj/dropbear/commit/f3465a34eb4007ca3e45044ebdf863842e0346d5
-
-Add the options to DROPBEAR_ENABLE_LEGACY_CRYPTO hook.
-
-Signed-off-by: Bernd Kuhls <be...@ku...>
-Reviewed-by: Baruch Siach <ba...@tk...>
-Signed-off-by: Peter Korsgaard <pe...@ko...>
----
- package/dropbear/dropbear.hash | 2 +-
- package/dropbear/dropbear.mk   | 5 ++++-
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/package/dropbear/dropbear.hash b/package/dropbear/dropbear.hash
-index cf2dd18d61a6..777910da1549 100644
---- a/package/dropbear/dropbear.hash
-+++ b/package/dropbear/dropbear.hash
-@@ -1,5 +1,5 @@
- # From https://matt.ucc.asn.au/dropbear/releases/SHA256SUM.asc
--sha256  e78936dffc395f2e0db099321d6be659190966b99712b55c530dd0a1822e0a5e  dropbear-2024.86.tar.bz2
-+sha256  738b7f358547f0c64c3e1a56bbc5ef98d34d9ec6adf9ccdf01dc0bf2caa2bc8d  dropbear-2025.87.tar.bz2
- 
- # License file, locally computed
- sha256  a99ce657d790b761c132ee7e0de18edb437ae6361e536d991c6a12f36e770445  LICENSE
-diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk
-index e043893aa16c..b0f5dc7afeff 100644
---- a/package/dropbear/dropbear.mk
-+++ b/package/dropbear/dropbear.mk
-@@ -4,7 +4,7 @@
- #
- ################################################################################
- 
--DROPBEAR_VERSION = 2024.86
-+DROPBEAR_VERSION = 2025.87
- DROPBEAR_SITE = https://matt.ucc.asn.au/dropbear/releases
- DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.bz2
- DROPBEAR_LICENSE = MIT, BSD-2-Clause, Public domain
-@@ -69,6 +69,9 @@ define DROPBEAR_ENABLE_LEGACY_CRYPTO
- 	echo '#define DROPBEAR_SHA1_96_HMAC 1'          >> $(@D)/localoptions.h
- 	echo '#define DROPBEAR_DH_GROUP1 1'             >> $(@D)/localoptions.h
- 	echo '#define DROPBEAR_DSS 1'                   >> $(@D)/localoptions.h
-+	echo '#define DROPBEAR_SHA1_HMAC 1'             >> $(@D)/localoptions.h
-+	echo '#define DROPBEAR_RSA_SHA1 1'              >> $(@D)/localoptions.h
-+	echo '#define DROPBEAR_DH_GROUP14_SHA1 1'       >> $(@D)/localoptions.h
- endef
- DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_ENABLE_LEGACY_CRYPTO
- endif
--- 
-2.49.0
-
diff --git a/patches/buildroot/2025.02/0470-package-dropbear-security-bump-to-version-2025.88.patch b/patches/buildroot/2025.02/0470-package-dropbear-security-bump-to-version-2025.88.patch
deleted file mode 100644
index df5259a6b..000000000
--- a/patches/buildroot/2025.02/0470-package-dropbear-security-bump-to-version-2025.88.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 915a351e2fadb334b5b1eb0e5387b7a5264168a9 Mon Sep 17 00:00:00 2001
-From: Kadambini Nema <kad...@gm...>
-Date: Thu, 8 May 2025 21:19:39 -0700
-Subject: [PATCH 470/470] package/dropbear: security bump to version 2025.88
-
-Fixes CVE-2025-47203.
-https://security-tracker.debian.org/tracker/CVE-2025-47203
-
-Release notes:
-https://github.com/mkj/dropbear/releases/tag/DROPBEAR_2025.88
-
-Signed-off-by: Kadambini Nema <kad...@gm...>
-Signed-off-by: Peter Korsgaard <pe...@ko...>
----
- package/dropbear/dropbear.hash | 2 +-
- package/dropbear/dropbear.mk   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/package/dropbear/dropbear.hash b/package/dropbear/dropbear.hash
-index 777910da1549..b18aca3aab5d 100644
---- a/package/dropbear/dropbear.hash
-+++ b/package/dropbear/dropbear.hash
-@@ -1,5 +1,5 @@
- # From https://matt.ucc.asn.au/dropbear/releases/SHA256SUM.asc
--sha256  738b7f358547f0c64c3e1a56bbc5ef98d34d9ec6adf9ccdf01dc0bf2caa2bc8d  dropbear-2025.87.tar.bz2
-+sha256  783f50ea27b17c16da89578fafdb6decfa44bb8f6590e5698a4e4d3672dc53d4  dropbear-2025.88.tar.bz2
- 
- # License file, locally computed
- sha256  a99ce657d790b761c132ee7e0de18edb437ae6361e536d991c6a12f36e770445  LICENSE
-diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk
-index b0f5dc7afeff..d57d6b6e372b 100644
---- a/package/dropbear/dropbear.mk
-+++ b/package/dropbear/dropbear.mk
-@@ -4,7 +4,7 @@
- #
- ################################################################################
- 
--DROPBEAR_VERSION = 2025.87
-+DROPBEAR_VERSION = 2025.88
- DROPBEAR_SITE = https://matt.ucc.asn.au/dropbear/releases
- DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.bz2
- DROPBEAR_LICENSE = MIT, BSD-2-Clause, Public domain
--- 
-2.49.0
-
diff --git a/patches/buildroot/2025.02/cleanup_buildroot.sh b/patches/buildroot/2025.02/cleanup_buildroot.sh
index 59d385c24..ea0d5935c 100755
--- a/patches/buildroot/2025.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2025.02/cleanup_buildroot.sh
@@ -24,8 +24,6 @@ rm -rf buildroot/package/busybox/S10mdev
 rm -rf buildroot/package/cmux/Config.in
 rm -rf buildroot/package/cmux/cmux.hash
 rm -rf buildroot/package/cmux/cmux.mk
-rm -rf buildroot/package/dropbear/dropbear.hash
-rm -rf buildroot/package/dropbear/dropbear.mk
 rm -rf buildroot/package/e-uae/Config.in
 rm -rf buildroot/package/e-uae/e-uae.mk
 rm -rf buildroot/package/expect/expect.mk


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-478-g4d167cb04

[sszy <ss...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  4d167cb04be3c85b018cbe306f0829a7e42ccd20 (commit)
      from  e5e498e42d8373a6fffd5ba19592129592a3d518 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4d167cb04be3c85b018cbe306f0829a7e42ccd20
Author: Sébastien Szymanski <seb...@ar...>
Date:   Wed May 14 18:44:12 2025 +0200

    [BUILDROOT] 2025.02: patches to bump dropbear to 2025.88

-----------------------------------------------------------------------

Summary of changes:
 ...-package-dropbear-bump-version-to-2025.87.patch | 57 ++++++++++++++++++++++
 ...dropbear-security-bump-to-version-2025.88.patch | 45 +++++++++++++++++
 patches/buildroot/2025.02/cleanup_buildroot.sh     |  2 +
 3 files changed, 104 insertions(+)
 create mode 100644 patches/buildroot/2025.02/0469-package-dropbear-bump-version-to-2025.87.patch
 create mode 100644 patches/buildroot/2025.02/0470-package-dropbear-security-bump-to-version-2025.88.patch

diff --git a/patches/buildroot/2025.02/0469-package-dropbear-bump-version-to-2025.87.patch b/patches/buildroot/2025.02/0469-package-dropbear-bump-version-to-2025.87.patch
new file mode 100644
index 000000000..e3958b94b
--- /dev/null
+++ b/patches/buildroot/2025.02/0469-package-dropbear-bump-version-to-2025.87.patch
@@ -0,0 +1,57 @@
+From 05fb4526f909aac533ed943977d4eeabd0b9b4ac Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <be...@ku...>
+Date: Sun, 9 Mar 2025 09:32:16 +0100
+Subject: [PATCH 469/470] package/dropbear: bump version to 2025.87
+
+Changelog: https://matt.ucc.asn.au/dropbear/CHANGES
+
+Upstream disabled sha1 by default:
+https://github.com/mkj/dropbear/commit/f3465a34eb4007ca3e45044ebdf863842e0346d5
+
+Add the options to DROPBEAR_ENABLE_LEGACY_CRYPTO hook.
+
+Signed-off-by: Bernd Kuhls <be...@ku...>
+Reviewed-by: Baruch Siach <ba...@tk...>
+Signed-off-by: Peter Korsgaard <pe...@ko...>
+---
+ package/dropbear/dropbear.hash | 2 +-
+ package/dropbear/dropbear.mk   | 5 ++++-
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/package/dropbear/dropbear.hash b/package/dropbear/dropbear.hash
+index cf2dd18d61a6..777910da1549 100644
+--- a/package/dropbear/dropbear.hash
++++ b/package/dropbear/dropbear.hash
+@@ -1,5 +1,5 @@
+ # From https://matt.ucc.asn.au/dropbear/releases/SHA256SUM.asc
+-sha256  e78936dffc395f2e0db099321d6be659190966b99712b55c530dd0a1822e0a5e  dropbear-2024.86.tar.bz2
++sha256  738b7f358547f0c64c3e1a56bbc5ef98d34d9ec6adf9ccdf01dc0bf2caa2bc8d  dropbear-2025.87.tar.bz2
+ 
+ # License file, locally computed
+ sha256  a99ce657d790b761c132ee7e0de18edb437ae6361e536d991c6a12f36e770445  LICENSE
+diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk
+index e043893aa16c..b0f5dc7afeff 100644
+--- a/package/dropbear/dropbear.mk
++++ b/package/dropbear/dropbear.mk
+@@ -4,7 +4,7 @@
+ #
+ ################################################################################
+ 
+-DROPBEAR_VERSION = 2024.86
++DROPBEAR_VERSION = 2025.87
+ DROPBEAR_SITE = https://matt.ucc.asn.au/dropbear/releases
+ DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.bz2
+ DROPBEAR_LICENSE = MIT, BSD-2-Clause, Public domain
+@@ -69,6 +69,9 @@ define DROPBEAR_ENABLE_LEGACY_CRYPTO
+ 	echo '#define DROPBEAR_SHA1_96_HMAC 1'          >> $(@D)/localoptions.h
+ 	echo '#define DROPBEAR_DH_GROUP1 1'             >> $(@D)/localoptions.h
+ 	echo '#define DROPBEAR_DSS 1'                   >> $(@D)/localoptions.h
++	echo '#define DROPBEAR_SHA1_HMAC 1'             >> $(@D)/localoptions.h
++	echo '#define DROPBEAR_RSA_SHA1 1'              >> $(@D)/localoptions.h
++	echo '#define DROPBEAR_DH_GROUP14_SHA1 1'       >> $(@D)/localoptions.h
+ endef
+ DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_ENABLE_LEGACY_CRYPTO
+ endif
+-- 
+2.49.0
+
diff --git a/patches/buildroot/2025.02/0470-package-dropbear-security-bump-to-version-2025.88.patch b/patches/buildroot/2025.02/0470-package-dropbear-security-bump-to-version-2025.88.patch
new file mode 100644
index 000000000..df5259a6b
--- /dev/null
+++ b/patches/buildroot/2025.02/0470-package-dropbear-security-bump-to-version-2025.88.patch
@@ -0,0 +1,45 @@
+From 915a351e2fadb334b5b1eb0e5387b7a5264168a9 Mon Sep 17 00:00:00 2001
+From: Kadambini Nema <kad...@gm...>
+Date: Thu, 8 May 2025 21:19:39 -0700
+Subject: [PATCH 470/470] package/dropbear: security bump to version 2025.88
+
+Fixes CVE-2025-47203.
+https://security-tracker.debian.org/tracker/CVE-2025-47203
+
+Release notes:
+https://github.com/mkj/dropbear/releases/tag/DROPBEAR_2025.88
+
+Signed-off-by: Kadambini Nema <kad...@gm...>
+Signed-off-by: Peter Korsgaard <pe...@ko...>
+---
+ package/dropbear/dropbear.hash | 2 +-
+ package/dropbear/dropbear.mk   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/package/dropbear/dropbear.hash b/package/dropbear/dropbear.hash
+index 777910da1549..b18aca3aab5d 100644
+--- a/package/dropbear/dropbear.hash
++++ b/package/dropbear/dropbear.hash
+@@ -1,5 +1,5 @@
+ # From https://matt.ucc.asn.au/dropbear/releases/SHA256SUM.asc
+-sha256  738b7f358547f0c64c3e1a56bbc5ef98d34d9ec6adf9ccdf01dc0bf2caa2bc8d  dropbear-2025.87.tar.bz2
++sha256  783f50ea27b17c16da89578fafdb6decfa44bb8f6590e5698a4e4d3672dc53d4  dropbear-2025.88.tar.bz2
+ 
+ # License file, locally computed
+ sha256  a99ce657d790b761c132ee7e0de18edb437ae6361e536d991c6a12f36e770445  LICENSE
+diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk
+index b0f5dc7afeff..d57d6b6e372b 100644
+--- a/package/dropbear/dropbear.mk
++++ b/package/dropbear/dropbear.mk
+@@ -4,7 +4,7 @@
+ #
+ ################################################################################
+ 
+-DROPBEAR_VERSION = 2025.87
++DROPBEAR_VERSION = 2025.88
+ DROPBEAR_SITE = https://matt.ucc.asn.au/dropbear/releases
+ DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.bz2
+ DROPBEAR_LICENSE = MIT, BSD-2-Clause, Public domain
+-- 
+2.49.0
+
diff --git a/patches/buildroot/2025.02/cleanup_buildroot.sh b/patches/buildroot/2025.02/cleanup_buildroot.sh
index ea0d5935c..59d385c24 100755
--- a/patches/buildroot/2025.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2025.02/cleanup_buildroot.sh
@@ -24,6 +24,8 @@ rm -rf buildroot/package/busybox/S10mdev
 rm -rf buildroot/package/cmux/Config.in
 rm -rf buildroot/package/cmux/cmux.hash
 rm -rf buildroot/package/cmux/cmux.mk
+rm -rf buildroot/package/dropbear/dropbear.hash
+rm -rf buildroot/package/dropbear/dropbear.mk
 rm -rf buildroot/package/e-uae/Config.in
 rm -rf buildroot/package/e-uae/e-uae.mk
 rm -rf buildroot/package/expect/expect.mk


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-477-ge5e498e42

[sszy <ss...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  e5e498e42d8373a6fffd5ba19592129592a3d518 (commit)
      from  c0e08c7905faf916d1ce05339727d55ba0681081 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e5e498e42d8373a6fffd5ba19592129592a3d518
Author: Sébastien Szymanski <seb...@ar...>
Date:   Tue May 6 18:29:57 2025 +0200

    Makefile: apply BR patches from BR2_EXTERNAL if it exists

-----------------------------------------------------------------------

Summary of changes:
 Makefile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Makefile b/Makefile
index 92b3d08c8..e4ea664bc 100644
--- a/Makefile
+++ b/Makefile
@@ -150,6 +150,9 @@ buildroot-unpacked: $(BUILDROOT_DIR)/.unpacked
 
 $(BUILDROOT_DIR)/.patched: $(BUILDROOT_DIR)/.unpacked
 	$(BUILDROOT_PATCH_SCRIPT) $(BUILDROOT_DIR) $(BUILDROOT_PATCH_DIR) \*.patch
+	@if [ -n "$(BR2_EXTERNAL)" -a -d "$(BR2_EXTERNAL)/patches/buildroot/$(BUILDROOT_MAJOR_VERSION)" ]; then \
+		$(BUILDROOT_PATCH_SCRIPT) $(BUILDROOT_DIR) $(BR2_EXTERNAL)/patches/buildroot/$(BUILDROOT_MAJOR_VERSION) \*.patch ; \
+	fi
 	touch $@
 
 buildroot-patched: $(BUILDROOT_DIR)/.patched


hooks/post-receive
-- 
armadeus