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

[platform/kernel/u-boot.git] / include / configs / tcm-bf537.h

diff --git a/include/configs/tcm-bf537.h b/include/configs/tcm-bf537.h
index 2375fc5..58bcdc8 100644 (file)
--- a/include/configs/tcm-bf537.h
+++ b/include/configs/tcm-bf537.h
@@ -55,7 +55,7 @@
 #define CONFIG_EBIU_AMBCTL0_VAL        (B1WAT_7 | B1RAT_11 | B1HT_2 | B1ST_3 | B0WAT_7 | B0RAT_11 | B0HT_2 | B0ST_3)
 #define CONFIG_EBIU_AMBCTL1_VAL        (B3WAT_7 | B3RAT_11 | B3HT_2 | B3ST_3 | B2WAT_7 | B2RAT_11 | B2HT_2 | B2ST_3)
 
-#define CONFIG_SYS_MONITOR_LEN (512 * 1024)
+#define CONFIG_SYS_MONITOR_LEN (768 * 1024)
 #define CONFIG_SYS_MALLOC_LEN  (128 * 1024)
 
 
@@ -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                tcm-bf537
 /* 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
@@ -145,6 +144,7 @@
 #define FLASHBOOT_ENV_SETTINGS \
        "flashboot=flread 20040000 1000000 300000;" \
        "bootm 0x1000000\0"
+#define CONFIG_BOARD_SIZE_LIMIT $$((384 * 1024))
 
 
 /*