doc: Clean up SYS_MALLOC_SIMPLE

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>

diff --git a/Kconfig b/Kconfig
index 068da61d84561b2a4130329cf600f0eb146354d6..7df91d789f6db7be07085c77c7bb9026b5095851 100644 (file)
--- 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 a1f90642274df563243988b6476c7ae2638e1303..60c6b8a19db1be743748e44ab1125bf0ae5f6da8 100644 (file)
--- 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 b287d0ff7369bb09c13ed2846764b8d0f85dd79c..5261085a068d2773214d5a4d3a63da6de9c2d181 100644 (file)
--- 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
 -------------