From: Tom Rini <trini@konsulko.com>
Date: Wed, 17 Apr 2024 19:16:12 +0000 (-0600)
Subject: Merge patch series "configs: ti: Enable basic settings for SystemReady ACS"
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=a712a54dc427708195e6405af4b072d869d0dd8f;p=u-boot.git

Merge patch series "configs: ti: Enable basic settings for SystemReady ACS"

Jonathan Humphreys <j-humphreys@ti.com> says:

Set basic settings needed for System Ready IR ACS testing, for several TI SoC
based platforms: AM64, AM62, AM62p, BeaglePlay, J7, and BeagleboneAI.

For AM64, AM62, and AM62p, also includes some config cleanup.  Should be no
functional change.
---

a712a54dc427708195e6405af4b072d869d0dd8f
diff --cc configs/am62px_evm_a53_defconfig
index 6dbdd427ec,65dfda19f1..638d2e90a6
--- a/configs/am62px_evm_a53_defconfig
+++ b/configs/am62px_evm_a53_defconfig
@@@ -73,9 -70,9 +70,10 @@@ CONFIG_CMD_TIME=
  CONFIG_CMD_EXT4_WRITE=y
  CONFIG_CMD_MTDPARTS=y
  CONFIG_CMD_UBI=y
 +CONFIG_MMC_SPEED_MODE_SET=y
  CONFIG_OF_CONTROL=y
  CONFIG_SPL_OF_CONTROL=y
+ CONFIG_OF_UPSTREAM=y
  CONFIG_MULTI_DTB_FIT=y
  CONFIG_SPL_MULTI_DTB_FIT=y
  CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=y
diff --cc configs/am62x_evm_a53_defconfig
index 06c7d31a6f,d650b8575b..6b37f8b479
--- a/configs/am62x_evm_a53_defconfig
+++ b/configs/am62x_evm_a53_defconfig
@@@ -29,15 -33,11 +33,11 @@@ CONFIG_SPL_LOAD_FIT=
  CONFIG_SPL_LOAD_FIT_ADDRESS=0x81000000
  CONFIG_BOOTSTD_FULL=y
  CONFIG_SYS_BOOTM_LEN=0x800000
 -CONFIG_BOOTCOMMAND="run envboot; bootflow scan -lb"
 +CONFIG_BOOTCOMMAND="run findfdt; run envboot; bootflow scan -lb"
  CONFIG_BOARD_LATE_INIT=y
  CONFIG_SPL_MAX_SIZE=0x58000
- CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
- CONFIG_SPL_BSS_START_ADDR=0x80c80000
- CONFIG_SPL_BSS_MAX_SIZE=0x80000
  CONFIG_SPL_SYS_REPORT_STACK_F_USAGE=y
  CONFIG_SPL_SYS_MALLOC_SIMPLE=y
- CONFIG_SPL_STACK_R=y
  CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y
  CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x1400
  CONFIG_SPL_FS_LOAD_PAYLOAD_NAME="u-boot.img"
@@@ -49,8 -49,10 +49,11 @@@ CONFIG_SPL_SPI_FLASH_SFDP_SUPPORT=
  CONFIG_SPL_SPI_LOAD=y
  CONFIG_SYS_SPI_U_BOOT_OFFS=0x280000
  CONFIG_SPL_YMODEM_SUPPORT=y
+ CONFIG_CMD_BOOTEFI_SELFTEST=y
+ CONFIG_CMD_NVEDIT_EFI=y
  CONFIG_CMD_MMC=y
 +CONFIG_MMC_SPEED_MODE_SET=y
+ CONFIG_CMD_EFIDEBUG=y
  CONFIG_OF_CONTROL=y
  CONFIG_SPL_OF_CONTROL=y
  CONFIG_MULTI_DTB_FIT=y
diff --cc configs/am64x_evm_a53_defconfig
index 179c42a544,61b498b49a..8b0ccbabbe
--- a/configs/am64x_evm_a53_defconfig
+++ b/configs/am64x_evm_a53_defconfig
@@@ -72,9 -75,9 +75,10 @@@ CONFIG_CMD_EFIDEBUG=
  CONFIG_CMD_TIME=y
  CONFIG_CMD_PMIC=y
  CONFIG_CMD_REGULATOR=y
 +CONFIG_MMC_SPEED_MODE_SET=y
  CONFIG_OF_CONTROL=y
  CONFIG_SPL_OF_CONTROL=y
+ CONFIG_OF_UPSTREAM=y
  CONFIG_OF_LIST="ti/k3-am642-evm ti/k3-am642-sk"
  CONFIG_MULTI_DTB_FIT=y
  CONFIG_SPL_MULTI_DTB_FIT=y