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/dasa_sim/dasa_sim.c | |
| parent | 16116ddd0d0158f4e91c91dc979b845b6e98a99d (diff) | |
| parent | 7deb3b3ecd0e81ef09bb68aa0ec2346f4ae0a405 (diff) | |
| download | blackbird-obmc-uboot-4615fc22e539a2f7dae971701c05f09e21c1ca25.tar.gz blackbird-obmc-uboot-4615fc22e539a2f7dae971701c05f09e21c1ca25.zip | |
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/dasa_sim/dasa_sim.c')
| -rw-r--r-- | board/esd/dasa_sim/dasa_sim.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/board/esd/dasa_sim/dasa_sim.c b/board/esd/dasa_sim/dasa_sim.c index e061878b62..47d6bb3cc7 100644 --- a/board/esd/dasa_sim/dasa_sim.c +++ b/board/esd/dasa_sim/dasa_sim.c @@ -204,27 +204,7 @@ int checkboard (void) return 0; } - -/* ------------------------------------------------------------------------- */ - phys_size_t initdram (int board_type) { return (16 * 1024 * 1024); } - -/* ------------------------------------------------------------------------- */ - -int testdram (void) -{ - /* TODO: XXX XXX XXX */ - printf ("test: 16 MB - ok\n"); - - return (0); -} - -/* ------------------------------------------------------------------------- */ - -int board_eth_init(bd_t *bis) -{ - return pci_eth_init(bis); -} |
