Merge patch series "Move DRAM address of ATF"

Andrew Davis <afd@ti.com> says:

Explanation for this series is mostly in [4/6]. First 3
patches should be safe to take independent of the last 3.

diff --cc arch/arm/dts/k3-binman.dtsi
index 5ef5af315ae6f8053e759efd59ef8cf33e529bc3,621653e947182a442801d93a0624ecaf135a7ff3..5163161b94d6ffc6f7fffa071d1b7c57707b3717
--- 1/arch/arm/dts/k3-binman.dtsi
--- 2/arch/arm/dts/k3-binman.dtsi
+++ b/arch/arm/dts/k3-binman.dtsi
@@@ -357,11 -356,10 +357,11 @@@
                                        arch = "arm64";
                                        compression = "none";
                                        os = "tee";
-                                       load = <0x9e800000>;
-                                       entry = <0x9e800000>;
+                                       load = <CONFIG_K3_OPTEE_LOAD_ADDR>;
+                                       entry = <CONFIG_K3_OPTEE_LOAD_ADDR>;
                                        tee-os {
                                                filename = "tee-raw.bin";
 +                                              optional;
                                        };
                                };
  

diff --cc arch/arm/dts/k3-j721e-beagleboneai64-u-boot.dtsi
Simple merge

diff --cc arch/arm/mach-k3/Kconfig
index cb83bd20258ea979cff1b92bc9fdf110f49dc422,33f20f61f834c88d3f0ab921e9d9b1259d1b22ea..fc971d517ab162c58ba124246a72bf946535ee1c
--- 1/arch/arm/mach-k3/Kconfig
--- 2/arch/arm/mach-k3/Kconfig
+++ b/arch/arm/mach-k3/Kconfig
@@@ -116,11 -114,26 +116,19 @@@ config K3_EARLY_CONS_ID
          Use this option to set the index of the serial device to be used
          for the early console during SPL execution.
  
 -config SYS_K3_SPL_ATF
 -      bool "Start Cortex-A from SPL"
 -      depends on CPU_V7R
 -      help
 -        Enabling this will try to start Cortex-A (typically with ATF)
 -        after SPL from R5.
 -
  config K3_ATF_LOAD_ADDR
        hex "Load address of ATF image"
+       default 0x80000000 if (SOC_K3_AM625 || SOC_K3_AM62A7)
        default 0x70000000
        help
-         The load address for the ATF image. This value defaults to 0x70000000
+         The load address for the ATF image. This value is used to build the
+         FIT image header that places ATF in memory where it will run.
+ 
+ config K3_OPTEE_LOAD_ADDR
+       hex "Load address of OPTEE image"
+       default 0x9e800000
+       help
+         The load address for the OPTEE image. This value defaults to 0x9e800000
          if not provided in the board defconfig file.
  
  config K3_DM_FW

diff --cc arch/arm/mach-k3/Makefile
index 19b2d79e57d28d9d6840ea5b5a6580dd8428373e,fdb442773e3fcc2ca2442b3e0ca4e3525beb2f3e..310a4c211404b768a03e97fb04a2f54fe2a7f406
--- 1/arch/arm/mach-k3/Makefile
--- 2/arch/arm/mach-k3/Makefile
+++ b/arch/arm/mach-k3/Makefile
@@@ -11,7 -12,7 +11,8 @@@ obj-$(CONFIG_SOC_K3_AM654) += am654_fdt
  obj-$(CONFIG_SOC_K3_J721E) += j721e_fdt.o
  obj-$(CONFIG_SOC_K3_J721S2) += j721s2_fdt.o
  obj-$(CONFIG_SOC_K3_AM625) += am625_fdt.o
+ obj-$(CONFIG_SOC_K3_AM62A7) += am62a7_fdt.o
 +obj-$(CONFIG_SOC_K3_J784S4) += j784s4_fdt.o
  endif
  ifeq ($(CONFIG_SPL_BUILD),y)
  obj-$(CONFIG_SOC_K3_AM654) += am654_init.o

diff --cc arch/arm/mach-k3/am625_fdt.c
index 3c46d1028fd05b707846479103e81b5348dc19d6,b26186456f38812defee2b674592d6f676aba527..c56adef13bd55c1faf222e323e45897944de020e
--- 1/arch/arm/mach-k3/am625_fdt.c
--- 2/arch/arm/mach-k3/am625_fdt.c
+++ b/arch/arm/mach-k3/am625_fdt.c
@@@ -79,7 -43,8 +79,9 @@@ int ft_system_setup(void *blob, struct 
        fdt_fixup_cores_nodes_am625(blob, k3_get_core_nr());
        fdt_fixup_gpu_nodes_am625(blob, k3_has_gpu());
        fdt_fixup_pru_node_am625(blob, k3_has_pru());
 +      fdt_fixup_thermal_zone_nodes_am625(blob, k3_get_max_temp());
+       fdt_fixup_reserved(blob, "tfa", CONFIG_K3_ATF_LOAD_ADDR, 0x80000);
+       fdt_fixup_reserved(blob, "optee", CONFIG_K3_OPTEE_LOAD_ADDR, 0x1800000);
  
        return 0;
  }

diff --cc configs/am62ax_evm_a53_defconfig
Simple merge

diff --cc configs/am62x_beagleplay_a53_defconfig
Simple merge

diff --cc configs/am62x_evm_a53_defconfig
Simple merge