mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-07-04 21:32:09 +00:00
spl: use TPL_SYS_MALLOC_F_LEN for TPL
The (upstream) changes to break up SYS_MALLOC_F_LEN for the full U-Boot and the SPL stage, break TPL (if simple malloc is enabled in TPL). This adds support for a TPL-variant of SYS_MALLOC_F_LEN: - adds TPL_SYS_MALLOC_F_LEN - rewrites a test for CONFIG_SPL_SYS_MALLOC_F_LEN to access CONFIG_VAL(SYS_MALLOC_F_LEN) Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
parent
19b68fb280
commit
ae2cee2e34
2 changed files with 12 additions and 2 deletions
12
Kconfig
12
Kconfig
|
@ -96,7 +96,17 @@ config SYS_MALLOC_F_LEN
|
||||||
initial serial device and any others that are needed.
|
initial serial device and any others that are needed.
|
||||||
|
|
||||||
config SPL_SYS_MALLOC_F_LEN
|
config SPL_SYS_MALLOC_F_LEN
|
||||||
hex "Size of malloc() pool in spl before relocation"
|
hex "Size of malloc() pool in SPL before relocation"
|
||||||
|
depends on SYS_MALLOC_F
|
||||||
|
default SYS_MALLOC_F_LEN
|
||||||
|
help
|
||||||
|
Before relocation, memory is very limited on many platforms. Still,
|
||||||
|
we can provide a small malloc() pool if needed. Driver model in
|
||||||
|
particular needs this to operate, so that it can allocate the
|
||||||
|
initial serial device and any others that are needed.
|
||||||
|
|
||||||
|
config TPL_SYS_MALLOC_F_LEN
|
||||||
|
hex "Size of malloc() pool in TPL before relocation"
|
||||||
depends on SYS_MALLOC_F
|
depends on SYS_MALLOC_F
|
||||||
default SYS_MALLOC_F_LEN
|
default SYS_MALLOC_F_LEN
|
||||||
help
|
help
|
||||||
|
|
|
@ -486,7 +486,7 @@ ulong spl_relocate_stack_gd(void)
|
||||||
gd_t *new_gd;
|
gd_t *new_gd;
|
||||||
ulong ptr = CONFIG_SPL_STACK_R_ADDR;
|
ulong ptr = CONFIG_SPL_STACK_R_ADDR;
|
||||||
|
|
||||||
#if defined(CONFIG_SPL_SYS_MALLOC_SIMPLE) && CONFIG_SPL_SYS_MALLOC_F_LEN
|
#if defined(CONFIG_SPL_SYS_MALLOC_SIMPLE) && CONFIG_VAL(SYS_MALLOC_F_LEN)
|
||||||
if (CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN) {
|
if (CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN) {
|
||||||
ptr -= CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN;
|
ptr -= CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN;
|
||||||
gd->malloc_base = ptr;
|
gd->malloc_base = ptr;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue