diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-10-18 21:59:44 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-10-18 21:59:44 +0200 |
| commit | f82642e33899766892499b163e60560fbbf87773 (patch) | |
| tree | ab90f076f18e56b2b3e8c9375b95917daa78c1d9 /doc/README.MBX | |
| parent | b59b16ca24bc7e77ec113021a6d77b9b32fcf192 (diff) | |
| parent | 360fe71e82b83e264c964c9447c537e9a1f643c8 (diff) | |
| download | u-boot-imx-f82642e33899766892499b163e60560fbbf87773.zip u-boot-imx-f82642e33899766892499b163e60560fbbf87773.tar.gz u-boot-imx-f82642e33899766892499b163e60560fbbf87773.tar.bz2 | |
Merge 'next' branch
Conflicts:
board/freescale/mpc8536ds/mpc8536ds.c
include/configs/mgcoge.h
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'doc/README.MBX')
| -rw-r--r-- | doc/README.MBX | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/README.MBX b/doc/README.MBX index 679228e..c889fe9 100644 --- a/doc/README.MBX +++ b/doc/README.MBX @@ -1,4 +1,4 @@ -IMPORTANT NOTE - read before defining CFG_USE_OSCCLK in your board +IMPORTANT NOTE - read before defining CONFIG_SYS_USE_OSCCLK in your board config file!!! @@ -62,7 +62,7 @@ firmware opts for the NASTY timing loops, but needs to configure the serial ports to do so. -You may have a legitimate need to define CFG_USE_OSCCLK if your +You may have a legitimate need to define CONFIG_SYS_USE_OSCCLK if your MBX8xx board is using the OSCM clocking mode. You better know what you are doing here. |