env_eeprom: Move conditional compilation to Makefile

[u-boot] / README

diff --git a/README b/README
index 37449d161014fe13d9a3c8b73f6b90768f94682e..48232553f1d0637899d9bc853d345de9856d9799 100644 (file)
--- a/README
+++ b/README
@@ -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
@@ -2193,7 +2199,7 @@ keep settings there always unmodified except somebody uses "saveenv"
 to save the current settings.
 
 
-- CFG_ENV_IS_IN_EEPROM:
+- CONFIG_ENV_IS_IN_EEPROM:
 
        Use this if you have an EEPROM or similar serial access
        device and a driver for it.
@@ -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: