X-Git-Url: http://git.ipfire.org/?p=people%2Fms%2Fu-boot.git;a=blobdiff_plain;f=README;h=3174b18d9a894737bccd47c0aaa1943ed4c974bb;hp=7e0dd35f931facaea8e826bbbb07993bcbe5304e;hb=e5bda8a2d88f8f3eba308fb30d7e12f3a50ab6b5;hpb=2c45f8040ea1152d2ff0960f96905ca42ac089cd

diff --git a/README b/README
index 7e0dd35f93..3174b18d9a 100644
--- a/README
+++ b/README
@@ -504,6 +504,12 @@ The following options need to be configured:
 		CONFIG_SYS_FSL_IFC_LE
 		Defines the IFC controller register space as Little Endian
 
+		CONFIG_SYS_FSL_IFC_CLK_DIV
+		Defines divider of platform clock(clock input to IFC controller).
+
+		CONFIG_SYS_FSL_LBC_CLK_DIV
+		Defines divider of platform clock(clock input to eLBC controller).
+
 		CONFIG_SYS_FSL_PBL_PBI
 		It enables addition of RCW (Power on reset configuration) in built image.
 		Please refer doc/README.pblimage for more details
@@ -594,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.
 
@@ -617,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
 
@@ -1457,9 +1439,6 @@ The following options need to be configured:
 			CONFIG_SH_MMCIF_CLK
 			Define the clock frequency for MMCIF
 
-		CONFIG_GENERIC_MMC
-		Enable the generic MMC driver
-
 		CONFIG_SUPPORT_EMMC_BOOT
 		Enable some additional features of the eMMC boot partitions.
 
@@ -1768,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
 
@@ -2033,7 +2006,7 @@ The following options need to be configured:
 
 		A byte containing the id of the VLAN.
 
-- Status LED:	CONFIG_STATUS_LED
+- Status LED:	CONFIG_LED_STATUS
 
 		Several configurations allow to display the current
 		status using a LED. For instance, the LED will blink
@@ -2041,15 +2014,15 @@ The following options need to be configured:
 		soon as a reply to a BOOTP request was received, and
 		start blinking slow once the Linux kernel is running
 		(supported by a status LED driver in the Linux
-		kernel). Defining CONFIG_STATUS_LED enables this
+		kernel). Defining CONFIG_LED_STATUS enables this
 		feature in U-Boot.
 
 		Additional options:
 
-		CONFIG_GPIO_LED
+		CONFIG_LED_STATUS_GPIO
 		The status LED can be connected to a GPIO pin.
 		In such cases, the gpio_led driver can be used as a
-		status LED backend implementation. Define CONFIG_GPIO_LED
+		status LED backend implementation. Define CONFIG_LED_STATUS_GPIO
 		to include the gpio_led driver in the U-Boot binary.
 
 		CONFIG_GPIO_LED_INVERTED_TABLE
@@ -2783,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