Merge branch 'master' of /home/wd/git/u-boot/master

[u-boot] / include / configs / ibf-dsp561.h

diff --git a/include/configs/ibf-dsp561.h b/include/configs/ibf-dsp561.h
index 6fa8cf7a9156ce82f8376c1f23ad8f0694613af8..2c0a263da293c6e6b36cde1a1304336d0910628f 100644 (file)
--- a/include/configs/ibf-dsp561.h
+++ b/include/configs/ibf-dsp561.h
@@ -57,6 +57,18 @@
 #define CONFIG_SYS_MALLOC_LEN  (128 * 1024)
 
 
+/*
+ * Network Settings
+ */
+#define ADI_CMDS_NETWORK       1
+#define CONFIG_NET_MULTI
+#define CONFIG_DRIVER_AX88180  1
+#define AX88180_BASE           0x2c000000
+#define CONFIG_HOSTNAME                ibf-dsp561
+/* Uncomment next line to use fixed MAC address */
+/* #define CONFIG_ETHADDR      02:80:ad:20:31:e8 */
+
+
 /*
  * Flash Settings
  */
@@ -84,9 +96,9 @@
  * it linked after the configuration sector.
  */
 # define LDS_BOARD_TEXT \
-       cpu/blackfin/traps.o            (.text .text.*); \
-       cpu/blackfin/interrupt.o        (.text .text.*); \
-       cpu/blackfin/serial.o           (.text .text.*); \
+       arch/blackfin/cpu/traps.o               (.text .text.*); \
+       arch/blackfin/cpu/interrupt.o   (.text .text.*); \
+       arch/blackfin/cpu/serial.o              (.text .text.*); \
        common/dlmalloc.o               (.text .text.*); \
        lib/crc32.o             (.text .text.*); \
        lib/zlib.o              (.text .text.*); \
@@ -126,8 +138,6 @@
        } while (0)
 #define I2C_DELAY              udelay(5)       /* 1/4 I2C clock duration */
 
-#define CONFIG_SYS_I2C_SPEED   50000
-#define CONFIG_SYS_I2C_SLAVE   0
 #endif