From: Tom Rini <trini@konsulko.com>
Date: Tue, 4 Jun 2024 00:42:11 +0000 (-0600)
Subject: Merge tag 'v2024.07-rc4' into next
X-Git-Url: http://git.dujemihanovic.xyz/img/sics.gif?a=commitdiff_plain;h=227be29df37545f74243a98c12a4a33c4160e3cd;p=u-boot.git

Merge tag 'v2024.07-rc4' into next

Prepare v2024.070-rc4
---

227be29df37545f74243a98c12a4a33c4160e3cd
diff --cc arch/arm/mach-k3/am62px/Makefile
index 5902862b29,0000000000..eed91a033e
mode 100644,000000..100644
--- a/arch/arm/mach-k3/am62px/Makefile
+++ b/arch/arm/mach-k3/am62px/Makefile
@@@ -1,6 -1,0 +1,7 @@@
 +# SPDX-License-Identifier: GPL-2.0+
 +#
 +# Copyright (C) 2024 Texas Instruments Incorporated - https://www.ti.com/
 +#	Andrew Davis <afd@ti.com>
 +
++obj-$(CONFIG_OF_SYSTEM_SETUP) += am62p5_fdt.o
 +obj-$(CONFIG_SPL_BUILD) += am62p5_init.o
diff --cc arch/arm/mach-k3/am62px/am62p5_fdt.c
index 0000000000,d67f012a5d..29c832d28a
mode 000000,100644..100644
--- a/arch/arm/mach-k3/am62px/am62p5_fdt.c
+++ b/arch/arm/mach-k3/am62px/am62p5_fdt.c
@@@ -1,0 -1,16 +1,16 @@@
+ // SPDX-License-Identifier: GPL-2.0-or-later
+ /*
+  * Copyright (C) 2024 Texas Instruments Incorporated - https://www.ti.com/
+  */
+ 
+ #include <asm/hardware.h>
 -#include "common_fdt.h"
++#include "../common_fdt.h"
+ #include <fdt_support.h>
+ 
+ int ft_system_setup(void *blob, struct bd_info *bd)
+ {
+ 	fdt_fixup_reserved(blob, "tfa", CONFIG_K3_ATF_LOAD_ADDR, 0x80000);
+ 	fdt_fixup_reserved(blob, "optee", CONFIG_K3_OPTEE_LOAD_ADDR, 0x1800000);
+ 
+ 	return 0;
+ }