diff options
| author | wdenk <wdenk> | 2004-01-06 22:38:14 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2004-01-06 22:38:14 +0000 |
| commit | c83bf6a2d00ef846c1fb2b0c60540f03ef203125 (patch) | |
| tree | e410334c86d491dbbec765a5765eef9cccd3135a /board/cpc45 | |
| parent | b299e41a0d34bf96202d9bbb72739bdd9414b0cc (diff) | |
| download | u-boot-c83bf6a2d00ef846c1fb2b0c60540f03ef203125.zip u-boot-c83bf6a2d00ef846c1fb2b0c60540f03ef203125.tar.gz u-boot-c83bf6a2d00ef846c1fb2b0c60540f03ef203125.tar.bz2 | |
Add a common get_ram_size() function and modify the the
board-specific files to invoke that common implementation.
Diffstat (limited to 'board/cpc45')
| -rw-r--r-- | board/cpc45/cpc45.c | 63 |
1 files changed, 18 insertions, 45 deletions
diff --git a/board/cpc45/cpc45.c b/board/cpc45/cpc45.c index 08bff49..455cc12 100644 --- a/board/cpc45/cpc45.c +++ b/board/cpc45/cpc45.c @@ -60,51 +60,24 @@ int checkboard(void) long int initdram(int board_type) { - int i, cnt; - volatile uchar * base = CFG_SDRAM_BASE; - volatile ulong * addr; - ulong save[32]; - ulong val, ret = 0; - - for (i=0, cnt=(CFG_MAX_RAM_SIZE / sizeof(long)) >> 1; cnt > 0; cnt >>= 1) { - - addr = (volatile ulong *)base + cnt; - save[i++] = *addr; - *addr = ~cnt; - } - - addr = (volatile ulong *)base; - save[i] = *addr; - *addr = 0; - - if (*addr != 0) { - *addr = save[i]; - goto Done; - } - - for (cnt = 1; cnt <= CFG_MAX_RAM_SIZE / sizeof(long); cnt <<= 1) { - addr = (volatile ulong *)base + cnt; - val = *addr; - *addr = save[--i]; - if (val != ~cnt) { - ulong new_bank0_end = cnt * sizeof(long) - 1; - ulong mear1 = mpc824x_mpc107_getreg(MEAR1); - ulong emear1 = mpc824x_mpc107_getreg(EMEAR1); - mear1 = (mear1 & 0xFFFFFF00) | - ((new_bank0_end & MICR_ADDR_MASK) >> MICR_ADDR_SHIFT); - emear1 = (emear1 & 0xFFFFFF00) | - ((new_bank0_end & MICR_ADDR_MASK) >> MICR_EADDR_SHIFT); - mpc824x_mpc107_setreg(MEAR1, mear1); - mpc824x_mpc107_setreg(EMEAR1, emear1); - - ret = cnt * sizeof(long); - goto Done; - } - } - - ret = CFG_MAX_RAM_SIZE; -Done: - return ret; + long size; + long new_bank0_end; + long mear1; + long emear1; + + size = get_ram_size(CFG_SDRAM_BASE, CFG_MAX_RAM_SIZE); + + new_bank0_end = size - 1; + mear1 = mpc824x_mpc107_getreg(MEAR1); + emear1 = mpc824x_mpc107_getreg(EMEAR1); + mear1 = (mear1 & 0xFFFFFF00) | + ((new_bank0_end & MICR_ADDR_MASK) >> MICR_ADDR_SHIFT); + emear1 = (emear1 & 0xFFFFFF00) | + ((new_bank0_end & MICR_ADDR_MASK) >> MICR_EADDR_SHIFT); + mpc824x_mpc107_setreg(MEAR1, mear1); + mpc824x_mpc107_setreg(EMEAR1, emear1); + + return (size); } /* |