Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

[karo-tx-uboot.git] / include / configs / cm-bf537e.h

diff --git a/include/configs/cm-bf537e.h b/include/configs/cm-bf537e.h
index 9649e18f7a61e4a6e0b40b62db03cbec8f7b2f13..8f10eba4677cefa5d8888a2dda1da19b6f5d7011 100644 (file)
--- a/include/configs/cm-bf537e.h
+++ b/include/configs/cm-bf537e.h
@@ -69,7 +69,6 @@
 #define CONFIG_SMC911X_BASE    0x20308000
 #define CONFIG_SMC911X_16_BIT
 #define CONFIG_NETCONSOLE      1
-#define CONFIG_NET_MULTI       1
 #endif
 #define CONFIG_HOSTNAME                cm-bf537e
 /* Uncomment next line to use fixed MAC address */
@@ -113,8 +112,8 @@
  * it linked after the configuration sector.
  */
 # define LDS_BOARD_TEXT \
-       arch/blackfin/lib/libblackfin.o (.text*); \
-       arch/blackfin/cpu/libblackfin.o (.text*); \
+       arch/blackfin/lib/built-in.o (.text*); \
+       arch/blackfin/cpu/built-in.o (.text*); \
        . = DEFINED(env_offset) ? env_offset : .; \
        common/env_embedded.o (.text*);
 #endif