Merge branch 'master' of git://git.denx.de/u-boot-video

[oweals/u-boot.git] / README

diff --git a/README b/README
index e86934af696474a7def7b8c959973dcc5d9865d9..cadb571166bf4117730f81fd044d0beb21b8f1b3 100644 (file)
--- a/README
+++ b/README
@@ -511,7 +511,7 @@ The following options need to be configured:
                implemetation.
 
                CONFIG_SYS_FSL_DDR2
-               Board config to use DDR2. It can be eanbeld for SoCs with
+               Board config to use DDR2. It can be enabled for SoCs with
                Freescale DDR2 or DDR3 controllers, depending on the board
                implementation.
 
@@ -3586,6 +3586,10 @@ FIT uImage format:
                Support for NAND boot using simple NAND drivers that
                expose the cmd_ctrl() interface.
 
+               CONFIG_SPL_UBI
+               Support for a lightweight UBI (fastmap) scanner and
+               loader
+
                CONFIG_SPL_MTD_SUPPORT
                Support for the MTD subsystem within SPL.  Useful for
                environment on NAND support within SPL.
@@ -3769,10 +3773,11 @@ Configuration Settings:
                You only need to set this if address zero isn't writeable
 
 - CONFIG_SYS_MEM_RESERVE_SECURE
+               Only implemented for ARMv8 for now.
                If defined, the size of CONFIG_SYS_MEM_RESERVE_SECURE memory
                is substracted from total RAM and won't be reported to OS.
                This memory can be used as secure memory. A variable
-               gd->secure_ram is used to track the location. In systems
+               gd->arch.secure_ram is used to track the location. In systems
                the RAM base is not zero, or RAM is divided into banks,
                this variable needs to be recalcuated to get the address.
 
@@ -3838,9 +3843,6 @@ Configuration Settings:
                The memory will be freed (or in fact just forgotten) when
                U-Boot relocates itself.
 
-               Pre-relocation malloc() is only supported on ARM and sandbox
-               at present but is fairly easy to enable for other archs.
-
 - 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
@@ -4812,7 +4814,7 @@ Low Level (hardware related) configuration options:
 
 - CONFIG_SKIP_LOWLEVEL_INIT_ONLY
                [ARM926EJ-S only] This allows just the call to lowlevel_init()
-               to be skipped. The normal CPU15 init (such as enabling the
+               to be skipped. The normal CP15 init (such as enabling the
                instruction cache) is still performed.
 
 - CONFIG_SPL_BUILD