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 09691d37377410b04f739cb039053471452e8b52..06f095cc41b5e51e8563c62d118569f92a065da1 100644 (file)
--- a/include/configs/bct-brettl2.h
+++ b/include/configs/bct-brettl2.h
@@ -11,6 +11,7 @@
 /*
  * Processor Settings
  */
+#define CONFIG_BFIN_CPU             bf536-0.3
 #define CONFIG_BFIN_BOOT_MODE       BFIN_BOOT_BYPASS
 
 
@@ -21,11 +22,11 @@
  */
 /* CONFIG_CLKIN_HZ is any value in Hz                                  */
 #define CONFIG_CLKIN_HZ                        16384000
-/* CLKIN_HALF controls the DF bit in PLL_CTL      0 = CLKIN            */
-/*                                                1 = CLKIN / 2                */
+/* CLKIN_HALF controls the DF bit in PLL_CTL     0 = CLKIN             */
+/*                                               1 = CLKIN / 2         */
 #define CONFIG_CLKIN_HALF              0
 /* PLL_BYPASS controls the BYPASS bit in PLL_CTL  0 = do not bypass    */
-/*                                                1 = bypass PLL       */
+/*                                               1 = bypass PLL        */
 #define CONFIG_PLL_BYPASS              0
 /* VCO_MULT controls the MSEL (multiplier) bits in PLL_CTL             */
 /* Values can range from 0-63 (where 0 means 64)                       */
@@ -36,7 +37,7 @@
 /* SCLK_DIV controls the system clock divider                          */
 /* Values can range from 1-15                                          */
 #define CONFIG_SCLK_DIV                        3
-#define CONFIG_VR_CTL_VAL       (VLEV_110 | GAIN_20 | FREQ_1000)
+#define CONFIG_VR_CTL_VAL      (VLEV_110 | GAIN_20 | FREQ_1000)
 
 
 /*
@@ -67,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
@@ -111,13 +111,10 @@
  * it linked after the configuration sector.
  */
 # define LDS_BOARD_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.*); \
-        . = DEFINED(env_offset) ? env_offset : .; \
-        common/env_embedded.o           (.text .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
 
 
@@ -139,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