Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

[karo-tx-uboot.git] / board / bf561-ezkit / bf561-ezkit.c

diff --git a/board/bf561-ezkit/bf561-ezkit.c b/board/bf561-ezkit/bf561-ezkit.c
index a74ff0db6ead89e65ad5deece9b58d78ee958c0e..b2411b65bf65fc13c88f980f569045666da19f73 100644 (file)
--- a/board/bf561-ezkit/bf561-ezkit.c
+++ b/board/bf561-ezkit/bf561-ezkit.c
@@ -1,8 +1,7 @@
 /*
- * U-boot - ezkit561.c
+ * U-boot - main board file
  *
- * Copyright (c) 2005 Bas Vermeulen <bas@buyways.nl>
- * Copyright (c) 2005-2007 Analog Devices Inc.
+ * Copyright (c) 2005-2008 Analog Devices Inc.
  *
  * (C) Copyright 2000-2004
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
@@ -27,48 +26,21 @@
  */
 
 #include <common.h>
+#include <netdev.h>
 #include <asm/io.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
 int checkboard(void)
 {
-       printf("CPU:   ADSP BF561\n");
        printf("Board: ADI BF561 EZ-Kit Lite board\n");
        printf("       Support: http://blackfin.uclinux.org/\n");
        return 0;
 }
 
-phys_size_t initdram(int board_type)
+#ifdef CONFIG_SMC91111
+int board_eth_init(bd_t *bis)
 {
-#ifdef DEBUG
-       int brate;
-       char *tmp = getenv("baudrate");
-       brate = simple_strtoul(tmp, NULL, 16);
-       printf("Serial Port initialized with Baud rate = %x\n", brate);
-       printf("SDRAM attributes:\n");
-       printf("tRCD %d SCLK Cycles,tRP %d SCLK Cycles,tRAS %d SCLK Cycles"
-              "tWR %d SCLK Cycles,CAS Latency %d SCLK cycles \n",
-              3, 3, 6, 2, 3);
-       printf("SDRAM Begin: 0x%x\n", CONFIG_SYS_SDRAM_BASE);
-       printf("Bank size = %d MB\n", CONFIG_SYS_MAX_RAM_SIZE >> 20);
-#endif
-       gd->bd->bi_memstart = CONFIG_SYS_SDRAM_BASE;
-       gd->bd->bi_memsize = CONFIG_SYS_MAX_RAM_SIZE;
-       return CONFIG_SYS_MAX_RAM_SIZE;
-}
-
-#if defined(CONFIG_MISC_INIT_R)
-/* miscellaneous platform dependent initialisations */
-int misc_init_r(void)
-{
-       /* Keep PF12 low to be able to drive the USB-LAN Extender */
-       *pFIO0_DIR = 0x0000;
-       *pFIO0_FLAG_C = 0x1000; /* Clear PF12 */
-       SSYNC();
-       *pFIO0_POLAR = 0x0000;
-       SSYNC();
-
-       return 0;
+       return smc91111_initialize(0, CONFIG_SMC91111_BASE);
 }
 #endif