diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-09-03 22:55:55 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-09-03 22:55:55 +0200 |
| commit | 4615fc22e539a2f7dae971701c05f09e21c1ca25 (patch) | |
| tree | 21521ea036a6339414051ba8fc37106fbcdcc1d3 /board/esd/cms700/cms700.c | |
| parent | 16116ddd0d0158f4e91c91dc979b845b6e98a99d (diff) | |
| parent | 7deb3b3ecd0e81ef09bb68aa0ec2346f4ae0a405 (diff) | |
| download | u-boot-4615fc22e539a2f7dae971701c05f09e21c1ca25.zip u-boot-4615fc22e539a2f7dae971701c05f09e21c1ca25.tar.gz u-boot-4615fc22e539a2f7dae971701c05f09e21c1ca25.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Conflicts:
board/esd/dasa_sim/dasa_sim.c
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'board/esd/cms700/cms700.c')
| -rw-r--r-- | board/esd/cms700/cms700.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/board/esd/cms700/cms700.c b/board/esd/cms700/cms700.c index ba27c03..806c755 100644 --- a/board/esd/cms700/cms700.c +++ b/board/esd/cms700/cms700.c @@ -77,15 +77,6 @@ int board_early_init_f (void) return 0; } - -/* ------------------------------------------------------------------------- */ - -int misc_init_f (void) -{ - return 0; /* dummy implementation */ -} - - int misc_init_r (void) { /* adjust flash start and offset */ @@ -141,18 +132,6 @@ int checkboard (void) /* ------------------------------------------------------------------------- */ -phys_size_t initdram (int board_type) -{ - unsigned long val; - - mtdcr(memcfga, mem_mb0cf); - val = mfdcr(memcfgd); - - return (4*1024*1024 << ((val & 0x000e0000) >> 17)); -} - -/* ------------------------------------------------------------------------- */ - #if defined(CFG_EEPROM_WREN) /* Input: <dev_addr> I2C address of EEPROM device to enable. * <state> -1: deliver current state |