X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=board%2Famcc%2Ftaihu%2Ftaihu.c;h=ee0939aa3cdb737dc95ca185874700e2764241cd;hb=225f0eaa745adfae05931848543d99942798756a;hp=891b4d924980fc6d8fbf3919198b5899b06b79ec;hpb=e44f3ea4e801d37ef293284cb57b9637382f211a;p=oweals%2Fu-boot.git diff --git a/board/amcc/taihu/taihu.c b/board/amcc/taihu/taihu.c index 891b4d9249..ee0939aa3c 100644 --- a/board/amcc/taihu/taihu.c +++ b/board/amcc/taihu/taihu.c @@ -28,6 +28,7 @@ #include #include #include +#include #include extern int lcd_init(void); @@ -77,15 +78,6 @@ int checkboard(void) return 0; } -/************************************************************************* - * long int initdram - * - ************************************************************************/ -long int initdram(int board) -{ - return CFG_SDRAM_SIZE_PER_BANK * CFG_SDRAM_BANKS; /* 128Mbytes */ -} - static int do_sw_stat(cmd_tbl_t* cmd_tp, int flags, int argc, char *argv[]) { char stat; @@ -201,44 +193,7 @@ int pci_pre_init(struct pci_controller *hose) } #endif /* CONFIG_PCI */ -#ifdef CFG_DRAM_TEST -int testdram(void) +int board_eth_init(bd_t *bis) { - unsigned long *mem = (unsigned long *)0; - const unsigned long kend = (1024 / sizeof(unsigned long)); - unsigned long k, n; - unsigned long msr; - unsigned long total_kbytes = CFG_SDRAM_SIZE_PER_BANK * CFG_SDRAM_BANKS / 1024; - - msr = mfmsr(); - mtmsr(msr & ~(MSR_EE)); - - for (k = 0; k < total_kbytes ; - ++k, mem += (1024 / sizeof(unsigned long))) { - if ((k & 1023) == 0) - printf("%3d MB\r", k / 1024); - - memset(mem, 0xaaaaaaaa, 1024); - for (n = 0; n < kend; ++n) { - if (mem[n] != 0xaaaaaaaa) { - printf("SDRAM test fails at: %08x\n", - (uint) & mem[n]); - return 1; - } - } - - memset(mem, 0x55555555, 1024); - for (n = 0; n < kend; ++n) { - if (mem[n] != 0x55555555) { - printf("SDRAM test fails at: %08x\n", - (uint) & mem[n]); - return 1; - } - } - } - printf("SDRAM test passes\n"); - mtmsr(msr); - - return 0; + return pci_eth_init(bis); } -#endif /* CFG_DRAM_TEST */