From 46e372feb784f533cd92e73f51f90b4fe4d336e5 Mon Sep 17 00:00:00 2001 From: Philippe Schenker Date: Tue, 11 Nov 2025 08:16:25 +0100 Subject: arm: dts: k3-am642-evm: Remove duplicate node The device tree contained a duplicate DT node 'main_mmc1_pins_default', which was already defined a few lines below. This patch removes the redundant entry. Signed-off-by: Philippe Schenker Reviewed-by: Anshul Dalal --- arch/arm/dts/k3-am642-evm-u-boot.dtsi | 4 ---- 1 file changed, 4 deletions(-) (limited to 'arch') diff --git a/arch/arm/dts/k3-am642-evm-u-boot.dtsi b/arch/arm/dts/k3-am642-evm-u-boot.dtsi index 705b3baa81c..6469f43fca8 100644 --- a/arch/arm/dts/k3-am642-evm-u-boot.dtsi +++ b/arch/arm/dts/k3-am642-evm-u-boot.dtsi @@ -19,10 +19,6 @@ dr_mode="peripheral"; }; -&main_mmc1_pins_default { - bootph-all; -}; - &sdhci0 { bootph-all; }; -- cgit v1.2.3 From fe114f3662c655cae44b45370d6dc4de2055a611 Mon Sep 17 00:00:00 2001 From: Philippe Schenker Date: Tue, 11 Nov 2025 08:16:28 +0100 Subject: mach-k3: security: Propagate verified image addr The ti_secure_image_check() function may relocate the image during authentication, updating image_addr to point to the verified location. The caller was not updated with this new address, causing it to reference the original unverified location. Update p_image with the verified image address after authentication to ensure subsequent operations use the correct location. Signed-off-by: Philippe Schenker --- arch/arm/mach-k3/security.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'arch') diff --git a/arch/arm/mach-k3/security.c b/arch/arm/mach-k3/security.c index 3468a370a45..c7017bba99a 100644 --- a/arch/arm/mach-k3/security.c +++ b/arch/arm/mach-k3/security.c @@ -119,6 +119,8 @@ void ti_secure_image_post_process(void **p_image, size_t *p_size) */ *p_size = image_size; + *p_image = (void *)(uintptr_t)image_addr; + /* * Output notification of successful authentication to re-assure the * user that the secure code is being processed as expected. However -- cgit v1.2.3