From 0844ed321981a9df4c9f6843455467012ddb01e8 Mon Sep 17 00:00:00 2001 From: Paul Kocialkowski Date: Sun, 28 Jul 2024 22:24:57 +0200 Subject: [PATCH] omap3: Define maximum U-Boot size in Kconfig instead of defconfigs The maximum U-Boot size was defined to the same value in each OMAP3 board defconfig. Move the common definition to the Kconfig option declaration instead. Signed-off-by: Paul Kocialkowski Reviewed-by: Tom Rini Tested-by: Derald D. Woods --- Kconfig | 1 + configs/am3517_evm_defconfig | 1 - configs/devkit8000_defconfig | 1 - configs/igep00x0_defconfig | 1 - configs/omap35_logic_defconfig | 1 - configs/omap35_logic_somlv_defconfig | 1 - configs/omap3_evm_defconfig | 1 - configs/omap3_logic_defconfig | 1 - configs/omap3_logic_somlv_defconfig | 1 - 9 files changed, 1 insertion(+), 8 deletions(-) diff --git a/Kconfig b/Kconfig index 70c26b4ce7..69e8b17b79 100644 --- a/Kconfig +++ b/Kconfig @@ -620,6 +620,7 @@ config SYS_SRAM_SIZE config SYS_MONITOR_LEN int "Maximum size in bytes reserved for U-Boot in memory" default 1048576 if X86 + default 262144 if OMAP34XX default 786432 if ARCH_SUNXI default 0 help diff --git a/configs/am3517_evm_defconfig b/configs/am3517_evm_defconfig index 114d1a22f4..a6e3a03ec1 100644 --- a/configs/am3517_evm_defconfig +++ b/configs/am3517_evm_defconfig @@ -10,7 +10,6 @@ CONFIG_ENV_SOURCE_FILE="am3517evm" CONFIG_DEFAULT_DEVICE_TREE="ti/omap/am3517-evm" CONFIG_TARGET_AM3517_EVM=y CONFIG_EMIF4=y -CONFIG_SYS_MONITOR_LEN=262144 CONFIG_SPL_SYS_MALLOC_F_LEN=0x2500 CONFIG_SPL=y CONFIG_LTO=y diff --git a/configs/devkit8000_defconfig b/configs/devkit8000_defconfig index d68bb8bfd3..b78a567aef 100644 --- a/configs/devkit8000_defconfig +++ b/configs/devkit8000_defconfig @@ -6,7 +6,6 @@ CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=2 CONFIG_DEFAULT_DEVICE_TREE="omap3-devkit8000" CONFIG_TARGET_DEVKIT8000=y -CONFIG_SYS_MONITOR_LEN=262144 CONFIG_SPL_SYS_MALLOC_F_LEN=0x400 CONFIG_SPL_BSS_START_ADDR=0x80000500 CONFIG_SPL=y diff --git a/configs/igep00x0_defconfig b/configs/igep00x0_defconfig index 4933958472..761f5c31e8 100644 --- a/configs/igep00x0_defconfig +++ b/configs/igep00x0_defconfig @@ -8,7 +8,6 @@ CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x8000 CONFIG_DEFAULT_DEVICE_TREE="ti/omap/omap3-igep0020" CONFIG_TARGET_OMAP3_IGEP00X0=y -CONFIG_SYS_MONITOR_LEN=262144 CONFIG_SPL_SYS_MALLOC_F_LEN=0x400 CONFIG_SPL=y CONFIG_DISTRO_DEFAULTS=y diff --git a/configs/omap35_logic_defconfig b/configs/omap35_logic_defconfig index ca1b97a26d..539cb15157 100644 --- a/configs/omap35_logic_defconfig +++ b/configs/omap35_logic_defconfig @@ -10,7 +10,6 @@ CONFIG_NR_DRAM_BANKS=2 CONFIG_DEFAULT_DEVICE_TREE="ti/omap/logicpd-torpedo-35xx-devkit" CONFIG_TARGET_OMAP3_LOGIC=y # CONFIG_SPL_OMAP3_ID_NAND is not set -CONFIG_SYS_MONITOR_LEN=262144 CONFIG_SPL=y CONFIG_LTO=y CONFIG_ANDROID_BOOT_IMAGE=y diff --git a/configs/omap35_logic_somlv_defconfig b/configs/omap35_logic_somlv_defconfig index 3b0bc6d1ea..3039e29604 100644 --- a/configs/omap35_logic_somlv_defconfig +++ b/configs/omap35_logic_somlv_defconfig @@ -10,7 +10,6 @@ CONFIG_NR_DRAM_BANKS=2 CONFIG_DEFAULT_DEVICE_TREE="ti/omap/logicpd-som-lv-35xx-devkit" CONFIG_TARGET_OMAP3_LOGIC=y # CONFIG_SPL_OMAP3_ID_NAND is not set -CONFIG_SYS_MONITOR_LEN=262144 CONFIG_SPL=y CONFIG_LTO=y CONFIG_SYS_MONITOR_BASE=0x10000000 diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig index d7a3fc4b25..c502542a79 100644 --- a/configs/omap3_evm_defconfig +++ b/configs/omap3_evm_defconfig @@ -6,7 +6,6 @@ CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=2 CONFIG_DEFAULT_DEVICE_TREE="omap3-evm" CONFIG_TARGET_OMAP3_EVM=y -CONFIG_SYS_MONITOR_LEN=262144 CONFIG_SPL_SYS_MALLOC_F_LEN=0x400 CONFIG_SPL=y CONFIG_DISTRO_DEFAULTS=y diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig index 52e2e459db..522052d7eb 100644 --- a/configs/omap3_logic_defconfig +++ b/configs/omap3_logic_defconfig @@ -10,7 +10,6 @@ CONFIG_NR_DRAM_BANKS=2 CONFIG_DEFAULT_DEVICE_TREE="ti/omap/logicpd-torpedo-37xx-devkit" CONFIG_TARGET_OMAP3_LOGIC=y # CONFIG_SPL_OMAP3_ID_NAND is not set -CONFIG_SYS_MONITOR_LEN=262144 CONFIG_SPL=y CONFIG_LTO=y CONFIG_ANDROID_BOOT_IMAGE=y diff --git a/configs/omap3_logic_somlv_defconfig b/configs/omap3_logic_somlv_defconfig index 64bb401f7a..5c15e87a45 100644 --- a/configs/omap3_logic_somlv_defconfig +++ b/configs/omap3_logic_somlv_defconfig @@ -10,7 +10,6 @@ CONFIG_NR_DRAM_BANKS=2 CONFIG_DEFAULT_DEVICE_TREE="ti/omap/logicpd-som-lv-37xx-devkit" CONFIG_TARGET_OMAP3_LOGIC=y # CONFIG_SPL_OMAP3_ID_NAND is not set -CONFIG_SYS_MONITOR_LEN=262144 CONFIG_SPL=y CONFIG_LTO=y CONFIG_SYS_MONITOR_BASE=0x10000000 -- 2.39.5