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 /onenand_ipl/onenand_read.c | |
| 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 'onenand_ipl/onenand_read.c')
| -rw-r--r-- | onenand_ipl/onenand_read.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/onenand_ipl/onenand_read.c b/onenand_ipl/onenand_read.c index 669b1ef..6d04943 100644 --- a/onenand_ipl/onenand_read.c +++ b/onenand_ipl/onenand_read.c @@ -67,7 +67,7 @@ static inline int onenand_read_page(ulong block, ulong page, #ifndef __HAVE_ARCH_MEMCPY32 p = (unsigned long *) buf; #endif - base = (unsigned long *) (CFG_ONENAND_BASE + ONENAND_DATARAM); + base = (unsigned long *) (CONFIG_SYS_ONENAND_BASE + ONENAND_DATARAM); while (!(READ_INTERRUPT() & ONENAND_INT_READ)) continue; |