Merge branch 'pmic' of git://git.denx.de/u-boot-mmc

[people/ms/u-boot.git] / README

diff --git a/README b/README
index ecb1710d01cca2decd4286f3584e19aecd3026b4..3174b18d9a894737bccd47c0aaa1943ed4c974bb 100644 (file)
--- a/README
+++ b/README
@@ -600,21 +600,6 @@ The following options need to be configured:
                Thumb2 this flag will result in Thumb2 code generated by
                GCC.
 
-               CONFIG_ARM_ERRATA_716044
-               CONFIG_ARM_ERRATA_742230
-               CONFIG_ARM_ERRATA_743622
-               CONFIG_ARM_ERRATA_751472
-               CONFIG_ARM_ERRATA_761320
-               CONFIG_ARM_ERRATA_773022
-               CONFIG_ARM_ERRATA_774769
-               CONFIG_ARM_ERRATA_794072
-
-               If set, the workarounds for these ARM errata are applied early
-               during U-Boot startup. Note that these options force the
-               workarounds to be applied; no CPU-type/version detection
-               exists, unlike the similar options in the Linux kernel. Do not
-               set these options unless they apply!
-
                COUNTER_FREQUENCY
                Generic timer clock source frequency.
 
@@ -623,15 +608,6 @@ The following options need to be configured:
                different from COUNTER_FREQUENCY, and can only be determined
                at run time.
 
-               NOTE: The following can be machine specific errata. These
-               do have ability to provide rudimentary version and machine
-               specific checks, but expect no product checks.
-               CONFIG_ARM_ERRATA_430973
-               CONFIG_ARM_ERRATA_454179
-               CONFIG_ARM_ERRATA_621766
-               CONFIG_ARM_ERRATA_798870
-               CONFIG_ARM_ERRATA_801819
-
 - Tegra SoC options:
                CONFIG_TEGRA_SUPPORT_NON_SECURE
 
@@ -1771,12 +1747,6 @@ The following options need to be configured:
                can be displayed via the splashscreen support or the
                bmp command.
 
-- Do compressing for memory range:
-               CONFIG_CMD_ZIP
-
-               If this option is set, it would use zlib deflate method
-               to compress the specified memory at its best effort.
-
 - Compression support:
                CONFIG_GZIP
 
@@ -2786,19 +2756,6 @@ The following options need to be configured:
                this is instead controlled by the value of
                /config/load-environment.
 
-- Parallel Flash support:
-               CONFIG_SYS_NO_FLASH
-
-               Traditionally U-Boot was run on systems with parallel NOR
-               flash. This option is used to disable support for parallel NOR
-               flash. This option should be defined if the board does not have
-               parallel flash.
-
-               If this option is not defined one of the generic flash drivers
-               (e.g.  CONFIG_FLASH_CFI_DRIVER or CONFIG_ST_SMI) must be
-               selected or the board must provide an implementation of the
-               flash API (see include/flash.h).
-
 - DataFlash Support:
                CONFIG_HAS_DATAFLASH