Kconfig: Migrate CONFIG_BAUDRATE

[people/ms/u-boot.git] / include / configs / cm-bf561.h

diff --git a/include/configs/cm-bf561.h b/include/configs/cm-bf561.h
index 1741ed493211d9306a77b769097351ad5e88713e..ac1646cf715b10e798fb81352ebdefa3a4b09507 100644 (file)
--- a/include/configs/cm-bf561.h
+++ b/include/configs/cm-bf561.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - Configuration file for CM-BF561 board
+ * U-Boot - Configuration file for CM-BF561 board
  */
 
 #ifndef __CONFIG_CM_BF561_H__
@@ -7,14 +7,12 @@
 
 #include <asm/config-pre.h>
 
-
 /*
  * Processor Settings
  */
 #define CONFIG_BFIN_CPU             bf561-0.3
 #define CONFIG_BFIN_BOOT_MODE       BFIN_BOOT_PARA
 
-
 /*
  * Clock Settings
  *     CCLK = (CLKIN * VCO_MULT) / CCLK_DIV
@@ -41,7 +39,6 @@
 /* Decrease core voltage */
 #define CONFIG_VR_CTL_VAL (VLEV_110 | GAIN_20 | FREQ_1000)
 
-
 /*
  * Memory Settings
  */
@@ -58,23 +55,14 @@
 #define CONFIG_SYS_MONITOR_LEN (256 * 1024)
 #define CONFIG_SYS_MALLOC_LEN  (128 * 1024)
 
-
 /*
  * Network Settings
  */
 #define ADI_CMDS_NETWORK       1
-/* The next 2 lines are for use with DEV-BF5xx */
-#define CONFIG_NET_MULTI
-#define CONFIG_SMC91111        1
-#define CONFIG_SMC91111_BASE   0x28000300
-/* The next 3 lines are for use with EXT-BF5xx-USB-ETH2 */
-/* #define CONFIG_DRIVER_SMC911X 1 */
-/* #define CONFIG_DRIVER_SMC911X_BASE 0x24080000 /! AMS1 */
-/* #define CONFIG_DRIVER_SMC911X_32_BIT 1 */
+#define CONFIG_SMC911X         1
+#define CONFIG_SMC911X_BASE    0x24008000 /* AMS1 */
+#define CONFIG_SMC911X_16_BIT
 #define CONFIG_HOSTNAME                cm-bf561
-/* Uncomment next line to use fixed MAC address */
-/* #define CONFIG_ETHADDR      02:80:ad:20:31:cf */
-
 
 /*
  * Flash Settings
@@ -86,7 +74,6 @@
 #define CONFIG_SYS_MAX_FLASH_BANKS     1
 #define CONFIG_SYS_MAX_FLASH_SECT      67
 
-
 /*
  * Env Storage Settings
  */
@@ -94,17 +81,15 @@
 #define CONFIG_ENV_OFFSET      0x20000
 #define CONFIG_ENV_SECT_SIZE   0x20000
 #define CONFIG_ENV_SIZE                0x10000
-
+#define CONFIG_ENV_IS_EMBEDDED_IN_LDR
 
 /*
  * Misc Settings
  */
-#define CONFIG_BAUDRATE                115200
 #define CONFIG_UART_CONSOLE    0
 #define CONFIG_BOOTCOMMAND     "run flashboot"
 #define FLASHBOOT_ENV_SETTINGS "flashboot=bootm 0x20040000\0"
 
-
 /*
  * Pull in common ADI header for remaining command/environment setup
  */