Merge with git+ssh://gemini/home/wd/git/u-boot/master

diff --git a/include/common.h b/include/common.h
index d6286bc..9a5a0ab 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -565,7 +565,7 @@ ulong       bootcount_load (void);
 #define BOOTCOUNT_MAGIC                0xB001C041
 
 /* $(CPU)/.../<eth> */
-/*void mii_init (void);*/
+void mii_init (void);
 
 /* $(CPU)/.../lcd.c */
 ulong  lcd_setmem (ulong);

diff --git a/include/configs/cmi_mpc5xx.h b/include/configs/cmi_mpc5xx.h
index cd92af2..85c2b96 100644 (file)
--- a/include/configs/cmi_mpc5xx.h
+++ b/include/configs/cmi_mpc5xx.h
@@ -59,6 +59,8 @@
  */
 #include <config_cmd_default.h>
 
+#undef CONFIG_CMD_NET          /* disabeled - causes compile errors */
+
 #define CONFIG_CMD_MEMORY
 #define CONFIG_CMD_LOADB
 #define CONFIG_CMD_REGINFO