Merge branch 'master' of git://git.denx.de/u-boot-net

[platform/kernel/u-boot.git] / include / configs / bct-brettl2.h

diff --git a/include/configs/bct-brettl2.h b/include/configs/bct-brettl2.h
index 0d9fe57..de60bb1 100644 (file)
--- a/include/configs/bct-brettl2.h
+++ b/include/configs/bct-brettl2.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - Configuration file for BF536 brettl2 board
+ * U-Boot - Configuration file for BF536 brettl2 board
  */
 
 #ifndef __CONFIG_BCT_BRETTL2_H__
@@ -7,14 +7,12 @@
 
 #include <asm/config-pre.h>
 
-
 /*
  * Processor Settings
  */
 #define CONFIG_BFIN_CPU             bf536-0.3
 #define CONFIG_BFIN_BOOT_MODE       BFIN_BOOT_BYPASS
 
-
 /*
  * Clock Settings
  *     CCLK = (CLKIN * VCO_MULT) / CCLK_DIV
@@ -39,14 +37,12 @@
 #define CONFIG_SCLK_DIV                        3
 #define CONFIG_VR_CTL_VAL      (VLEV_110 | GAIN_20 | FREQ_1000)
 
-
 /*
  * Memory Settings
  */
 #define CONFIG_MEM_ADD_WDTH    9
 #define CONFIG_MEM_SIZE                32
 
-
 /*
  * SDRAM Settings
  */
@@ -60,7 +56,6 @@
 #define CONFIG_SYS_MONITOR_LEN         (256 * 1024)
 #define CONFIG_SYS_MALLOC_LEN          (128 * 1024)
 
-
 /*
  * Network Settings
  */
@@ -73,10 +68,8 @@
 #define CONFIG_GATEWAYIP       192.168.233.1
 #define CONFIG_SERVERIP                192.168.233.53
 #define CONFIG_ROOTPATH                "/romfs/brettl2"
-#define CONFIG_LIB_RAND
 #endif
 
-
 /*
  * Flash Settings
  */
@@ -88,7 +81,6 @@
 #define CONFIG_SYS_MAX_FLASH_BANKS             1
 #define CONFIG_SYS_MAX_FLASH_SECT              135
 
-
 /*
  * Env Storage Settings
  */
@@ -116,25 +108,21 @@
        common/env_embedded.o (.text*);
 #endif
 
-
 /*
  * I2C Settings
  */
 #define CONFIG_SYS_I2C
 #define CONFIG_SYS_I2C_ADI
 
-
 /*
  * Misc Settings
  */
-#define CONFIG_BOOTDELAY       1
 #define CONFIG_LOADADDR                0x800000
 #define CONFIG_MISC_INIT_R
 #define CONFIG_UART_CONSOLE    0
 #define CONFIG_BAUDRATE                115200
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
-#define CONFIG_SYS_HUSH_PARSER
 
 /*
  * Pull in common ADI header for remaining command/environment setup