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.lynxkdi | |
| 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.lynxkdi')
| -rw-r--r-- | doc/README.lynxkdi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/README.lynxkdi b/doc/README.lynxkdi index 8fdf495..076f018 100644 --- a/doc/README.lynxkdi +++ b/doc/README.lynxkdi @@ -39,9 +39,9 @@ modifications to the config file. Edit include/configs/MPC8260ADS.h to use the following: -#define CFG_IMMR 0xFA200000 -#define CFG_BCSR 0xFA100000 -#define CFG_BR1_PRELIM 0xFA101801 +#define CONFIG_SYS_IMMR 0xFA200000 +#define CONFIG_SYS_BCSR 0xFA100000 +#define CONFIG_SYS_BR1_PRELIM 0xFA101801 When creating a LynxOS or BlueCat u-boot image using mkimage, you must specify the following: |