Merge branch 'master' of ssh://10.10.0.7/home/wd/git/u-boot/master

[u-boot] / README

diff --git a/README b/README
index ec164ade228dd19b70eb8da6817ecb613938b374..b5e40862b9940da24b1474595a532fe6c6e43095 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.
 
@@ -3030,8 +3030,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).