From 15a5c72ca4fc4f1df04ac3ea89c0ba4e1cd48ab4 Mon Sep 17 00:00:00 2001 From: Simon Glass <sjg@chromium.org> Date: Mon, 3 Dec 2018 04:37:17 -0700 Subject: [PATCH] sandbox: Increase the pre-relocation memory This is close to full now, so increase it to avoid problems with adding more devices. Signed-off-by: Simon Glass <sjg@chromium.org> --- Kconfig | 2 ++ configs/sandbox64_defconfig | 1 - configs/sandbox_defconfig | 1 - configs/sandbox_flattree_defconfig | 1 - configs/sandbox_noblk_defconfig | 1 - configs/sandbox_spl_defconfig | 1 - 6 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Kconfig b/Kconfig index 42672a92df..9e0b8af40a 100644 --- a/Kconfig +++ b/Kconfig @@ -126,6 +126,7 @@ config SYS_BOOT_GET_KBD config SYS_MALLOC_F bool "Enable malloc() pool before relocation" default y if DM + help Before relocation, memory is very limited on many platforms. Still, we can provide a small malloc() pool if needed. Driver model in @@ -136,6 +137,7 @@ config SYS_MALLOC_F_LEN hex "Size of malloc() pool before relocation" depends on SYS_MALLOC_F default 0x1000 if AM33XX + default 0x2800 if SANDBOX default 0x400 help Before relocation, memory is very limited on many platforms. Still, diff --git a/configs/sandbox64_defconfig b/configs/sandbox64_defconfig index e6680d9a59..aede14569d 100644 --- a/configs/sandbox64_defconfig +++ b/configs/sandbox64_defconfig @@ -1,5 +1,4 @@ CONFIG_SYS_TEXT_BASE=0 -CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_SANDBOX64=y CONFIG_DISTRO_DEFAULTS=y CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index 5b65c6157a..1e7d41d19e 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -1,5 +1,4 @@ CONFIG_SYS_TEXT_BASE=0 -CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_DEBUG_UART=y CONFIG_DISTRO_DEFAULTS=y CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/sandbox_flattree_defconfig b/configs/sandbox_flattree_defconfig index 756b839b08..4f3757c8bc 100644 --- a/configs/sandbox_flattree_defconfig +++ b/configs/sandbox_flattree_defconfig @@ -1,5 +1,4 @@ CONFIG_SYS_TEXT_BASE=0 -CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_DISTRO_DEFAULTS=y CONFIG_NR_DRAM_BANKS=1 CONFIG_FIT=y diff --git a/configs/sandbox_noblk_defconfig b/configs/sandbox_noblk_defconfig index e71e2d3860..6c7d08e42e 100644 --- a/configs/sandbox_noblk_defconfig +++ b/configs/sandbox_noblk_defconfig @@ -1,5 +1,4 @@ CONFIG_SYS_TEXT_BASE=0 -CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_DISTRO_DEFAULTS=y CONFIG_NR_DRAM_BANKS=1 CONFIG_FIT=y diff --git a/configs/sandbox_spl_defconfig b/configs/sandbox_spl_defconfig index 452a2ef4a5..2f83812528 100644 --- a/configs/sandbox_spl_defconfig +++ b/configs/sandbox_spl_defconfig @@ -1,7 +1,6 @@ CONFIG_SYS_TEXT_BASE=0 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y -CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_DRIVERS_MISC_SUPPORT=y CONFIG_SPL=y -- 2.39.5