diff options
| author | Philipp Tomsich <philipp.tomsich@theobroma-systems.com> | 2017-07-28 11:06:03 +0200 |
|---|---|---|
| committer | Philipp Tomsich <philipp.tomsich@theobroma-systems.com> | 2017-08-13 17:12:19 +0200 |
| commit | ae2cee2e34a9a4b69b7a4dea3dc93c4d93d93b53 (patch) | |
| tree | 2794d45b9aa60a5df0b827947586f4b8b230b1ec /common | |
| parent | 19b68fb280e8304c9c78c179ec40fdcfee793754 (diff) | |
| download | u-boot-ae2cee2e34a9a4b69b7a4dea3dc93c4d93d93b53.zip u-boot-ae2cee2e34a9a4b69b7a4dea3dc93c4d93d93b53.tar.gz u-boot-ae2cee2e34a9a4b69b7a4dea3dc93c4d93d93b53.tar.bz2 | |
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>
Diffstat (limited to 'common')
| -rw-r--r-- | common/spl/spl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/spl/spl.c b/common/spl/spl.c index c56cc6f..bdb681f 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -486,7 +486,7 @@ ulong spl_relocate_stack_gd(void) gd_t *new_gd; 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) { ptr -= CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN; gd->malloc_base = ptr; |