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

[u-boot] / README

diff --git a/README b/README
index 325a58c9301658aec3a356cfef8530de7aa62b93..b1ddf89fc588290a85311c713260df3718e1c86e 100644 (file)
--- a/README
+++ b/README
@@ -1,9 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0+
 #
 # (C) Copyright 2000 - 2013
 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-#
-# SPDX-License-Identifier:     GPL-2.0+
-#
 
 Summary:
 ========
@@ -333,11 +331,6 @@ The following options need to be configured:
 
 - Board Type:  Define exactly one, e.g. CONFIG_MPC8540ADS.
 
-- Marvell Family Member
-               CONFIG_SYS_MVFS         - define it if you want to enable
-                                         multiple fs option at one time
-                                         for marvell soc family
-
 - 85xx CPU Options:
                CONFIG_SYS_PPC64
 
@@ -812,14 +805,6 @@ The following options need to be configured:
                CONFIG_AT91_HW_WDT_TIMEOUT
                specify the timeout in seconds. default 2 seconds.
 
-- U-Boot Version:
-               CONFIG_VERSION_VARIABLE
-               If this variable is defined, an environment variable
-               named "ver" is created by U-Boot showing the U-Boot
-               version as printed by the "version" command.
-               Any change to this variable will be reverted at the
-               next reset.
-
 - Real-Time Clock:
 
                When CONFIG_CMD_DATE is selected, the type of the RTC
@@ -1182,10 +1167,6 @@ The following options need to be configured:
                CONFIG_SUPPORT_EMMC_BOOT
                Enable some additional features of the eMMC boot partitions.
 
-               CONFIG_SUPPORT_EMMC_RPMB
-               Enable the commands for reading, writing and programming the
-               key for the Replay Protection Memory Block partition in eMMC.
-
 - USB Device Firmware Update (DFU) class support:
                CONFIG_DFU_OVER_USB
                This enables the USB portion of the DFU USB class
@@ -2421,19 +2402,6 @@ FIT uImage format:
  -150  common/cmd_nand.c       Incorrect FIT image format
   151  common/cmd_nand.c       FIT image format OK
 
-- legacy image format:
-               CONFIG_IMAGE_FORMAT_LEGACY
-               enables the legacy image format support in U-Boot.
-
-               Default:
-               enabled if CONFIG_FIT_SIGNATURE is not defined.
-
-               CONFIG_DISABLE_IMAGE_LEGACY
-               disable the legacy image format
-
-               This define is introduced, as the legacy image format is
-               enabled per default for backward compatibility.
-
 - Standalone program support:
                CONFIG_STANDALONE_LOAD_ADDR
 
@@ -2657,6 +2625,10 @@ FIT uImage format:
                CONFIG_SPL_NAND_DRIVERS
                SPL uses normal NAND drivers, not minimal drivers.
 
+               CONFIG_SPL_NAND_IDENT
+               SPL uses the chip ID list to identify the NAND flash.
+               Requires CONFIG_SPL_NAND_BASE.
+
                CONFIG_SPL_NAND_ECC
                Include standard software ECC in the SPL
 
@@ -2718,7 +2690,7 @@ FIT uImage format:
                use an arch-specific makefile fragment instead, for
                example if more than one image needs to be produced.
 
-               CONFIG_FIT_SPL_PRINT
+               CONFIG_SPL_FIT_PRINT
                Printing information about a FIT image adds quite a bit of
                code to SPL. So this is normally disabled in SPL. Use this
                option to re-enable it. This will affect the output of the