Merge tag 'u-boot-atmel-fixes-2019.07-a' of git://git.denx.de/u-boot-atmel

[oweals/u-boot.git] / README

diff --git a/README b/README
index a514f48caefc68b8453b8cc7ce0da3581f3504a8..e2efef06301310594f28cf364e232a311bf5f700 100644 (file)
--- a/README
+++ b/README
@@ -634,8 +634,6 @@ The following options need to be configured:
                the defaults discussed just above.
 
 - Cache Configuration:
-               CONFIG_SYS_ICACHE_OFF - Do not enable instruction cache in U-Boot
-               CONFIG_SYS_DCACHE_OFF - Do not enable data cache in U-Boot
                CONFIG_SYS_L2CACHE_OFF- Do not enable L2 cache in U-Boot
 
 - Cache Configuration for ARM:
@@ -1120,9 +1118,6 @@ The following options need to be configured:
                        CONFIG_SH_MMCIF_CLK
                        Define the clock frequency for MMCIF
 
-               CONFIG_SUPPORT_EMMC_BOOT
-               Enable some additional features of the eMMC boot partitions.
-
 - USB Device Firmware Update (DFU) class support:
                CONFIG_DFU_OVER_USB
                This enables the USB portion of the DFU USB class
@@ -2423,9 +2418,6 @@ FIT uImage format:
                When defined, the linker checks that the actual size does
                not exceed it.
 
-               CONFIG_SPL_TEXT_BASE
-               TEXT_BASE for linking the SPL binary.
-
                CONFIG_SPL_RELOC_TEXT_BASE
                Address to relocate to.  If unspecified, this is equal to
                CONFIG_SPL_TEXT_BASE (i.e. no relocation is done).
@@ -3302,12 +3294,12 @@ within that device.
 
 - CONFIG_SYS_FMAN_FW_ADDR
        The address in the storage device where the FMAN microcode is located.  The
-       meaning of this address depends on which CONFIG_SYS_QE_FW_IN_xxx macro
+       meaning of this address depends on which CONFIG_SYS_QE_FMAN_FW_IN_xxx macro
        is also specified.
 
 - CONFIG_SYS_QE_FW_ADDR
        The address in the storage device where the QE microcode is located.  The
-       meaning of this address depends on which CONFIG_SYS_QE_FW_IN_xxx macro
+       meaning of this address depends on which CONFIG_SYS_QE_FMAN_FW_IN_xxx macro
        is also specified.
 
 - CONFIG_SYS_QE_FMAN_FW_LENGTH