cmd_fdc: Move conditional compilation to Makefile

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

diff --git a/README b/README
index 0cd01bc..44b450c 100644 (file)
--- a/README
+++ b/README
@@ -98,7 +98,7 @@ Where we come from:
 - create ARMBoot project (http://sourceforge.net/projects/armboot)
 - add other CPU families (starting with ARM)
 - create U-Boot project (http://sourceforge.net/projects/u-boot)
-- current project page: see http://www.denx.de/wiki/UBoot
+- current project page: see http://www.denx.de/wiki/U-Boot
 
 
 Names and Spelling:
@@ -380,11 +380,11 @@ The following options need to be configured:
                param header, the default value is zero if undefined.
 
 - Serial Ports:
-               CFG_PL010_SERIAL
+               CONFIG_PL010_SERIAL
 
                Define this if you want support for Amba PrimeCell PL010 UARTs.
 
-               CFG_PL011_SERIAL
+               CONFIG_PL011_SERIAL
 
                Define this if you want support for Amba PrimeCell PL011 UARTs.
 
@@ -1392,6 +1392,12 @@ The following options need to be configured:
                If defined, then this indicates the I2C bus number for the DTT.
                If not defined, then U-Boot assumes that DTT is on I2C bus 0.
 
+               CFG_I2C_DTT_ADDR:
+
+               If defined, specifies the I2C address of the DTT device.
+               If not defined, then U-Boot uses predefined value for
+               specified DTT device.
+
                CONFIG_FSL_I2C
 
                Define this option if you want to use Freescale's I2C driver in
@@ -2064,7 +2070,7 @@ Configuration Settings:
                Define if the flash driver uses extra elements in the
                common flash structure for storing flash geometry.
 
-- CFG_FLASH_CFI_DRIVER
+- CONFIG_FLASH_CFI_DRIVER
                This option also enables the building of the cfi_flash driver
                in the drivers directory
 
@@ -3030,8 +3036,9 @@ details; basically, the header defines the following image properties:
 
 * Target Operating System (Provisions for OpenBSD, NetBSD, FreeBSD,
   4.4BSD, Linux, SVR4, Esix, Solaris, Irix, SCO, Dell, NCR, VxWorks,
-  LynxOS, pSOS, QNX, RTEMS, ARTOS;
-  Currently supported: Linux, NetBSD, VxWorks, QNX, RTEMS, ARTOS, LynxOS).
+  LynxOS, pSOS, QNX, RTEMS, INTEGRITY;
+  Currently supported: Linux, NetBSD, VxWorks, QNX, RTEMS, LynxOS,
+  INTEGRITY).
 * Target CPU Architecture (Provisions for Alpha, ARM, AVR32, Intel x86,
   IA64, MIPS, NIOS, PowerPC, IBM S390, SuperH, Sparc, Sparc 64 Bit;
   Currently supported: ARM, AVR32, Intel x86, MIPS, NIOS, PowerPC).
@@ -3089,9 +3096,9 @@ But now you can ignore ALL boot loader code (in arch/ppc/mbxboot).
 
 Just make sure your machine specific header file (for instance
 include/asm-ppc/tqm8xx.h) includes the same definition of the Board
-Information structure as we define in include/u-boot.h, and make
-sure that your definition of IMAP_ADDR uses the same value as your
-U-Boot configuration in CFG_IMMR.
+Information structure as we define in include/asm-<arch>/u-boot.h,
+and make sure that your definition of IMAP_ADDR uses the same value
+as your U-Boot configuration in CFG_IMMR.
 
 
 Configuring the Linux kernel:
@@ -3903,7 +3910,7 @@ may be rejected, even when they contain important and valuable stuff.
 
 Patches shall be sent to the u-boot-users mailing list.
 
-Please see http://www.denx.de/wiki/UBoot/Patches for details.
+Please see http://www.denx.de/wiki/U-Boot/Patches for details.
 
 When you send a patch, please include the following information with
 it: