Merge git://git.denx.de/u-boot-mpc85xx

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

diff --git a/README b/README
index 7e0dd35..9c992c1 100644 (file)
--- a/README
+++ b/README
@@ -1457,9 +1457,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.
 
@@ -2033,7 +2030,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 +2038,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