* [PATCH 1/4] configs: Remove default malloc length for K3 R5 SPL
@ 2025-12-08 19:06 Andrew Davis
2025-12-08 19:06 ` [PATCH 2/4] spl: Kconfig: k3: Increase malloc size after relocation for R5 Andrew Davis
` (4 more replies)
0 siblings, 5 replies; 9+ messages in thread
From: Andrew Davis @ 2025-12-08 19:06 UTC (permalink / raw)
To: Neha Malcom Francis, Bryan Brattlof, Simon Glass, Tom Rini
Cc: u-boot, Andrew Davis
These values are already the default, remove them from these defconfigs.
Signed-off-by: Andrew Davis <afd@ti.com>
---
configs/am62x_evm_r5_ethboot_defconfig | 1 -
configs/j722s_evm_r5_ethboot_defconfig | 1 -
configs/phycore_am62ax_r5_ethboot_defconfig | 1 -
configs/phycore_am62x_r5_ethboot_defconfig | 1 -
4 files changed, 4 deletions(-)
diff --git a/configs/am62x_evm_r5_ethboot_defconfig b/configs/am62x_evm_r5_ethboot_defconfig
index 5ad4d3f0e5c..c97c4e28fbe 100644
--- a/configs/am62x_evm_r5_ethboot_defconfig
+++ b/configs/am62x_evm_r5_ethboot_defconfig
@@ -8,7 +8,6 @@ CONFIG_DEFAULT_DEVICEC_TREE="k3-am625-r5-sk"
CONFIG_SPL_GPIO=y
CONFIG_SPL_MMC=n
CONFIG_SPL_BOARD_INIT=y
-CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x200000
CONFIG_SPL_BSS_MAX_SIZE=0x3100
CONFIG_SPL_DMA=y
CONFIG_SPL_ENV_SUPPORT=y
diff --git a/configs/j722s_evm_r5_ethboot_defconfig b/configs/j722s_evm_r5_ethboot_defconfig
index fd58485bff2..68237f7d8c3 100644
--- a/configs/j722s_evm_r5_ethboot_defconfig
+++ b/configs/j722s_evm_r5_ethboot_defconfig
@@ -8,7 +8,6 @@ CONFIG_DEFAULT_DEVICE_TREE="k3-j722s-r5-evm"
CONFIG_NET=y
CONFIG_SPL_DRIVERS_MISC=y
CONFIG_SPL_BOARD_INIT=y
-CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x200000
CONFIG_SPL_DMA=y
CONFIG_SPL_ENV_SUPPORT=y
CONFIG_SPL_ETH=y
diff --git a/configs/phycore_am62ax_r5_ethboot_defconfig b/configs/phycore_am62ax_r5_ethboot_defconfig
index 81a7f5b0784..526d15a0dc5 100644
--- a/configs/phycore_am62ax_r5_ethboot_defconfig
+++ b/configs/phycore_am62ax_r5_ethboot_defconfig
@@ -8,7 +8,6 @@ CONFIG_DEFAULT_DEVICE_TREE="k3-am62a7-r5-phycore-som-2gb"
CONFIG_SPL_GPIO=y
CONFIG_SPL_BOARD_INIT=y
-CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x200000
CONFIG_SPL_BSS_MAX_SIZE=0x3100
CONFIG_SPL_DMA=y
CONFIG_SPL_ENV_SUPPORT=y
diff --git a/configs/phycore_am62x_r5_ethboot_defconfig b/configs/phycore_am62x_r5_ethboot_defconfig
index 3bc426821e9..92dd0be647e 100644
--- a/configs/phycore_am62x_r5_ethboot_defconfig
+++ b/configs/phycore_am62x_r5_ethboot_defconfig
@@ -8,7 +8,6 @@ CONFIG_DEFAULT_DEVICE_TREE="k3-am625-r5-phycore-som-2gb"
CONFIG_SPL_GPIO=y
CONFIG_SPL_BOARD_INIT=y
-CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x200000
CONFIG_SPL_DMA=y
CONFIG_SPL_ENV_SUPPORT=y
CONFIG_SPL_ETH=y
--
2.39.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/4] spl: Kconfig: k3: Increase malloc size after relocation for R5
2025-12-08 19:06 [PATCH 1/4] configs: Remove default malloc length for K3 R5 SPL Andrew Davis
@ 2025-12-08 19:06 ` Andrew Davis
2025-12-09 14:11 ` Bryan Brattlof
2025-12-08 19:06 ` [PATCH 3/4] spl: Kconfig: k3: Set common default for CUSTOM_SYS_MALLOC items Andrew Davis
` (3 subsequent siblings)
4 siblings, 1 reply; 9+ messages in thread
From: Andrew Davis @ 2025-12-08 19:06 UTC (permalink / raw)
To: Neha Malcom Francis, Bryan Brattlof, Simon Glass, Tom Rini
Cc: u-boot, Andrew Davis
Seems the "generous 2MB space" is no longer enough for SPL on some K3 R5
platforms so let's increase this to 4MB. That matches what we give to
ARM64 SPL, so combine these.
Signed-off-by: Andrew Davis <afd@ti.com>
---
common/spl/Kconfig | 3 +--
configs/am64x_evm_r5_defconfig | 1 -
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index 3b7b6cafef8..0411a5edc9f 100644
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -465,8 +465,7 @@ config SPL_STACK_R_ADDR
config SPL_STACK_R_MALLOC_SIMPLE_LEN
depends on SPL_STACK_R && SPL_SYS_MALLOC_SIMPLE
hex "Size of malloc_simple heap after switching to DRAM SPL stack"
- default 0x400000 if ARCH_K3 && ARM64
- default 0x200000 if ARCH_K3 && CPU_V7R
+ default 0x400000 if ARCH_K3
default 0x100000
help
Specify the amount of the stack to use as memory pool for
diff --git a/configs/am64x_evm_r5_defconfig b/configs/am64x_evm_r5_defconfig
index a675ea84fca..e1a748de5a9 100644
--- a/configs/am64x_evm_r5_defconfig
+++ b/configs/am64x_evm_r5_defconfig
@@ -23,7 +23,6 @@ CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
CONFIG_SPL_BSS_START_ADDR=0x7019b800
CONFIG_SPL_BSS_MAX_SIZE=0x4000
CONFIG_SPL_STACK_R=y
-CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x400000
CONFIG_SPL_SIZE_LIMIT=0x190000
CONFIG_SPL_SIZE_LIMIT_PROVIDE_STACK=0x4000
CONFIG_SPL_FS_FAT=y
--
2.39.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 3/4] spl: Kconfig: k3: Set common default for CUSTOM_SYS_MALLOC items
2025-12-08 19:06 [PATCH 1/4] configs: Remove default malloc length for K3 R5 SPL Andrew Davis
2025-12-08 19:06 ` [PATCH 2/4] spl: Kconfig: k3: Increase malloc size after relocation for R5 Andrew Davis
@ 2025-12-08 19:06 ` Andrew Davis
2025-12-09 14:12 ` Bryan Brattlof
2025-12-08 19:06 ` [PATCH 4/4] spl: Kconfig: k3: Set common default for SPL_LOAD_FIT(_ADDRESS) Andrew Davis
` (2 subsequent siblings)
4 siblings, 1 reply; 9+ messages in thread
From: Andrew Davis @ 2025-12-08 19:06 UTC (permalink / raw)
To: Neha Malcom Francis, Bryan Brattlof, Simon Glass, Tom Rini
Cc: u-boot, Andrew Davis
These are common for all K3 based boards. Add the common values as
defaults and remove from each board defconfig.
Signed-off-by: Andrew Davis <afd@ti.com>
---
common/spl/Kconfig | 3 +++
configs/am62ax_evm_r5_defconfig | 2 --
configs/am62x_beagleplay_r5_defconfig | 3 ---
configs/am62x_evm_r5_defconfig | 3 ---
configs/am64x_evm_r5_defconfig | 3 ---
configs/am65x_evm_r5_defconfig | 3 ---
configs/am65x_evm_r5_usbmsc_defconfig | 3 ---
configs/am69_sk_r5_ethboot_defconfig | 2 --
configs/j7200_evm_r5_defconfig | 3 ---
configs/j721e_beagleboneai64_r5_defconfig | 3 ---
configs/j721e_evm_r5_defconfig | 3 ---
configs/j721s2_evm_r5_defconfig | 3 ---
configs/phycore_am62ax_r5_defconfig | 2 --
configs/phycore_am62x_r5_defconfig | 3 ---
configs/phycore_am64x_r5_defconfig | 3 ---
configs/verdin-am62_r5_defconfig | 3 ---
configs/verdin-am62p_r5_defconfig | 3 ---
17 files changed, 3 insertions(+), 45 deletions(-)
diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index 0411a5edc9f..8e9f88d8c7a 100644
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -489,15 +489,18 @@ config SPL_SYS_MALLOC
config SPL_HAS_CUSTOM_MALLOC_START
bool "For the SPL malloc pool, define a custom starting address"
depends on SPL_SYS_MALLOC
+ default y if ARCH_K3 && CPU_V7R
config SPL_CUSTOM_SYS_MALLOC_ADDR
hex "SPL malloc addr"
depends on SPL_HAS_CUSTOM_MALLOC_START
+ default 0x84000000 if ARCH_K3 && CPU_V7R
config SPL_SYS_MALLOC_SIZE
hex "Size of the SPL malloc pool"
depends on SPL_SYS_MALLOC
default 0x800000 if RISCV
+ default 0x1000000 if ARCH_K3 && CPU_V7R
default 0x100000
config SPL_READ_ONLY
diff --git a/configs/am62ax_evm_r5_defconfig b/configs/am62ax_evm_r5_defconfig
index 64886986c42..2586f6cd648 100644
--- a/configs/am62ax_evm_r5_defconfig
+++ b/configs/am62ax_evm_r5_defconfig
@@ -36,8 +36,6 @@ CONFIG_SPL_SYS_REPORT_STACK_F_USAGE=y
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL_SEPARATE_BSS=y
CONFIG_SPL_SYS_MALLOC=y
-CONFIG_SPL_HAS_CUSTOM_MALLOC_START=y
-CONFIG_SPL_CUSTOM_SYS_MALLOC_ADDR=0x84000000
CONFIG_SPL_EARLY_BSS=y
CONFIG_SPL_SYS_MMCSD_RAW_MODE=y
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x400
diff --git a/configs/am62x_beagleplay_r5_defconfig b/configs/am62x_beagleplay_r5_defconfig
index ce503000e4c..223a4ab49e1 100644
--- a/configs/am62x_beagleplay_r5_defconfig
+++ b/configs/am62x_beagleplay_r5_defconfig
@@ -41,9 +41,6 @@ CONFIG_SPL_BOARD_INIT=y
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL_SEPARATE_BSS=y
CONFIG_SPL_SYS_MALLOC=y
-CONFIG_SPL_HAS_CUSTOM_MALLOC_START=y
-CONFIG_SPL_CUSTOM_SYS_MALLOC_ADDR=0x84000000
-CONFIG_SPL_SYS_MALLOC_SIZE=0x1000000
CONFIG_SPL_EARLY_BSS=y
CONFIG_SPL_SYS_MMCSD_RAW_MODE=y
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x400
diff --git a/configs/am62x_evm_r5_defconfig b/configs/am62x_evm_r5_defconfig
index d42bdf1f074..90be95fd889 100644
--- a/configs/am62x_evm_r5_defconfig
+++ b/configs/am62x_evm_r5_defconfig
@@ -43,9 +43,6 @@ CONFIG_SPL_SYS_REPORT_STACK_F_USAGE=y
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL_SEPARATE_BSS=y
CONFIG_SPL_SYS_MALLOC=y
-CONFIG_SPL_HAS_CUSTOM_MALLOC_START=y
-CONFIG_SPL_CUSTOM_SYS_MALLOC_ADDR=0x84000000
-CONFIG_SPL_SYS_MALLOC_SIZE=0x1000000
CONFIG_SPL_EARLY_BSS=y
CONFIG_SPL_SYS_MMCSD_RAW_MODE=y
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x400
diff --git a/configs/am64x_evm_r5_defconfig b/configs/am64x_evm_r5_defconfig
index e1a748de5a9..860ce7bebc9 100644
--- a/configs/am64x_evm_r5_defconfig
+++ b/configs/am64x_evm_r5_defconfig
@@ -41,9 +41,6 @@ CONFIG_SPL_BOARD_INIT=y
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL_SEPARATE_BSS=y
CONFIG_SPL_SYS_MALLOC=y
-CONFIG_SPL_HAS_CUSTOM_MALLOC_START=y
-CONFIG_SPL_CUSTOM_SYS_MALLOC_ADDR=0x84000000
-CONFIG_SPL_SYS_MALLOC_SIZE=0x1000000
CONFIG_SPL_EARLY_BSS=y
CONFIG_SPL_SYS_MMCSD_RAW_MODE=y
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x800
diff --git a/configs/am65x_evm_r5_defconfig b/configs/am65x_evm_r5_defconfig
index 6733dcfdd85..510bf306d00 100644
--- a/configs/am65x_evm_r5_defconfig
+++ b/configs/am65x_evm_r5_defconfig
@@ -40,9 +40,6 @@ CONFIG_SPL_MAX_SIZE=0x58000
CONFIG_SPL_SYS_REPORT_STACK_F_USAGE=y
CONFIG_SPL_SEPARATE_BSS=y
CONFIG_SPL_SYS_MALLOC=y
-CONFIG_SPL_HAS_CUSTOM_MALLOC_START=y
-CONFIG_SPL_CUSTOM_SYS_MALLOC_ADDR=0x84000000
-CONFIG_SPL_SYS_MALLOC_SIZE=0x1000000
CONFIG_SPL_EARLY_BSS=y
CONFIG_SPL_SYS_MMCSD_RAW_MODE=y
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x400
diff --git a/configs/am65x_evm_r5_usbmsc_defconfig b/configs/am65x_evm_r5_usbmsc_defconfig
index 37b5c6a43e7..64d528351af 100644
--- a/configs/am65x_evm_r5_usbmsc_defconfig
+++ b/configs/am65x_evm_r5_usbmsc_defconfig
@@ -36,9 +36,6 @@ CONFIG_SPL_MAX_SIZE=0x58000
CONFIG_SPL_SYS_REPORT_STACK_F_USAGE=y
CONFIG_SPL_SEPARATE_BSS=y
CONFIG_SPL_SYS_MALLOC=y
-CONFIG_SPL_HAS_CUSTOM_MALLOC_START=y
-CONFIG_SPL_CUSTOM_SYS_MALLOC_ADDR=0x84000000
-CONFIG_SPL_SYS_MALLOC_SIZE=0x1000000
CONFIG_SPL_EARLY_BSS=y
CONFIG_SPL_DMA=y
CONFIG_SPL_ENV_SUPPORT=y
diff --git a/configs/am69_sk_r5_ethboot_defconfig b/configs/am69_sk_r5_ethboot_defconfig
index c85aa72cf04..62cd8f6cf84 100644
--- a/configs/am69_sk_r5_ethboot_defconfig
+++ b/configs/am69_sk_r5_ethboot_defconfig
@@ -11,5 +11,3 @@ CONFIG_SPL_NET_VCI_STRING="AM69 U-Boot R5 SPL"
CONFIG_TI_AM65_CPSW_NUSS=y
CONFIG_TI_I2C_BOARD_DETECT=y
CONFIG_NET_RANDOM_ETHADDR=y
-CONFIG_SPL_HAS_CUSTOM_MALLOC_START=y
-CONFIG_SPL_CUSTOM_SYS_MALLOC_ADDR=0x84000000
diff --git a/configs/j7200_evm_r5_defconfig b/configs/j7200_evm_r5_defconfig
index 09784f300db..cb87c43311b 100644
--- a/configs/j7200_evm_r5_defconfig
+++ b/configs/j7200_evm_r5_defconfig
@@ -40,9 +40,6 @@ CONFIG_SPL_MAX_SIZE=0xc0000
CONFIG_SPL_BOARD_INIT=y
CONFIG_SPL_SEPARATE_BSS=y
CONFIG_SPL_SYS_MALLOC=y
-CONFIG_SPL_HAS_CUSTOM_MALLOC_START=y
-CONFIG_SPL_CUSTOM_SYS_MALLOC_ADDR=0x84000000
-CONFIG_SPL_SYS_MALLOC_SIZE=0x1000000
CONFIG_SPL_EARLY_BSS=y
CONFIG_SPL_SYS_MMCSD_RAW_MODE=y
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x800
diff --git a/configs/j721e_beagleboneai64_r5_defconfig b/configs/j721e_beagleboneai64_r5_defconfig
index 50a9d95d7bf..7d607469c59 100644
--- a/configs/j721e_beagleboneai64_r5_defconfig
+++ b/configs/j721e_beagleboneai64_r5_defconfig
@@ -38,9 +38,6 @@ CONFIG_SPL_SIZE_LIMIT_SUBTRACT_MALLOC=y
CONFIG_SPL_MAX_SIZE=0xf59f0
CONFIG_SPL_SEPARATE_BSS=y
CONFIG_SPL_SYS_MALLOC=y
-CONFIG_SPL_HAS_CUSTOM_MALLOC_START=y
-CONFIG_SPL_CUSTOM_SYS_MALLOC_ADDR=0x84000000
-CONFIG_SPL_SYS_MALLOC_SIZE=0x1000000
CONFIG_SPL_EARLY_BSS=y
CONFIG_SPL_SYS_MMCSD_RAW_MODE=y
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x400
diff --git a/configs/j721e_evm_r5_defconfig b/configs/j721e_evm_r5_defconfig
index 52290722686..5ca742db90f 100644
--- a/configs/j721e_evm_r5_defconfig
+++ b/configs/j721e_evm_r5_defconfig
@@ -44,9 +44,6 @@ CONFIG_SPL_MAX_SIZE=0xf59f0
CONFIG_SPL_BOARD_INIT=y
CONFIG_SPL_SEPARATE_BSS=y
CONFIG_SPL_SYS_MALLOC=y
-CONFIG_SPL_HAS_CUSTOM_MALLOC_START=y
-CONFIG_SPL_CUSTOM_SYS_MALLOC_ADDR=0x84000000
-CONFIG_SPL_SYS_MALLOC_SIZE=0x1000000
CONFIG_SPL_EARLY_BSS=y
CONFIG_SPL_SYS_MMCSD_RAW_MODE=y
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x400
diff --git a/configs/j721s2_evm_r5_defconfig b/configs/j721s2_evm_r5_defconfig
index aaf8fd32879..6cf399ed67c 100644
--- a/configs/j721s2_evm_r5_defconfig
+++ b/configs/j721s2_evm_r5_defconfig
@@ -45,9 +45,6 @@ CONFIG_SPL_BOARD_INIT=y
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL_SEPARATE_BSS=y
CONFIG_SPL_SYS_MALLOC=y
-CONFIG_SPL_HAS_CUSTOM_MALLOC_START=y
-CONFIG_SPL_CUSTOM_SYS_MALLOC_ADDR=0x84000000
-CONFIG_SPL_SYS_MALLOC_SIZE=0x1000000
CONFIG_SPL_EARLY_BSS=y
CONFIG_SPL_SYS_MMCSD_RAW_MODE=y
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x400
diff --git a/configs/phycore_am62ax_r5_defconfig b/configs/phycore_am62ax_r5_defconfig
index 584a6415ca5..e310f247e74 100644
--- a/configs/phycore_am62ax_r5_defconfig
+++ b/configs/phycore_am62ax_r5_defconfig
@@ -39,8 +39,6 @@ CONFIG_SPL_SYS_REPORT_STACK_F_USAGE=y
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL_SEPARATE_BSS=y
CONFIG_SPL_SYS_MALLOC=y
-CONFIG_SPL_HAS_CUSTOM_MALLOC_START=y
-CONFIG_SPL_CUSTOM_SYS_MALLOC_ADDR=0x84000000
CONFIG_SPL_EARLY_BSS=y
CONFIG_SPL_SYS_MMCSD_RAW_MODE=y
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x400
diff --git a/configs/phycore_am62x_r5_defconfig b/configs/phycore_am62x_r5_defconfig
index 0368d4ef474..2ff3c54f42b 100644
--- a/configs/phycore_am62x_r5_defconfig
+++ b/configs/phycore_am62x_r5_defconfig
@@ -44,9 +44,6 @@ CONFIG_SPL_SYS_REPORT_STACK_F_USAGE=y
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL_SEPARATE_BSS=y
CONFIG_SPL_SYS_MALLOC=y
-CONFIG_SPL_HAS_CUSTOM_MALLOC_START=y
-CONFIG_SPL_CUSTOM_SYS_MALLOC_ADDR=0x84000000
-CONFIG_SPL_SYS_MALLOC_SIZE=0x1000000
CONFIG_SPL_EARLY_BSS=y
CONFIG_SPL_SYS_MMCSD_RAW_MODE=y
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x400
diff --git a/configs/phycore_am64x_r5_defconfig b/configs/phycore_am64x_r5_defconfig
index d8117b1c1ae..2f11947b02d 100644
--- a/configs/phycore_am64x_r5_defconfig
+++ b/configs/phycore_am64x_r5_defconfig
@@ -44,9 +44,6 @@ CONFIG_SPL_BOARD_INIT=y
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL_SEPARATE_BSS=y
CONFIG_SPL_SYS_MALLOC=y
-CONFIG_SPL_HAS_CUSTOM_MALLOC_START=y
-CONFIG_SPL_CUSTOM_SYS_MALLOC_ADDR=0x84000000
-CONFIG_SPL_SYS_MALLOC_SIZE=0x1000000
CONFIG_SPL_EARLY_BSS=y
CONFIG_SPL_SYS_MMCSD_RAW_MODE=y
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x400
diff --git a/configs/verdin-am62_r5_defconfig b/configs/verdin-am62_r5_defconfig
index efba857ad70..6194ab60693 100644
--- a/configs/verdin-am62_r5_defconfig
+++ b/configs/verdin-am62_r5_defconfig
@@ -37,9 +37,6 @@ CONFIG_SPL_SYS_REPORT_STACK_F_USAGE=y
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL_SEPARATE_BSS=y
CONFIG_SPL_SYS_MALLOC=y
-CONFIG_SPL_HAS_CUSTOM_MALLOC_START=y
-CONFIG_SPL_CUSTOM_SYS_MALLOC_ADDR=0x84000000
-CONFIG_SPL_SYS_MALLOC_SIZE=0x1000000
CONFIG_SPL_EARLY_BSS=y
CONFIG_SPL_SYS_MMCSD_RAW_MODE=y
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x400
diff --git a/configs/verdin-am62p_r5_defconfig b/configs/verdin-am62p_r5_defconfig
index a8b0e942b61..f5b093059ee 100644
--- a/configs/verdin-am62p_r5_defconfig
+++ b/configs/verdin-am62p_r5_defconfig
@@ -37,9 +37,6 @@ CONFIG_SPL_SYS_REPORT_STACK_F_USAGE=y
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL_SEPARATE_BSS=y
CONFIG_SPL_SYS_MALLOC=y
-CONFIG_SPL_HAS_CUSTOM_MALLOC_START=y
-CONFIG_SPL_CUSTOM_SYS_MALLOC_ADDR=0x84000000
-CONFIG_SPL_SYS_MALLOC_SIZE=0x1000000
CONFIG_SPL_EARLY_BSS=y
CONFIG_SPL_SYS_MMCSD_RAW_MODE=y
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x400
--
2.39.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 4/4] spl: Kconfig: k3: Set common default for SPL_LOAD_FIT(_ADDRESS)
2025-12-08 19:06 [PATCH 1/4] configs: Remove default malloc length for K3 R5 SPL Andrew Davis
2025-12-08 19:06 ` [PATCH 2/4] spl: Kconfig: k3: Increase malloc size after relocation for R5 Andrew Davis
2025-12-08 19:06 ` [PATCH 3/4] spl: Kconfig: k3: Set common default for CUSTOM_SYS_MALLOC items Andrew Davis
@ 2025-12-08 19:06 ` Andrew Davis
2025-12-09 14:15 ` Bryan Brattlof
2025-12-09 12:26 ` [PATCH 1/4] configs: Remove default malloc length for K3 R5 SPL Bryan Brattlof
2025-12-31 19:00 ` Tom Rini
4 siblings, 1 reply; 9+ messages in thread
From: Andrew Davis @ 2025-12-08 19:06 UTC (permalink / raw)
To: Neha Malcom Francis, Bryan Brattlof, Simon Glass, Tom Rini
Cc: u-boot, Andrew Davis
These are common for all K3 based boards. Add the common values as
defaults and remove from each board defconfig
Signed-off-by: Andrew Davis <afd@ti.com>
---
arch/arm/Kconfig | 1 +
boot/Kconfig | 2 ++
configs/am62ax_evm_a53_defconfig | 2 --
configs/am62ax_evm_r5_defconfig | 2 --
configs/am62px_evm_a53_defconfig | 2 --
configs/am62px_evm_r5_defconfig | 2 --
configs/am62x_beagleplay_a53_defconfig | 2 --
configs/am62x_beagleplay_r5_defconfig | 2 --
configs/am62x_evm_a53_defconfig | 2 --
configs/am62x_evm_r5_defconfig | 2 --
configs/am64x_evm_a53_defconfig | 2 --
configs/am64x_evm_r5_defconfig | 2 --
configs/am65x_evm_a53_defconfig | 2 --
configs/am65x_evm_r5_defconfig | 1 -
configs/am65x_evm_r5_usbdfu_defconfig | 1 -
configs/am65x_evm_r5_usbmsc_defconfig | 1 -
configs/am67a_beagley_ai_a53_defconfig | 2 --
configs/am67a_beagley_ai_r5_defconfig | 2 --
configs/j7200_evm_a72_defconfig | 2 --
configs/j7200_evm_r5_defconfig | 2 --
configs/j721e_beagleboneai64_a72_defconfig | 2 --
configs/j721e_beagleboneai64_r5_defconfig | 2 --
configs/j721e_evm_a72_defconfig | 2 --
configs/j721e_evm_r5_defconfig | 2 --
configs/j721s2_evm_a72_defconfig | 2 --
configs/j721s2_evm_r5_defconfig | 2 --
configs/j722s_evm_a53_defconfig | 2 --
configs/j722s_evm_r5_defconfig | 2 --
configs/j784s4_evm_a72_defconfig | 2 --
configs/j784s4_evm_r5_defconfig | 2 --
configs/phycore_am62ax_a53_defconfig | 2 --
configs/phycore_am62x_a53_defconfig | 2 --
configs/phycore_am64x_a53_defconfig | 2 --
configs/verdin-am62_a53_defconfig | 2 --
configs/verdin-am62p_a53_defconfig | 2 --
35 files changed, 3 insertions(+), 63 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 3db5474a05b..0485fe78e10 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -835,6 +835,7 @@ config ARCH_K3
select FIT_SIGNATURE if ARM64
select DMA_ADDR_T_64BIT
select LTO
+ select SPL_LOAD_FIT if SPL
imply TI_SECURE_DEVICE
imply DM_RNG if ARM64
imply TEE if ARM64
diff --git a/boot/Kconfig b/boot/Kconfig
index 85f4d468069..14c59ef72f9 100644
--- a/boot/Kconfig
+++ b/boot/Kconfig
@@ -275,6 +275,8 @@ config SPL_LOAD_FIT_ADDRESS
hex "load address of fit image"
depends on SPL_LOAD_FIT
default 0x44000000 if ARCH_IMX8M
+ default 0x81000000 if ARCH_K3 && ARM64
+ default 0x80080000 if ARCH_K3 && CPU_V7R
default 0x0
help
Specify the load address of the fit image that will be loaded
diff --git a/configs/am62ax_evm_a53_defconfig b/configs/am62ax_evm_a53_defconfig
index 3667a0656ed..167ba7ff8df 100644
--- a/configs/am62ax_evm_a53_defconfig
+++ b/configs/am62ax_evm_a53_defconfig
@@ -23,8 +23,6 @@ CONFIG_SPL_STACK_R=y
CONFIG_SPL_FS_FAT=y
CONFIG_SPL_LIBDISK_SUPPORT=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_SPL_LOAD_FIT=y
-CONFIG_SPL_LOAD_FIT_ADDRESS=0x81000000
CONFIG_BOOTSTD_FULL=y
CONFIG_BOOTCOMMAND="run envboot; bootflow scan -lb"
CONFIG_BOARD_LATE_INIT=y
diff --git a/configs/am62ax_evm_r5_defconfig b/configs/am62ax_evm_r5_defconfig
index 2586f6cd648..31d901a7c65 100644
--- a/configs/am62ax_evm_r5_defconfig
+++ b/configs/am62ax_evm_r5_defconfig
@@ -24,8 +24,6 @@ CONFIG_SPL_SIZE_LIMIT=0x3A7F0
CONFIG_SPL_SIZE_LIMIT_PROVIDE_STACK=0x3500
CONFIG_SPL_FS_FAT=y
CONFIG_SPL_LIBDISK_SUPPORT=y
-CONFIG_SPL_LOAD_FIT=y
-CONFIG_SPL_LOAD_FIT_ADDRESS=0x80080000
# CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_BOARD_INIT is not set
CONFIG_SPL_SIZE_LIMIT_SUBTRACT_GD=y
diff --git a/configs/am62px_evm_a53_defconfig b/configs/am62px_evm_a53_defconfig
index fa857e51137..aa241a73c3f 100644
--- a/configs/am62px_evm_a53_defconfig
+++ b/configs/am62px_evm_a53_defconfig
@@ -29,8 +29,6 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_SPL_LOAD_FIT=y
-CONFIG_SPL_LOAD_FIT_ADDRESS=0x81000000
CONFIG_BOOTSTD_FULL=y
CONFIG_BOOTCOMMAND="run envboot; bootflow scan -lb"
CONFIG_BOARD_LATE_INIT=y
diff --git a/configs/am62px_evm_r5_defconfig b/configs/am62px_evm_r5_defconfig
index c9592d7b6c4..f898e1a4ebc 100644
--- a/configs/am62px_evm_r5_defconfig
+++ b/configs/am62px_evm_r5_defconfig
@@ -29,8 +29,6 @@ CONFIG_SPL_FS_FAT=y
CONFIG_SPL_LIBDISK_SUPPORT=y
CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI=y
-CONFIG_SPL_LOAD_FIT=y
-CONFIG_SPL_LOAD_FIT_ADDRESS=0x80080000
# CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_BOARD_INIT is not set
CONFIG_SPL_SIZE_LIMIT_SUBTRACT_GD=y
diff --git a/configs/am62x_beagleplay_a53_defconfig b/configs/am62x_beagleplay_a53_defconfig
index 05853317fea..c9bc7cd8d39 100644
--- a/configs/am62x_beagleplay_a53_defconfig
+++ b/configs/am62x_beagleplay_a53_defconfig
@@ -26,8 +26,6 @@ CONFIG_SPL_FS_FAT=y
CONFIG_SPL_LIBDISK_SUPPORT=y
# CONFIG_PSCI_RESET is not set
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_SPL_LOAD_FIT=y
-CONFIG_SPL_LOAD_FIT_ADDRESS=0x81000000
CONFIG_BOOTSTD_FULL=y
CONFIG_AUTOBOOT_KEYED=y
CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
diff --git a/configs/am62x_beagleplay_r5_defconfig b/configs/am62x_beagleplay_r5_defconfig
index 223a4ab49e1..a25646633ed 100644
--- a/configs/am62x_beagleplay_r5_defconfig
+++ b/configs/am62x_beagleplay_r5_defconfig
@@ -28,8 +28,6 @@ CONFIG_SPL_SIZE_LIMIT_PROVIDE_STACK=0x3500
CONFIG_SPL_FS_FAT=y
CONFIG_SPL_LIBDISK_SUPPORT=y
CONFIG_SPL_SPI=y
-CONFIG_SPL_LOAD_FIT=y
-CONFIG_SPL_LOAD_FIT_ADDRESS=0x80080000
# CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_BOARD_INIT is not set
CONFIG_SPL_SIZE_LIMIT_SUBTRACT_GD=y
diff --git a/configs/am62x_evm_a53_defconfig b/configs/am62x_evm_a53_defconfig
index 4da668396d0..281fa3fea15 100644
--- a/configs/am62x_evm_a53_defconfig
+++ b/configs/am62x_evm_a53_defconfig
@@ -32,8 +32,6 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI=y
# CONFIG_PSCI_RESET is not set
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_SPL_LOAD_FIT=y
-CONFIG_SPL_LOAD_FIT_ADDRESS=0x81000000
CONFIG_BOOTSTD_FULL=y
CONFIG_BOOTCOMMAND="run findfdt; run envboot; bootflow scan -lb"
CONFIG_BOARD_LATE_INIT=y
diff --git a/configs/am62x_evm_r5_defconfig b/configs/am62x_evm_r5_defconfig
index 90be95fd889..22185cee594 100644
--- a/configs/am62x_evm_r5_defconfig
+++ b/configs/am62x_evm_r5_defconfig
@@ -31,8 +31,6 @@ CONFIG_SPL_FS_FAT=y
CONFIG_SPL_LIBDISK_SUPPORT=y
CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI=y
-CONFIG_SPL_LOAD_FIT=y
-CONFIG_SPL_LOAD_FIT_ADDRESS=0x80080000
# CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_BOARD_INIT is not set
CONFIG_SPL_SIZE_LIMIT_SUBTRACT_GD=y
diff --git a/configs/am64x_evm_a53_defconfig b/configs/am64x_evm_a53_defconfig
index ae261f2fa01..9bd95b82a84 100644
--- a/configs/am64x_evm_a53_defconfig
+++ b/configs/am64x_evm_a53_defconfig
@@ -33,8 +33,6 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI=y
CONFIG_PCI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_SPL_LOAD_FIT=y
-CONFIG_SPL_LOAD_FIT_ADDRESS=0x81000000
CONFIG_BOOTSTD_FULL=y
CONFIG_BOOTCOMMAND="run envboot; bootflow scan -lb"
# CONFIG_BOARD_INIT is not set
diff --git a/configs/am64x_evm_r5_defconfig b/configs/am64x_evm_r5_defconfig
index 860ce7bebc9..6a5190e5c68 100644
--- a/configs/am64x_evm_r5_defconfig
+++ b/configs/am64x_evm_r5_defconfig
@@ -29,8 +29,6 @@ CONFIG_SPL_FS_FAT=y
CONFIG_SPL_LIBDISK_SUPPORT=y
CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI=y
-CONFIG_SPL_LOAD_FIT=y
-CONFIG_SPL_LOAD_FIT_ADDRESS=0x80080000
# CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_BOARD_INIT is not set
CONFIG_SPL_SIZE_LIMIT_SUBTRACT_GD=y
diff --git a/configs/am65x_evm_a53_defconfig b/configs/am65x_evm_a53_defconfig
index d1fe27702cb..0012a0f41df 100644
--- a/configs/am65x_evm_a53_defconfig
+++ b/configs/am65x_evm_a53_defconfig
@@ -31,8 +31,6 @@ CONFIG_SPL_SPI=y
# CONFIG_PSCI_RESET is not set
CONFIG_PCI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_SPL_LOAD_FIT=y
-CONFIG_SPL_LOAD_FIT_ADDRESS=0x81000000
CONFIG_SPL_LOAD_FIT_APPLY_OVERLAY=y
CONFIG_BOOTSTD_FULL=y
CONFIG_BOOTSTD_BOOTCOMMAND=y
diff --git a/configs/am65x_evm_r5_defconfig b/configs/am65x_evm_r5_defconfig
index 510bf306d00..560712a6096 100644
--- a/configs/am65x_evm_r5_defconfig
+++ b/configs/am65x_evm_r5_defconfig
@@ -30,7 +30,6 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_SPL_LOAD_FIT=y
CONFIG_USE_BOOTCOMMAND=y
# CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_BOARD_INIT is not set
diff --git a/configs/am65x_evm_r5_usbdfu_defconfig b/configs/am65x_evm_r5_usbdfu_defconfig
index f9161f1fe11..988ce22480c 100644
--- a/configs/am65x_evm_r5_usbdfu_defconfig
+++ b/configs/am65x_evm_r5_usbdfu_defconfig
@@ -14,7 +14,6 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x41c7effc
CONFIG_ENV_SIZE=0x20000
CONFIG_DM_GPIO=y
CONFIG_DEFAULT_DEVICE_TREE="k3-am654-r5-base-board"
-CONFIG_SPL_LOAD_FIT_ADDRESS=0x80080000
CONFIG_SPL_ENV_SUPPORT=y
CONFIG_CMD_DFU=y
CONFIG_SYSCON=y
diff --git a/configs/am65x_evm_r5_usbmsc_defconfig b/configs/am65x_evm_r5_usbmsc_defconfig
index 64d528351af..377124c9af6 100644
--- a/configs/am65x_evm_r5_usbmsc_defconfig
+++ b/configs/am65x_evm_r5_usbmsc_defconfig
@@ -26,7 +26,6 @@ CONFIG_SPL_SIZE_LIMIT_PROVIDE_STACK=0x2000
CONFIG_SPL_FS_FAT=y
CONFIG_SPL_LIBDISK_SUPPORT=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_SPL_LOAD_FIT=y
CONFIG_USE_BOOTCOMMAND=y
# CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_BOARD_INIT is not set
diff --git a/configs/am67a_beagley_ai_a53_defconfig b/configs/am67a_beagley_ai_a53_defconfig
index 2fc5d904fbf..db6a2ed4514 100644
--- a/configs/am67a_beagley_ai_a53_defconfig
+++ b/configs/am67a_beagley_ai_a53_defconfig
@@ -24,8 +24,6 @@ CONFIG_SPL_STACK_R=y
CONFIG_SPL_FS_FAT=y
CONFIG_SPL_LIBDISK_SUPPORT=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_SPL_LOAD_FIT=y
-CONFIG_SPL_LOAD_FIT_ADDRESS=0x81000000
CONFIG_BOOTSTD_FULL=y
CONFIG_AUTOBOOT_KEYED=y
CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
diff --git a/configs/am67a_beagley_ai_r5_defconfig b/configs/am67a_beagley_ai_r5_defconfig
index 00c6ba6e2b5..ee3764bdc69 100644
--- a/configs/am67a_beagley_ai_r5_defconfig
+++ b/configs/am67a_beagley_ai_r5_defconfig
@@ -27,8 +27,6 @@ CONFIG_SPL_FS_FAT=y
CONFIG_SPL_LIBDISK_SUPPORT=y
CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI=y
-CONFIG_SPL_LOAD_FIT=y
-CONFIG_SPL_LOAD_FIT_ADDRESS=0x80080000
# CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_BOARD_INIT is not set
CONFIG_SPL_SIZE_LIMIT_SUBTRACT_GD=y
diff --git a/configs/j7200_evm_a72_defconfig b/configs/j7200_evm_a72_defconfig
index 826a2db0805..63c1ac67343 100644
--- a/configs/j7200_evm_a72_defconfig
+++ b/configs/j7200_evm_a72_defconfig
@@ -32,8 +32,6 @@ CONFIG_SPL_SPI=y
# CONFIG_PSCI_RESET is not set
CONFIG_PCI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_SPL_LOAD_FIT=y
-CONFIG_SPL_LOAD_FIT_ADDRESS=0x81000000
CONFIG_BOOTSTD_FULL=y
CONFIG_OF_BOARD_SETUP=y
CONFIG_OF_SYSTEM_SETUP=y
diff --git a/configs/j7200_evm_r5_defconfig b/configs/j7200_evm_r5_defconfig
index cb87c43311b..893aaafaa9c 100644
--- a/configs/j7200_evm_r5_defconfig
+++ b/configs/j7200_evm_r5_defconfig
@@ -31,8 +31,6 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_SPL_LOAD_FIT=y
-CONFIG_SPL_LOAD_FIT_ADDRESS=0x80080000
CONFIG_USE_BOOTCOMMAND=y
# CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_BOARD_INIT is not set
diff --git a/configs/j721e_beagleboneai64_a72_defconfig b/configs/j721e_beagleboneai64_a72_defconfig
index e7f708a60c5..dc76504eb83 100644
--- a/configs/j721e_beagleboneai64_a72_defconfig
+++ b/configs/j721e_beagleboneai64_a72_defconfig
@@ -27,8 +27,6 @@ CONFIG_SPL_FS_FAT=y
CONFIG_SPL_LIBDISK_SUPPORT=y
# CONFIG_PSCI_RESET is not set
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_SPL_LOAD_FIT=y
-CONFIG_SPL_LOAD_FIT_ADDRESS=0x81000000
CONFIG_BOOTSTD_FULL=y
CONFIG_AUTOBOOT_KEYED=y
CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
diff --git a/configs/j721e_beagleboneai64_r5_defconfig b/configs/j721e_beagleboneai64_r5_defconfig
index 7d607469c59..3e2c55b7198 100644
--- a/configs/j721e_beagleboneai64_r5_defconfig
+++ b/configs/j721e_beagleboneai64_r5_defconfig
@@ -28,8 +28,6 @@ CONFIG_SPL_SIZE_LIMIT_PROVIDE_STACK=0x4000
CONFIG_SPL_FS_FAT=y
CONFIG_SPL_LIBDISK_SUPPORT=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_SPL_LOAD_FIT=y
-CONFIG_SPL_LOAD_FIT_ADDRESS=0x80080000
CONFIG_USE_BOOTCOMMAND=y
# CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_BOARD_INIT is not set
diff --git a/configs/j721e_evm_a72_defconfig b/configs/j721e_evm_a72_defconfig
index 42e1dd21d0b..c862e9a4880 100644
--- a/configs/j721e_evm_a72_defconfig
+++ b/configs/j721e_evm_a72_defconfig
@@ -29,8 +29,6 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI=y
# CONFIG_PSCI_RESET is not set
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_SPL_LOAD_FIT=y
-CONFIG_SPL_LOAD_FIT_ADDRESS=0x81000000
CONFIG_BOOTSTD_FULL=y
CONFIG_OF_BOARD_SETUP=y
CONFIG_OF_SYSTEM_SETUP=y
diff --git a/configs/j721e_evm_r5_defconfig b/configs/j721e_evm_r5_defconfig
index 5ca742db90f..4fd20da017c 100644
--- a/configs/j721e_evm_r5_defconfig
+++ b/configs/j721e_evm_r5_defconfig
@@ -32,8 +32,6 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_SPL_LOAD_FIT=y
-CONFIG_SPL_LOAD_FIT_ADDRESS=0x80080000
CONFIG_OF_BOARD_SETUP=y
CONFIG_USE_BOOTCOMMAND=y
# CONFIG_DISPLAY_CPUINFO is not set
diff --git a/configs/j721s2_evm_a72_defconfig b/configs/j721s2_evm_a72_defconfig
index e373a9f05b7..5c0d9f9b377 100644
--- a/configs/j721s2_evm_a72_defconfig
+++ b/configs/j721s2_evm_a72_defconfig
@@ -30,8 +30,6 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI=y
# CONFIG_PSCI_RESET is not set
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_SPL_LOAD_FIT=y
-CONFIG_SPL_LOAD_FIT_ADDRESS=0x81000000
CONFIG_BOOTSTD_FULL=y
CONFIG_OF_SYSTEM_SETUP=y
CONFIG_BOOTCOMMAND="run envboot; bootflow scan -lb"
diff --git a/configs/j721s2_evm_r5_defconfig b/configs/j721s2_evm_r5_defconfig
index 6cf399ed67c..96e1d397c8a 100644
--- a/configs/j721s2_evm_r5_defconfig
+++ b/configs/j721s2_evm_r5_defconfig
@@ -32,8 +32,6 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_SPL_LOAD_FIT=y
-CONFIG_SPL_LOAD_FIT_ADDRESS=0x80080000
CONFIG_USE_BOOTCOMMAND=y
# CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_BOARD_INIT is not set
diff --git a/configs/j722s_evm_a53_defconfig b/configs/j722s_evm_a53_defconfig
index 8639f462c12..74a67da9033 100644
--- a/configs/j722s_evm_a53_defconfig
+++ b/configs/j722s_evm_a53_defconfig
@@ -28,8 +28,6 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_SPL_LOAD_FIT=y
-CONFIG_SPL_LOAD_FIT_ADDRESS=0x81000000
CONFIG_BOOTSTD_FULL=y
CONFIG_BOOTCOMMAND="run envboot; bootflow scan -lb"
# CONFIG_BOARD_INIT is not set
diff --git a/configs/j722s_evm_r5_defconfig b/configs/j722s_evm_r5_defconfig
index 8e2741c8d42..7ea05f9fee2 100644
--- a/configs/j722s_evm_r5_defconfig
+++ b/configs/j722s_evm_r5_defconfig
@@ -30,8 +30,6 @@ CONFIG_SPL_FS_FAT=y
CONFIG_SPL_LIBDISK_SUPPORT=y
CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI=y
-CONFIG_SPL_LOAD_FIT=y
-CONFIG_SPL_LOAD_FIT_ADDRESS=0x80080000
# CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_BOARD_INIT is not set
CONFIG_SPL_SIZE_LIMIT_SUBTRACT_GD=y
diff --git a/configs/j784s4_evm_a72_defconfig b/configs/j784s4_evm_a72_defconfig
index fc7acbae694..9282fea66b8 100644
--- a/configs/j784s4_evm_a72_defconfig
+++ b/configs/j784s4_evm_a72_defconfig
@@ -29,8 +29,6 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI=y
CONFIG_EFI_SET_TIME=y
-CONFIG_SPL_LOAD_FIT=y
-CONFIG_SPL_LOAD_FIT_ADDRESS=0x81000000
CONFIG_BOOTSTD_FULL=y
CONFIG_BOOTCOMMAND="run envboot; bootflow scan -lb"
CONFIG_LOGLEVEL=7
diff --git a/configs/j784s4_evm_r5_defconfig b/configs/j784s4_evm_r5_defconfig
index cc340a2fe76..25ab6f17d17 100644
--- a/configs/j784s4_evm_r5_defconfig
+++ b/configs/j784s4_evm_r5_defconfig
@@ -32,8 +32,6 @@ CONFIG_SPL_FS_FAT=y
CONFIG_SPL_LIBDISK_SUPPORT=y
CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI=y
-CONFIG_SPL_LOAD_FIT=y
-CONFIG_SPL_LOAD_FIT_ADDRESS=0x80080000
CONFIG_USE_BOOTCOMMAND=y
# CONFIG_BOARD_INIT is not set
CONFIG_SPL_SIZE_LIMIT_SUBTRACT_GD=y
diff --git a/configs/phycore_am62ax_a53_defconfig b/configs/phycore_am62ax_a53_defconfig
index 5f185891bf2..ab50545d307 100644
--- a/configs/phycore_am62ax_a53_defconfig
+++ b/configs/phycore_am62ax_a53_defconfig
@@ -35,8 +35,6 @@ CONFIG_SPL_SPI=y
CONFIG_EFI_SET_TIME=y
CONFIG_EFI_CAPSULE_ON_DISK=y
CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y
-CONFIG_SPL_LOAD_FIT=y
-CONFIG_SPL_LOAD_FIT_ADDRESS=0x81000000
CONFIG_BOOTSTD_FULL=y
CONFIG_OF_BOARD_SETUP=y
CONFIG_BOOTCOMMAND="run start_watchdog; bootflow scan -lb; run ${boot}boot"
diff --git a/configs/phycore_am62x_a53_defconfig b/configs/phycore_am62x_a53_defconfig
index b89d9c97789..fa5c4466791 100644
--- a/configs/phycore_am62x_a53_defconfig
+++ b/configs/phycore_am62x_a53_defconfig
@@ -39,8 +39,6 @@ CONFIG_SPL_SPI=y
CONFIG_EFI_SET_TIME=y
CONFIG_EFI_CAPSULE_ON_DISK=y
CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y
-CONFIG_SPL_LOAD_FIT=y
-CONFIG_SPL_LOAD_FIT_ADDRESS=0x81000000
CONFIG_BOOTSTD_FULL=y
CONFIG_OF_BOARD_SETUP=y
CONFIG_BOOTCOMMAND="run start_watchdog; bootflow scan -lb; run ${boot}boot"
diff --git a/configs/phycore_am64x_a53_defconfig b/configs/phycore_am64x_a53_defconfig
index 9d6aa9c308c..f5e97e2d730 100644
--- a/configs/phycore_am64x_a53_defconfig
+++ b/configs/phycore_am64x_a53_defconfig
@@ -35,8 +35,6 @@ CONFIG_SPL_SPI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_EFI_CAPSULE_ON_DISK=y
CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y
-CONFIG_SPL_LOAD_FIT=y
-CONFIG_SPL_LOAD_FIT_ADDRESS=0x81000000
CONFIG_BOOTSTD_FULL=y
CONFIG_OF_BOARD_SETUP=y
CONFIG_BOOTCOMMAND="run start_watchdog; bootflow scan -lb; run ${boot}boot"
diff --git a/configs/verdin-am62_a53_defconfig b/configs/verdin-am62_a53_defconfig
index 31835770d90..f04858099da 100644
--- a/configs/verdin-am62_a53_defconfig
+++ b/configs/verdin-am62_a53_defconfig
@@ -31,8 +31,6 @@ CONFIG_SYS_MEMTEST_START=0x80000000
CONFIG_SYS_MEMTEST_END=0xB0000000
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_FIT_VERBOSE=y
-CONFIG_SPL_LOAD_FIT=y
-CONFIG_SPL_LOAD_FIT_ADDRESS=0x81000000
CONFIG_DISTRO_DEFAULTS=y
CONFIG_BOOTDELAY=1
CONFIG_USE_PREBOOT=y
diff --git a/configs/verdin-am62p_a53_defconfig b/configs/verdin-am62p_a53_defconfig
index dd032427987..3dbffa78662 100644
--- a/configs/verdin-am62p_a53_defconfig
+++ b/configs/verdin-am62p_a53_defconfig
@@ -30,8 +30,6 @@ CONFIG_SYS_MEMTEST_START=0x80000000
CONFIG_SYS_MEMTEST_END=0xB0000000
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_FIT_VERBOSE=y
-CONFIG_SPL_LOAD_FIT=y
-CONFIG_SPL_LOAD_FIT_ADDRESS=0x81000000
CONFIG_BOOTSTD_FULL=y
CONFIG_LEGACY_IMAGE_FORMAT=y
CONFIG_BOOTDELAY=1
--
2.39.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 1/4] configs: Remove default malloc length for K3 R5 SPL
2025-12-08 19:06 [PATCH 1/4] configs: Remove default malloc length for K3 R5 SPL Andrew Davis
` (2 preceding siblings ...)
2025-12-08 19:06 ` [PATCH 4/4] spl: Kconfig: k3: Set common default for SPL_LOAD_FIT(_ADDRESS) Andrew Davis
@ 2025-12-09 12:26 ` Bryan Brattlof
2025-12-31 19:00 ` Tom Rini
4 siblings, 0 replies; 9+ messages in thread
From: Bryan Brattlof @ 2025-12-09 12:26 UTC (permalink / raw)
To: Andrew Davis; +Cc: Neha Malcom Francis, Simon Glass, Tom Rini, u-boot
On December 8, 2025 thus sayeth Andrew Davis:
> These values are already the default, remove them from these defconfigs.
>
> Signed-off-by: Andrew Davis <afd@ti.com>
> ---
> configs/am62x_evm_r5_ethboot_defconfig | 1 -
> configs/j722s_evm_r5_ethboot_defconfig | 1 -
> configs/phycore_am62ax_r5_ethboot_defconfig | 1 -
> configs/phycore_am62x_r5_ethboot_defconfig | 1 -
> 4 files changed, 4 deletions(-)
>
Nice!
Yeah the preprocessor step these need confuses savedefconfig which is
probably why these never get the syncs like the base defconfigs. I'll
make a note about this issue.
Reviewed-by: Bryan Brattlof <bb@ti.com>
~Bryan
> diff --git a/configs/am62x_evm_r5_ethboot_defconfig b/configs/am62x_evm_r5_ethboot_defconfig
> index 5ad4d3f0e5c..c97c4e28fbe 100644
> --- a/configs/am62x_evm_r5_ethboot_defconfig
> +++ b/configs/am62x_evm_r5_ethboot_defconfig
> @@ -8,7 +8,6 @@ CONFIG_DEFAULT_DEVICEC_TREE="k3-am625-r5-sk"
> CONFIG_SPL_GPIO=y
> CONFIG_SPL_MMC=n
> CONFIG_SPL_BOARD_INIT=y
> -CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x200000
> CONFIG_SPL_BSS_MAX_SIZE=0x3100
> CONFIG_SPL_DMA=y
> CONFIG_SPL_ENV_SUPPORT=y
> diff --git a/configs/j722s_evm_r5_ethboot_defconfig b/configs/j722s_evm_r5_ethboot_defconfig
> index fd58485bff2..68237f7d8c3 100644
> --- a/configs/j722s_evm_r5_ethboot_defconfig
> +++ b/configs/j722s_evm_r5_ethboot_defconfig
> @@ -8,7 +8,6 @@ CONFIG_DEFAULT_DEVICE_TREE="k3-j722s-r5-evm"
> CONFIG_NET=y
> CONFIG_SPL_DRIVERS_MISC=y
> CONFIG_SPL_BOARD_INIT=y
> -CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x200000
> CONFIG_SPL_DMA=y
> CONFIG_SPL_ENV_SUPPORT=y
> CONFIG_SPL_ETH=y
> diff --git a/configs/phycore_am62ax_r5_ethboot_defconfig b/configs/phycore_am62ax_r5_ethboot_defconfig
> index 81a7f5b0784..526d15a0dc5 100644
> --- a/configs/phycore_am62ax_r5_ethboot_defconfig
> +++ b/configs/phycore_am62ax_r5_ethboot_defconfig
> @@ -8,7 +8,6 @@ CONFIG_DEFAULT_DEVICE_TREE="k3-am62a7-r5-phycore-som-2gb"
>
> CONFIG_SPL_GPIO=y
> CONFIG_SPL_BOARD_INIT=y
> -CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x200000
> CONFIG_SPL_BSS_MAX_SIZE=0x3100
> CONFIG_SPL_DMA=y
> CONFIG_SPL_ENV_SUPPORT=y
> diff --git a/configs/phycore_am62x_r5_ethboot_defconfig b/configs/phycore_am62x_r5_ethboot_defconfig
> index 3bc426821e9..92dd0be647e 100644
> --- a/configs/phycore_am62x_r5_ethboot_defconfig
> +++ b/configs/phycore_am62x_r5_ethboot_defconfig
> @@ -8,7 +8,6 @@ CONFIG_DEFAULT_DEVICE_TREE="k3-am625-r5-phycore-som-2gb"
>
> CONFIG_SPL_GPIO=y
> CONFIG_SPL_BOARD_INIT=y
> -CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x200000
> CONFIG_SPL_DMA=y
> CONFIG_SPL_ENV_SUPPORT=y
> CONFIG_SPL_ETH=y
> --
> 2.39.2
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 2/4] spl: Kconfig: k3: Increase malloc size after relocation for R5
2025-12-08 19:06 ` [PATCH 2/4] spl: Kconfig: k3: Increase malloc size after relocation for R5 Andrew Davis
@ 2025-12-09 14:11 ` Bryan Brattlof
0 siblings, 0 replies; 9+ messages in thread
From: Bryan Brattlof @ 2025-12-09 14:11 UTC (permalink / raw)
To: Andrew Davis; +Cc: Neha Malcom Francis, Simon Glass, Tom Rini, u-boot
[-- Attachment #1: Type: text/plain, Size: 477 bytes --]
On December 8, 2025 thus sayeth Andrew Davis:
> Seems the "generous 2MB space" is no longer enough for SPL on some K3 R5
> platforms so let's increase this to 4MB. That matches what we give to
> ARM64 SPL, so combine these.
>
> Signed-off-by: Andrew Davis <afd@ti.com>
> ---
> common/spl/Kconfig | 3 +--
> configs/am64x_evm_r5_defconfig | 1 -
> 2 files changed, 1 insertion(+), 3 deletions(-)
>
Reviewed-by: Bryan Brattlof <bb@ti.com>
~Bryan
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 3/4] spl: Kconfig: k3: Set common default for CUSTOM_SYS_MALLOC items
2025-12-08 19:06 ` [PATCH 3/4] spl: Kconfig: k3: Set common default for CUSTOM_SYS_MALLOC items Andrew Davis
@ 2025-12-09 14:12 ` Bryan Brattlof
0 siblings, 0 replies; 9+ messages in thread
From: Bryan Brattlof @ 2025-12-09 14:12 UTC (permalink / raw)
To: Andrew Davis; +Cc: Neha Malcom Francis, Simon Glass, Tom Rini, u-boot
[-- Attachment #1: Type: text/plain, Size: 1341 bytes --]
On December 8, 2025 thus sayeth Andrew Davis:
> These are common for all K3 based boards. Add the common values as
> defaults and remove from each board defconfig.
>
> Signed-off-by: Andrew Davis <afd@ti.com>
> ---
> common/spl/Kconfig | 3 +++
> configs/am62ax_evm_r5_defconfig | 2 --
> configs/am62x_beagleplay_r5_defconfig | 3 ---
> configs/am62x_evm_r5_defconfig | 3 ---
> configs/am64x_evm_r5_defconfig | 3 ---
> configs/am65x_evm_r5_defconfig | 3 ---
> configs/am65x_evm_r5_usbmsc_defconfig | 3 ---
> configs/am69_sk_r5_ethboot_defconfig | 2 --
> configs/j7200_evm_r5_defconfig | 3 ---
> configs/j721e_beagleboneai64_r5_defconfig | 3 ---
> configs/j721e_evm_r5_defconfig | 3 ---
> configs/j721s2_evm_r5_defconfig | 3 ---
> configs/phycore_am62ax_r5_defconfig | 2 --
> configs/phycore_am62x_r5_defconfig | 3 ---
> configs/phycore_am64x_r5_defconfig | 3 ---
> configs/verdin-am62_r5_defconfig | 3 ---
> configs/verdin-am62p_r5_defconfig | 3 ---
> 17 files changed, 3 insertions(+), 45 deletions(-)
>
Makes sense and works for the TI reference and the beagle boards I have.
Thanks Andrew
Reviewed-by: Bryan Brattlof <bb@ti.com>
~Bryan
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 4/4] spl: Kconfig: k3: Set common default for SPL_LOAD_FIT(_ADDRESS)
2025-12-08 19:06 ` [PATCH 4/4] spl: Kconfig: k3: Set common default for SPL_LOAD_FIT(_ADDRESS) Andrew Davis
@ 2025-12-09 14:15 ` Bryan Brattlof
0 siblings, 0 replies; 9+ messages in thread
From: Bryan Brattlof @ 2025-12-09 14:15 UTC (permalink / raw)
To: Andrew Davis; +Cc: Neha Malcom Francis, Simon Glass, Tom Rini, u-boot
[-- Attachment #1: Type: text/plain, Size: 2336 bytes --]
On December 8, 2025 thus sayeth Andrew Davis:
> These are common for all K3 based boards. Add the common values as
> defaults and remove from each board defconfig
>
> Signed-off-by: Andrew Davis <afd@ti.com>
> ---
> arch/arm/Kconfig | 1 +
> boot/Kconfig | 2 ++
> configs/am62ax_evm_a53_defconfig | 2 --
> configs/am62ax_evm_r5_defconfig | 2 --
> configs/am62px_evm_a53_defconfig | 2 --
> configs/am62px_evm_r5_defconfig | 2 --
> configs/am62x_beagleplay_a53_defconfig | 2 --
> configs/am62x_beagleplay_r5_defconfig | 2 --
> configs/am62x_evm_a53_defconfig | 2 --
> configs/am62x_evm_r5_defconfig | 2 --
> configs/am64x_evm_a53_defconfig | 2 --
> configs/am64x_evm_r5_defconfig | 2 --
> configs/am65x_evm_a53_defconfig | 2 --
> configs/am65x_evm_r5_defconfig | 1 -
> configs/am65x_evm_r5_usbdfu_defconfig | 1 -
> configs/am65x_evm_r5_usbmsc_defconfig | 1 -
> configs/am67a_beagley_ai_a53_defconfig | 2 --
> configs/am67a_beagley_ai_r5_defconfig | 2 --
> configs/j7200_evm_a72_defconfig | 2 --
> configs/j7200_evm_r5_defconfig | 2 --
> configs/j721e_beagleboneai64_a72_defconfig | 2 --
> configs/j721e_beagleboneai64_r5_defconfig | 2 --
> configs/j721e_evm_a72_defconfig | 2 --
> configs/j721e_evm_r5_defconfig | 2 --
> configs/j721s2_evm_a72_defconfig | 2 --
> configs/j721s2_evm_r5_defconfig | 2 --
> configs/j722s_evm_a53_defconfig | 2 --
> configs/j722s_evm_r5_defconfig | 2 --
> configs/j784s4_evm_a72_defconfig | 2 --
> configs/j784s4_evm_r5_defconfig | 2 --
> configs/phycore_am62ax_a53_defconfig | 2 --
> configs/phycore_am62x_a53_defconfig | 2 --
> configs/phycore_am64x_a53_defconfig | 2 --
> configs/verdin-am62_a53_defconfig | 2 --
> configs/verdin-am62p_a53_defconfig | 2 --
> 35 files changed, 3 insertions(+), 63 deletions(-)
>
I should probably add it to my TODO list to look at these. There seems
to be a lot of stuff we should clean up
Reviewed-by: Bryan Brattlof <bb@ti.com>
~Bryan
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/4] configs: Remove default malloc length for K3 R5 SPL
2025-12-08 19:06 [PATCH 1/4] configs: Remove default malloc length for K3 R5 SPL Andrew Davis
` (3 preceding siblings ...)
2025-12-09 12:26 ` [PATCH 1/4] configs: Remove default malloc length for K3 R5 SPL Bryan Brattlof
@ 2025-12-31 19:00 ` Tom Rini
4 siblings, 0 replies; 9+ messages in thread
From: Tom Rini @ 2025-12-31 19:00 UTC (permalink / raw)
To: Neha Malcom Francis, Bryan Brattlof, Simon Glass, Andrew Davis; +Cc: u-boot
On Mon, 08 Dec 2025 13:06:32 -0600, Andrew Davis wrote:
> These values are already the default, remove them from these defconfigs.
>
>
Applied to u-boot/next, thanks!
[1/4] configs: Remove default malloc length for K3 R5 SPL
commit: 0082756320d713c412d6df13c0a3be9b29cf7496
[2/4] spl: Kconfig: k3: Increase malloc size after relocation for R5
commit: d2bd9ee7de35b80092e1abaf8feb576dba25128f
[3/4] spl: Kconfig: k3: Set common default for CUSTOM_SYS_MALLOC items
commit: 6de07498790d8af3073be3a73dff918e410cff66
[4/4] spl: Kconfig: k3: Set common default for SPL_LOAD_FIT(_ADDRESS)
commit: dc1c7526b1cb64526601d81f70a87f57aeac1e9a
--
Tom
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2025-12-31 19:00 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-12-08 19:06 [PATCH 1/4] configs: Remove default malloc length for K3 R5 SPL Andrew Davis
2025-12-08 19:06 ` [PATCH 2/4] spl: Kconfig: k3: Increase malloc size after relocation for R5 Andrew Davis
2025-12-09 14:11 ` Bryan Brattlof
2025-12-08 19:06 ` [PATCH 3/4] spl: Kconfig: k3: Set common default for CUSTOM_SYS_MALLOC items Andrew Davis
2025-12-09 14:12 ` Bryan Brattlof
2025-12-08 19:06 ` [PATCH 4/4] spl: Kconfig: k3: Set common default for SPL_LOAD_FIT(_ADDRESS) Andrew Davis
2025-12-09 14:15 ` Bryan Brattlof
2025-12-09 12:26 ` [PATCH 1/4] configs: Remove default malloc length for K3 R5 SPL Bryan Brattlof
2025-12-31 19:00 ` Tom Rini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox