From: Tom Rini <trini@konsulko.com>
Date: Mon, 11 Mar 2024 17:40:06 +0000 (-0400)
Subject: Merge tag 'v2024.04-rc4' into next
X-Git-Tag: v2025.01-rc5-pxa1908~578^2~8
X-Git-Url: http://git.dujemihanovic.xyz/img/static//%22brlog.php?a=commitdiff_plain;h=20a0ce574d6642e0dfe651467159039fac48cc4f;p=u-boot.git
Merge tag 'v2024.04-rc4' into next
Prepare v2024.04-rc4
---
20a0ce574d6642e0dfe651467159039fac48cc4f
diff --cc arch/arm/mach-k3/common.c
index ed8aec360c,b54f2ddc47..b0fb87b97a
--- a/arch/arm/mach-k3/common.c
+++ b/arch/arm/mach-k3/common.c
@@@ -28,6 -28,29 +28,8 @@@
#include <elf.h>
#include <soc.h>
+ #include <asm/arch/k3-qos.h>
+
-#if IS_ENABLED(CONFIG_SYS_K3_SPL_ATF)
-enum {
- IMAGE_ID_ATF,
- IMAGE_ID_OPTEE,
- IMAGE_ID_SPL,
- IMAGE_ID_DM_FW,
- IMAGE_AMT,
-};
-
-#if CONFIG_IS_ENABLED(FIT_IMAGE_POST_PROCESS)
-static const char *image_os_match[IMAGE_AMT] = {
- "arm-trusted-firmware",
- "tee",
- "U-Boot",
- "DM",
-};
-#endif
-
-static struct image_info fit_image_info[IMAGE_AMT];
-#endif
-
struct ti_sci_handle *get_ti_sci_handle(void)
{
struct udevice *dev;
diff --cc arch/arm/mach-k3/include/mach/hardware.h
index 74692b745a,52ef82e70b..055715f20d
--- a/arch/arm/mach-k3/include/mach/hardware.h
+++ b/arch/arm/mach-k3/include/mach/hardware.h
@@@ -30,13 -30,8 +30,12 @@@
#ifdef CONFIG_SOC_K3_AM62A7
#include "am62a_hardware.h"
- #include "am62a_qos.h"
#endif
+#ifdef CONFIG_SOC_K3_J784S4
+#include "j784s4_hardware.h"
+#endif
+
/* Assuming these addresses and definitions stay common across K3 devices */
#define CTRLMMR_WKUP_JTAG_ID (WKUP_CTRL_MMR0_BASE + 0x14)
#define JTAG_ID_VARIANT_SHIFT 28
diff --cc configs/am64x_evm_a53_defconfig
index 27aa78a533,8e7002fd0e..ad5472c457
--- a/configs/am64x_evm_a53_defconfig
+++ b/configs/am64x_evm_a53_defconfig
@@@ -58,13 -56,9 +57,12 @@@ CONFIG_SPL_NET_VCI_STRING="AM64X U-Boo
CONFIG_SPL_POWER_DOMAIN=y
CONFIG_SPL_RAM_SUPPORT=y
CONFIG_SPL_RAM_DEVICE=y
+# CONFIG_SPL_SPI_FLASH_TINY is not set
+CONFIG_SPL_SPI_FLASH_SFDP_SUPPORT=y
CONFIG_SPL_SPI_LOAD=y
-CONFIG_SYS_SPI_U_BOOT_OFFS=0x280000
+CONFIG_SYS_SPI_U_BOOT_OFFS=0x300000
+CONFIG_SPL_THERMAL=y
CONFIG_SPL_YMODEM_SUPPORT=y
- CONFIG_SYS_MAXARGS=64
CONFIG_CMD_ASKENV=y
CONFIG_CMD_DFU=y
CONFIG_CMD_GPT=y
diff --cc configs/am64x_evm_r5_defconfig
index 29e6bba9d3,2afaceb72c..555d69bb11
--- a/configs/am64x_evm_r5_defconfig
+++ b/configs/am64x_evm_r5_defconfig
@@@ -65,14 -63,10 +65,13 @@@ CONFIG_SPL_POWER_DOMAIN=
CONFIG_SPL_RAM_SUPPORT=y
CONFIG_SPL_RAM_DEVICE=y
CONFIG_SPL_REMOTEPROC=y
+# CONFIG_SPL_SPI_FLASH_TINY is not set
+CONFIG_SPL_SPI_FLASH_SFDP_SUPPORT=y
CONFIG_SPL_SPI_LOAD=y
-CONFIG_SYS_SPI_U_BOOT_OFFS=0x80000
+CONFIG_SYS_SPI_U_BOOT_OFFS=0x100000
+CONFIG_SPL_THERMAL=y
CONFIG_SPL_YMODEM_SUPPORT=y
CONFIG_HUSH_PARSER=y
- CONFIG_SYS_MAXARGS=64
CONFIG_CMD_ASKENV=y
CONFIG_CMD_DFU=y
CONFIG_CMD_GPT=y