diff options
| author | Simon Glass <[email protected]> | 2019-08-01 09:47:11 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2019-08-11 16:43:41 -0400 |
| commit | f030b7b2607013a1b05a696e7f010d5f8dbe4fcd (patch) | |
| tree | 5421db4a03b2a0fff3f53358ce416aee6008fefe /include/common.h | |
| parent | cb2ba9db5f2ab575d40d95e76a0ab94c7ccb9bac (diff) | |
env: Move TOTAL_MALLOC_LEN to environment.h
This declaration is only used in three files. Although it relates to
malloc() it is actually only used during malloc() init. It uses CONFIG
options including CONFIG_ENV_ADDR which are defined only in environment.h
so this header must be included anyway, for TOTAL_MALLOC_LEN to be
correct.
Nove it to environment.h to simplify the common file.
Signed-off-by: Simon Glass <[email protected]>
Acked-by: Joe Hershberger <[email protected]>
Reviewed-by: Simon Goldschmidt <[email protected]>
Diffstat (limited to 'include/common.h')
| -rw-r--r-- | include/common.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/include/common.h b/include/common.h index 70f40daa9ee..34ae5148058 100644 --- a/include/common.h +++ b/include/common.h @@ -45,16 +45,6 @@ typedef void (interrupt_handler_t)(void *); #include <asm/u-boot.h> /* boot information for Linux kernel */ #include <asm/global_data.h> /* global data used for startup functions */ -#if defined(CONFIG_ENV_IS_EMBEDDED) -#define TOTAL_MALLOC_LEN CONFIG_SYS_MALLOC_LEN -#elif ( ((CONFIG_ENV_ADDR+CONFIG_ENV_SIZE) < CONFIG_SYS_MONITOR_BASE) || \ - (CONFIG_ENV_ADDR >= (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)) ) || \ - defined(CONFIG_ENV_IS_IN_NVRAM) -#define TOTAL_MALLOC_LEN (CONFIG_SYS_MALLOC_LEN + CONFIG_ENV_SIZE) -#else -#define TOTAL_MALLOC_LEN CONFIG_SYS_MALLOC_LEN -#endif - /* startup functions, used in: * common/board_f.c * common/init/board_init.c |