omap3: Define maximum SPL size in Kconfig instead of defconfigs

The maximum SPL 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 <contact@paulk.fr>
Reviewed-by: Tom Rini <trini@konsulko.com>
Tested-by: Derald D. Woods <woods.technical@gmail.com>

diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index 6fc97f4ccbd89bafdfa3a98101811c02de0e9548..3fd113d776b70a02a0da0d1b7297bca0afa7c371 100644 (file)
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -78,6 +78,7 @@ config SPL_MAX_SIZE
        hex "Maximum size of the SPL image, excluding BSS"
        default 0x30000 if ARCH_MX6 && MX6_OCRAM_256KB
        default 0x1b000 if AM33XX && !TI_SECURE_DEVICE
+       default 0xec00 if OMAP34XX
        default 0x10000 if ARCH_MX6 && !MX6_OCRAM_256KB
        default 0x7fa0 if SUNXI_SRAM_ADDRESS = 0x10000
        default 0x7fa0 if SUNXI_SRAM_ADDRESS = 0x20000 && !MACH_SUN50I_H616

diff --git a/configs/am3517_evm_defconfig b/configs/am3517_evm_defconfig
index a6e3a03ec14361a4b1074e1595a102cbe0183b7f..f492053aa0f480edb6ca5b5488435386689b05c3 100644 (file)
--- a/configs/am3517_evm_defconfig
+++ b/configs/am3517_evm_defconfig
@@ -17,7 +17,6 @@ CONFIG_DISTRO_DEFAULTS=y
 CONFIG_BOOTDELAY=10
 CONFIG_BOOTCOMMAND="mmc dev ${mmcdev}; if mmc rescan; then echo SD/MMC found on device $mmcdev; if run loadbootenv; then run importbootenv; fi; echo Checking if uenvcmd is set ...; if test -n $uenvcmd; then echo Running uenvcmd ...; run uenvcmd; fi; echo Running default loadimage ...; setenv bootfile zImage; if run loadimage; then run loadfdt; run mmcboot; fi; else run nandboot; fi"
 CONFIG_SYS_PBSIZE=1054
-CONFIG_SPL_MAX_SIZE=0xec00
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y
 CONFIG_SPL_SYS_MALLOC=y
 CONFIG_SPL_SYS_MALLOC_SIZE=0x800000

diff --git a/configs/devkit8000_defconfig b/configs/devkit8000_defconfig
index b78a567aef75d8ffc1494668184447fee400cb78..6c54dba5b4d3d41e6e236f6ee7408b023819970a 100644 (file)
--- a/configs/devkit8000_defconfig
+++ b/configs/devkit8000_defconfig
@@ -13,7 +13,6 @@ CONFIG_DISTRO_DEFAULTS=y
 CONFIG_BOOTCOMMAND="run autoboot"
 CONFIG_USE_PREBOOT=y
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
-CONFIG_SPL_MAX_SIZE=0xec00
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y
 CONFIG_SPL_SYS_MALLOC=y
 CONFIG_SPL_HAS_CUSTOM_MALLOC_START=y

diff --git a/configs/igep00x0_defconfig b/configs/igep00x0_defconfig
index 761f5c31e832e0bdc070bb1056ab0d427ba5cb0a..04bd464780e54ece1286397083dc3dd7ef7c34c9 100644 (file)
--- a/configs/igep00x0_defconfig
+++ b/configs/igep00x0_defconfig
@@ -18,7 +18,6 @@ CONFIG_BOOTCOMMAND="run findfdt; run distro_bootcmd"
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 # CONFIG_DISPLAY_BOARDINFO is not set
-CONFIG_SPL_MAX_SIZE=0xec00
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y
 CONFIG_SPL_SYS_MALLOC=y
 CONFIG_SPL_SYS_MALLOC_SIZE=0x800000

diff --git a/configs/omap35_logic_defconfig b/configs/omap35_logic_defconfig
index 539cb15157e319cfd90c1eae6d2b55fb821a66ae..dca2bc32decc0944ed258840428f2dd73e35ff0d 100644 (file)
--- a/configs/omap35_logic_defconfig
+++ b/configs/omap35_logic_defconfig
@@ -20,7 +20,6 @@ CONFIG_PREBOOT="setenv preboot;saveenv;"
 CONFIG_DEFAULT_FDT_FILE="logicpd-torpedo-35xx-devkit.dtb"
 CONFIG_SYS_PBSIZE=1054
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
-CONFIG_SPL_MAX_SIZE=0xec00
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y
 CONFIG_SPL_SYS_MALLOC=y
 CONFIG_SPL_SYS_MALLOC_SIZE=0x800000

diff --git a/configs/omap35_logic_somlv_defconfig b/configs/omap35_logic_somlv_defconfig
index 3039e29604881ed8b1b3e512b8a7f7aff8d1152b..3cbc1f0bff11521aa19abc4f0b0c22bb8b307e4b 100644 (file)
--- a/configs/omap35_logic_somlv_defconfig
+++ b/configs/omap35_logic_somlv_defconfig
@@ -21,7 +21,6 @@ CONFIG_PREBOOT="setenv preboot;saveenv;"
 CONFIG_DEFAULT_FDT_FILE="logicpd-som-lv-35xx-devkit.dtb"
 CONFIG_SYS_PBSIZE=1054
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
-CONFIG_SPL_MAX_SIZE=0xec00
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y
 CONFIG_SPL_SYS_MALLOC=y
 CONFIG_SPL_SYS_MALLOC_SIZE=0x800000

diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig
index c502542a79d05b6003adcad145be946f95935f1e..032a9bebfc9cc6a649c7c3ffbcd82705ecdd311e 100644 (file)
--- a/configs/omap3_evm_defconfig
+++ b/configs/omap3_evm_defconfig
@@ -14,7 +14,6 @@ CONFIG_USE_PREBOOT=y
 CONFIG_DEFAULT_FDT_FILE="omap3-evm.dtb"
 CONFIG_SYS_PBSIZE=1053
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
-CONFIG_SPL_MAX_SIZE=0xec00
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y
 CONFIG_SPL_SYS_MALLOC=y
 CONFIG_SPL_SYS_MALLOC_SIZE=0x800000

diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig
index 522052d7eb402754abc5bc6306058684b03351e6..4e94170afb1e7d9ef6f3c9e0d6683d05cd3dccb6 100644 (file)
--- a/configs/omap3_logic_defconfig
+++ b/configs/omap3_logic_defconfig
@@ -19,7 +19,6 @@ CONFIG_USE_PREBOOT=y
 CONFIG_PREBOOT="setenv preboot;saveenv;"
 CONFIG_SYS_PBSIZE=1054
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
-CONFIG_SPL_MAX_SIZE=0xec00
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y
 CONFIG_SPL_SYS_MALLOC=y
 CONFIG_SPL_SYS_MALLOC_SIZE=0x800000

diff --git a/configs/omap3_logic_somlv_defconfig b/configs/omap3_logic_somlv_defconfig
index 5c15e87a4584e4f7e3a9722e56f8b263e119c74d..97a936f31d7518fda0486b3262a84f9e193cb5f4 100644 (file)
--- a/configs/omap3_logic_somlv_defconfig
+++ b/configs/omap3_logic_somlv_defconfig
@@ -21,7 +21,6 @@ CONFIG_PREBOOT="setenv preboot;saveenv;"
 CONFIG_DEFAULT_FDT_FILE="logicpd-som-lv-37xx-devkit.dtb"
 CONFIG_SYS_PBSIZE=1054
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
-CONFIG_SPL_MAX_SIZE=0xec00
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y
 CONFIG_SPL_SYS_MALLOC=y
 CONFIG_SPL_SYS_MALLOC_SIZE=0x800000

diff --git a/configs/sniper_defconfig b/configs/sniper_defconfig
index 35cfc28006c1a38f92d13e8fbc8b686e7425e494..cd0f48528f42c09dcf3a197a3ce658cef56da3f8 100644 (file)
--- a/configs/sniper_defconfig
+++ b/configs/sniper_defconfig
@@ -14,7 +14,6 @@ CONFIG_BOOTCOMMAND="setenv boot_mmc_part ${kernel_mmc_part}; if test reboot-${re
 CONFIG_SYS_CBSIZE=512
 CONFIG_SYS_PBSIZE=538
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
-CONFIG_SPL_MAX_SIZE=0xec00
 # CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
 CONFIG_SPL_SYS_MALLOC=y
 CONFIG_SPL_HAS_CUSTOM_MALLOC_START=y