Move the useful help to Kconfig.
Drop mention of CONFIG_SYS_MALLOC_SIMPLE since it doesn't exist.
Correct a 'CONFIGSYS_MALLOC_F_LEN' typo
Signed-off-by: Simon Glass sjg@chromium.org ---
Changes in v3: - Add new patch to clean up SYS_MALLOC_SIMPLE documentation
Kconfig | 15 +++++++++++---- README | 18 ------------------ doc/usage/cmd/bdinfo.rst | 2 +- 3 files changed, 12 insertions(+), 23 deletions(-)
diff --git a/Kconfig b/Kconfig index 57afe597b0c8..a3061c86124e 100644 --- a/Kconfig +++ b/Kconfig @@ -277,10 +277,17 @@ config SYS_MALLOC_F_LEN default 0x10000 if ARCH_IMX8 || ARCH_IMX8M default 0x2000 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. + Size of the malloc() pool for use before relocation. If + this is defined, then a very simple malloc() implementation + will become available before relocation. The address is just + below the global data, and the stack is moved down to make + space. + + This feature allocates regions with increasing addresses + within the region. calloc() is supported, but realloc() + is not available. free() is supported but does nothing. + The memory will be freed (or in fact just forgotten) when + U-Boot relocates itself.
config SYS_MALLOC_LEN hex "Define memory for Dynamic allocation" diff --git a/README b/README index a1f90642274d..60c6b8a19db1 100644 --- a/README +++ b/README @@ -1281,24 +1281,6 @@ Configuration Settings: - CONFIG_SYS_MALLOC_LEN: Size of DRAM reserved for malloc() use.
-- CONFIG_SYS_MALLOC_F_LEN - Size of the malloc() pool for use before relocation. If - this is defined, then a very simple malloc() implementation - will become available before relocation. The address is just - below the global data, and the stack is moved down to make - space. - - This feature allocates regions with increasing addresses - within the region. calloc() is supported, but realloc() - is not available. free() is supported but does nothing. - The memory will be freed (or in fact just forgotten) when - U-Boot relocates itself. - -- CONFIG_SYS_MALLOC_SIMPLE - Provides a simple and small malloc() and calloc() for those - boards which do not use the full malloc in SPL (which is - enabled with CONFIG_SPL_SYS_MALLOC). - - CFG_SYS_BOOTMAPSZ: Maximum size of memory mapped by the startup code of the Linux kernel; all data that must be processed by diff --git a/doc/usage/cmd/bdinfo.rst b/doc/usage/cmd/bdinfo.rst index b287d0ff7369..5261085a068d 100644 --- a/doc/usage/cmd/bdinfo.rst +++ b/doc/usage/cmd/bdinfo.rst @@ -106,7 +106,7 @@ sp start
Early malloc usage amount of memory used in the early malloc memory and its maximum size - as defined by CONFIGSYS_MALLOC_F_LEN + as defined by CONFIG_SYS_MALLOC_F_LEN
Configuration -------------