Merge branch 'u-boot/master'

[karo-tx-uboot.git] / include / configs / bct-brettl2.h

diff --git a/include/configs/bct-brettl2.h b/include/configs/bct-brettl2.h
index a55e1786dd54ba2654c3e3baa6aad58d482e64b1..06f095cc41b5e51e8563c62d118569f92a065da1 100644 (file)
--- a/include/configs/bct-brettl2.h
+++ b/include/configs/bct-brettl2.h
@@ -68,12 +68,11 @@
 #define ADI_CMDS_NETWORK       1
 #define CONFIG_BFIN_MAC                1
 #define CONFIG_NETCONSOLE      1
-#define CONFIG_NET_MULTI       1
 #define CONFIG_HOSTNAME                brettl2
 #define CONFIG_IPADDR          192.168.233.224
 #define CONFIG_GATEWAYIP       192.168.233.1
 #define CONFIG_SERVERIP                192.168.233.53
-#define CONFIG_ROOTPATH                /romfs/brettl2
+#define CONFIG_ROOTPATH                "/romfs/brettl2"
 /* Uncomment next line to use fixed MAC address */
 /* #define CONFIG_ETHADDR      02:80:ad:20:31:e8 */
 #endif
@@ -112,8 +111,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
@@ -137,8 +136,7 @@
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-
+#define CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED
 
 /*
  * Pull in common ADI header for remaining command/environment setup