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

[u-boot] / board / esd / adciop / adciop.c

diff --git a/board/esd/adciop/adciop.c b/board/esd/adciop/adciop.c
index 93bc8431bf95935d73dcc8a4885bd6e7de823932..8e007856be0485d2ddbf264d93f6709f95c0c4b5 100644 (file)
--- a/board/esd/adciop/adciop.c
+++ b/board/esd/adciop/adciop.c
@@ -22,6 +22,7 @@
  */
 
 #include <common.h>
+#include <netdev.h>
 #include "adciop.h"
 
 /* ------------------------------------------------------------------------- */
@@ -60,8 +61,8 @@ int board_early_init_f (void)
 
 int checkboard (void)
 {
-       unsigned char str[64];
-       int i = getenv_r ("serial#", str, sizeof (str));
+       char str[64];
+       int i = getenv_f("serial#", str, sizeof (str));
 
        puts ("Board: ");
 
@@ -79,7 +80,7 @@ int checkboard (void)
 
 /* ------------------------------------------------------------------------- */
 
-long int initdram (int board_type)
+phys_size_t initdram (int board_type)
 {
        return (16 * 1024 * 1024);
 }
@@ -95,3 +96,8 @@ int testdram (void)
 }
 
 /* ------------------------------------------------------------------------- */
+
+int board_eth_init(bd_t *bis)
+{
+       return pci_eth_init(bis);
+}