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 /board/sl8245/sl8245.c | |
| parent | 9dbc366744960013965fce8851035b6141f3b3ae (diff) | |
| parent | f82642e33899766892499b163e60560fbbf87773 (diff) | |
| download | u-boot-50bd0057ba8fceeb48533f8b1a652ccd0e170838.tar.gz | |
Merge git://git.denx.de/u-boot into x1
Conflicts:
drivers/usb/usb_ohci.c
Diffstat (limited to 'board/sl8245/sl8245.c')
| -rw-r--r-- | board/sl8245/sl8245.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/board/sl8245/sl8245.c b/board/sl8245/sl8245.c index 25adc2832db..e849e013d3f 100644 --- a/board/sl8245/sl8245.c +++ b/board/sl8245/sl8245.c @@ -37,13 +37,13 @@ int checkboard (void) phys_size_t initdram (int board_type) { -#ifndef CFG_RAMBOOT +#ifndef CONFIG_SYS_RAMBOOT long size; long new_bank0_end; long mear1; long emear1; - size = get_ram_size(CFG_SDRAM_BASE, CFG_MAX_RAM_SIZE); + size = get_ram_size(CONFIG_SYS_SDRAM_BASE, CONFIG_SYS_MAX_RAM_SIZE); new_bank0_end = size - 1; mear1 = mpc824x_mpc107_getreg(MEAR1); @@ -57,7 +57,7 @@ phys_size_t initdram (int board_type) return (size); #else - return CFG_MAX_RAM_SIZE; + return CONFIG_SYS_MAX_RAM_SIZE; #endif } |