diff options
| author | Tom Rini <trini@konsulko.com> | 2023-10-06 17:23:47 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-10-06 17:23:47 -0400 |
| commit | 83aa0ed1e93e1ffac24888d98d37a5b04ed3fb07 (patch) | |
| tree | fcabaf4a86164f385ede03b654bc69cbffb2a3ee /include/system-constants.h | |
| parent | be2abe73df58a35da9e8d5afb13fccdf1b0faa8e (diff) | |
| parent | f69d3d6d10b15872a279aeb10b7c522627aff6c2 (diff) | |
Merge branch '2023-10-06-spl-prepare-for-universal-payload'
To quote the author:
This series tidies up SPL a little and adds some core ofnode functions
needed to support Universal Payload. It also includes a few minor
fix-ups for sandbox.
For SPL the changes include CONFIG naming, removing various #ifdefs and
tidying up the FIT code.
One notable piece of the ofnode improvements is support for flattening a
livetree. This should be useful in future as we move FDT fixups to use
the ofnode API.
Diffstat (limited to 'include/system-constants.h')
| -rw-r--r-- | include/system-constants.h | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/include/system-constants.h b/include/system-constants.h index 0d6b71b35a0..59371568d1e 100644 --- a/include/system-constants.h +++ b/include/system-constants.h @@ -22,11 +22,23 @@ /* * Typically, we have the SPL malloc pool at the end of the BSS area. */ -#ifdef CONFIG_HAS_CUSTOM_SPL_MALLOC_START -#define SYS_SPL_MALLOC_START CONFIG_CUSTOM_SYS_SPL_MALLOC_ADDR -#else -#define SYS_SPL_MALLOC_START (CONFIG_SPL_BSS_START_ADDR + \ +#ifdef CONFIG_SPL_HAS_CUSTOM_MALLOC_START +#define SPL_SYS_MALLOC_START CONFIG_SPL_CUSTOM_SYS_MALLOC_ADDR +#elif defined(CONFIG_SPL_BSS_START_ADDR) +#define SPL_SYS_MALLOC_START (CONFIG_SPL_BSS_START_ADDR + \ CONFIG_SPL_BSS_MAX_SIZE) +#else +/* feature not enabled: this value avoids compiler errors but is not used */ +#define SPL_SYS_MALLOC_START 0 +#endif +#define SPL_SYS_MALLOC_SIZE \ + IF_ENABLED_INT(CONFIG_SPL_SYS_MALLOC, CONFIG_SPL_SYS_MALLOC_SIZE) + +/* deal with an optional value */ +#ifdef CONFIG_SPL_OS_BOOT +#define SPL_PAYLOAD_ARGS_ADDR CONFIG_SPL_PAYLOAD_ARGS_ADDR +#else +#define SPL_PAYLOAD_ARGS_ADDR 0 #endif #endif |