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

[platform/kernel/u-boot.git] / README

diff --git a/README b/README
index fb331f9..aee0f73 100644 (file)
--- a/README
+++ b/README
@@ -874,9 +874,6 @@ The following options need to be configured:
                CONFIG_EFI_PARTITION   GPT partition table, common when EFI is the
                                       bootloader.  Note 2TB partition limit; see
                                       disk/part_efi.c
-               CONFIG_MTD_PARTITIONS  Memory Technology Device partition table.
-
-               If IDE or SCSI support is enabled (CONFIG_IDE or
                CONFIG_SCSI) you must configure support for at
                least one non-MTD partition type as well.
 
@@ -2433,17 +2430,6 @@ FIT uImage format:
                for a more detailed description refer to doc/README.update.
 
 - MTD Support (mtdparts command, UBI support)
-               CONFIG_MTD_DEVICE
-
-               Adds the MTD device infrastructure from the Linux kernel.
-               Needed for mtdparts command support.
-
-               CONFIG_MTD_PARTITIONS
-
-               Adds the MTD partitioning infrastructure from the Linux
-               kernel. Needed for UBI support.
-
-- UBI support
                CONFIG_MTD_UBI_WL_THRESHOLD
                This parameter defines the maximum difference between the highest
                erase counter value and the lowest erase counter value of eraseblocks
@@ -2625,6 +2611,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