diff options
| author | Markus Klotzbuecher <mk@denx.de> | 2008-10-21 09:18:01 +0200 |
|---|---|---|
| committer | Markus Klotzbuecher <mk@denx.de> | 2008-10-21 09:18:01 +0200 |
| commit | 50bd0057ba8fceeb48533f8b1a652ccd0e170838 (patch) | |
| tree | ea1a183343573c2a48248923b96d316c0956727c /onenand_ipl/onenand_read.c | |
| parent | 9dbc366744960013965fce8851035b6141f3b3ae (diff) | |
| parent | f82642e33899766892499b163e60560fbbf87773 (diff) | |
| download | blackbird-obmc-uboot-50bd0057ba8fceeb48533f8b1a652ccd0e170838.tar.gz blackbird-obmc-uboot-50bd0057ba8fceeb48533f8b1a652ccd0e170838.zip | |
Merge git://git.denx.de/u-boot into x1
Conflicts:
drivers/usb/usb_ohci.c
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 669b1ef5fa..6d04943ba1 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; |
