Merge branch 'tx6-update-2016-02-03' into karo-tx6

[karo-tx-uboot.git] / include / configs / stm32f429-discovery.h

diff --git a/include/configs/stm32f429-discovery.h b/include/configs/stm32f429-discovery.h
index 7f569fdac815ded0f72ab3cb32f1554e5c339f29..19d9cf9abf329fb46b050db686f18f28128e38a6 100644 (file)
--- a/include/configs/stm32f429-discovery.h
+++ b/include/configs/stm32f429-discovery.h
@@ -15,6 +15,7 @@
 #define CONFIG_OF_LIBFDT
 
 #define CONFIG_BOARD_EARLY_INIT_F
+#define CONFIG_MISC_INIT_R
 
 #define CONFIG_SYS_FLASH_BASE          0x08000000
 
@@ -50,11 +51,19 @@
 
 #define CONFIG_STM32_GPIO
 #define CONFIG_STM32_SERIAL
-
-#define CONFIG_STM32_USART1
+/*
+ * Configuration of the USART
+ * 1:   TX:PA9  RX:PA10
+ * 2:   TX:PD5  RX:PD6
+ * 3:   TX:PC10 RX:PC11
+ * 6:   TX:PG14 RX:PG9
+ */
+#define CONFIG_STM32_USART             1
 
 #define CONFIG_STM32_HSE_HZ            8000000
 
+#define CONFIG_SYS_CLK_FREQ            180000000 /* 180 MHz */
+
 #define CONFIG_SYS_HZ_CLOCK            1000000 /* Timer is clocked at 1MHz */
 
 #define CONFIG_CMDLINE_TAG
@@ -74,7 +83,7 @@
 
 #define CONFIG_BAUDRATE                        115200
 #define CONFIG_BOOTARGS                                                        \
-       "console=ttystm0,115200 earlyprintk consoleblank=0 ignore_loglevel"
+       "console=ttyS0,115200 earlyprintk consoleblank=0 ignore_loglevel"
 #define CONFIG_BOOTCOMMAND                                             \
        "run bootcmd_romfs"
 
@@ -89,18 +98,12 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT             "U-Boot > "
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_CMDLINE_EDITING
 
-#define CONFIG_CMD_FLASH
-#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_MEM
-#define CONFIG_CMD_MISC
 #define CONFIG_CMD_TIMER
 
 #endif /* __CONFIG_H */