From: Tom Rini <trini@konsulko.com>
Date: Mon, 9 Jun 2025 22:28:28 +0000 (-0600)
Subject: Merge tag 'v2025.07-rc4' into next
X-Git-Tag: v2025.10-rc1~118^2~32
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=59d00e20fced23e6463aa09db889dd548baee677;p=thirdparty%2Fu-boot.git

Merge tag 'v2025.07-rc4' into next

Prepare v2025.07-rc4
---

59d00e20fced23e6463aa09db889dd548baee677
diff --cc configs/th1520_lpi4a_defconfig
index 68745395293,b9eedc6b754..5734005199b
--- a/configs/th1520_lpi4a_defconfig
+++ b/configs/th1520_lpi4a_defconfig
@@@ -6,13 -7,16 +7,15 @@@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=
  CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80200000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="th1520-lichee-pi-4a"
+ CONFIG_SPL_STACK=0xffe0170000
+ CONFIG_SPL_BSS_START_ADDR=0xffe0160000
+ CONFIG_SPL_BSS_MAX_SIZE=0x10000
  CONFIG_SYS_BOOTM_LEN=0x4000000
  CONFIG_SYS_LOAD_ADDR=0x80200000
- # CONFIG_SMP is not set
+ CONFIG_SPL=y
 -# CONFIG_SMP is not set
  CONFIG_TARGET_TH1520_LPI4A=y
  CONFIG_ARCH_RV64I=y
 -CONFIG_OF_BOARD_FIXUP=y
 +CONFIG_RISCV_SMODE=y
- CONFIG_OF_BOARD_FIXUP=y
  CONFIG_SYS_BOOT_GET_CMDLINE=y
  CONFIG_SYS_BOOT_GET_KBD=y
  # CONFIG_EFI_LOADER is not set
@@@ -79,8 -92,11 +91,10 @@@ CONFIG_MMC_SDHCI_ADMA=
  CONFIG_MMC_SDHCI_SNPS=y
  # CONFIG_MTD is not set
  # CONFIG_POWER is not set
+ CONFIG_RAM=y
+ CONFIG_SPL_RAM=y
+ CONFIG_SPL_THEAD_TH1520_DDR=y
  CONFIG_SYS_NS16550=y
--CONFIG_RISCV_TIMER=y
  CONFIG_AES=y
  CONFIG_BLAKE2=y
  CONFIG_SHA512=y