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

[karo-tx-uboot.git] / README

diff --git a/README b/README
index 2754d1e8b899184df08e3cd588ca1ceca04f7575..76b150005f8d1f63ea36fd92e02c06411fdb3eda 100644 (file)
--- a/README
+++ b/README
@@ -1103,13 +1103,10 @@ The following options need to be configured:
                        CONFIG_VIDEO_LOGO
                        CONFIG_VIDEO_BMP_LOGO
 
-               The DIU driver will look for the 'monitor' environment variable,
-               and if defined, enable the DIU as a console during boot.  This
-               variable should be set to one of these values:
-
-                       '0'     Output video to the DVI connector
-                       '1'     Output video to the LVDS connector
-                       '2'     Output video to the Dual-Link LVDS connector
+               The DIU driver will look for the 'video-mode' environment
+               variable, and if defined, enable the DIU as a console during
+               boot.  See the documentation file README.video for a
+               description of this variable.
 
 - Keyboard Support:
                CONFIG_KEYBOARD
@@ -2761,6 +2758,14 @@ Low Level (hardware related) configuration options:
                source code. It is used to make hardware dependant
                initializations.
 
+- CONFIG_IDE_AHB:
+               Most IDE controllers were designed to be connected with PCI
+               interface. Only few of them were designed for AHB interface.
+               When software is doing ATA command and data transfer to
+               IDE devices through IDE-AHB controller, some additional
+               registers accessing to these kind of IDE-AHB controller
+               is requierd.
+
 - CONFIG_SYS_IMMR:     Physical address of the Internal Memory.
                DO NOT CHANGE unless you know exactly what you're
                doing! (11-4) [MPC8xx/82xx systems only]