Move this in to Kconfig with a default of 115200. Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> [trini: Run moveconfig.py, reword commit slightly] Signed-off-by: Tom Rini <trini@konsulko.com>
@@ -12,4 +12,5 @@ CONFIG_CMD_I2C=y
# CONFIG_CMD_NFS is not set
# CONFIG_MMC is not set
CONFIG_MTD_NOR_FLASH=y
+CONFIG_BAUDRATE=9600
CONFIG_SYS_NS16550=y
@@ -19,5 +19,6 @@ CONFIG_CMD_FAT=y
CONFIG_MAC_PARTITION=y
CONFIG_OF_LIBFDT=y
@@ -22,6 +22,7 @@ CONFIG_MAC_PARTITION=y
CONFIG_ISO_PARTITION=y
CONFIG_CONSOLE_EXTRA_INFO=y
CONFIG_VIDEO_CT69000=y
@@ -23,6 +23,7 @@ CONFIG_MAC_PARTITION=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
@@ -22,3 +22,4 @@ CONFIG_SYS_PROMPT="pati=> "
# CONFIG_PCI is not set
@@ -20,6 +20,7 @@ CONFIG_CMD_UBI=y
@@ -14,5 +14,6 @@ CONFIG_CMD_PING=y
@@ -18,6 +18,7 @@ CONFIG_CMD_FAT=y
@@ -10,4 +10,5 @@ CONFIG_CMD_EXT2=y
CONFIG_CMD_FAT=y
CONFIG_MMC=y
+CONFIG_BAUDRATE=38400
@@ -26,5 +26,6 @@ CONFIG_CMD_FAT=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_BAR=y
CONFIG_SPI_FLASH_SPANSION=y
@@ -21,4 +21,5 @@ CONFIG_CMD_PING=y
CONFIG_CMD_EXT2=y
CONFIG_DOS_PARTITION=y
CONFIG_USE_PRIVATE_LIBGCC=y
@@ -13,3 +13,4 @@ CONFIG_CMD_CACHE=y
CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_BAUDRATE=57600
@@ -16,5 +16,6 @@ CONFIG_CMD_DNS=y
CONFIG_CMD_CACHE=y
CONFIG_SPI_FLASH_ATMEL=y
CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
CONFIG_LIB_RAND=y
@@ -10,3 +10,4 @@ CONFIG_CMD_PING=y
@@ -11,3 +11,4 @@ CONFIG_CMD_PING=y
@@ -24,3 +24,4 @@ CONFIG_MTD_NOR_FLASH=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
@@ -19,6 +19,7 @@ CONFIG_ISO_PARTITION=y
@@ -9,3 +9,4 @@ CONFIG_SYS_PROMPT="COBRA > "
# CONFIG_CMD_SETEXPR is not set
CONFIG_CMD_PING=y
+CONFIG_BAUDRATE=19200
@@ -26,6 +26,7 @@ CONFIG_ROCKCHIP_RK3328_PINCTRL=y
CONFIG_REGULATOR_PWM=y
CONFIG_DM_REGULATOR_FIXED=y
CONFIG_RAM=y
+CONFIG_BAUDRATE=1500000
CONFIG_DEBUG_UART=y
CONFIG_DEBUG_UART_BASE=0xFF130000
CONFIG_DEBUG_UART_CLOCK=24000000
@@ -43,6 +43,7 @@ CONFIG_DM_REGULATOR_FIXED=y
CONFIG_PWM_ROCKCHIP=y
CONFIG_SPL_RAM=y
CONFIG_DEBUG_UART_BASE=0xFF1A0000
@@ -7,3 +7,4 @@ CONFIG_BOOTDELAY=5
@@ -16,6 +16,7 @@ CONFIG_BOOTDELAY=5
# CONFIG_CMD_NET is not set
CONFIG_SYS_AMBAPP_PRINT_ON_STARTUP=y
CONFIG_DEBUG_UART_APBUART=y
CONFIG_DEBUG_UART_BASE=0x80000100
@@ -15,3 +15,4 @@ CONFIG_BOOTDELAY=5
@@ -11,4 +11,5 @@ CONFIG_CMD_ARMFLASH=y
CONFIG_PCI=y
@@ -10,4 +10,5 @@ CONFIG_CMD_ARMFLASH=y
@@ -15,4 +15,5 @@ CONFIG_CMD_FAT=y
@@ -22,4 +22,5 @@ CONFIG_BOOTDELAY=-1
# CONFIG_CMD_MISC is not set
@@ -19,4 +19,5 @@ CONFIG_CMD_MMC=y
@@ -18,4 +18,5 @@ CONFIG_CMD_MMC=y
@@ -11,5 +11,6 @@ CONFIG_CMD_MII=y
@@ -4,6 +4,15 @@
menu "Serial drivers"
+config BAUDRATE
+ int "Default baudrate"
+ default 115200
+ help
+ Select a default baudrate, where "default" has a driver-specific
+ meaning of either setting the baudrate for the early debug UART
+ in the SPL stage (most drivers) or for choosing a default baudrate
+ in the absence of an environment setting (serial_mxc.c).
+
config REQUIRE_SERIAL_CONSOLE
bool "Require a serial port for console"
# Running without a serial console is not supported by the
@@ -17,7 +17,6 @@
/*
* SERIAL
*/
-#define CONFIG_BAUDRATE 115200
#define CONFIG_SYS_NS16550_MEM32
* CFI Flash
@@ -770,9 +770,6 @@ unsigned long get_board_ddr_clk(void);
/* default location for tftp and bootm */
#define CONFIG_LOADADDR 1000000
-
#define __USB_PHY_TYPE ulpi
#ifdef CONFIG_ARCH_B4860
@@ -365,8 +365,6 @@ extern unsigned long get_sdram_size(void);
#define CONFIG_BOOTFILE "uImage"
#define CONFIG_UBOOTPATH "u-boot.bin" /* U-Boot image on TFTP server */
#define CONFIG_EXTRA_ENV_SETTINGS \
"netdev=eth0\0" \
"uboot=" CONFIG_UBOOTPATH "\0" \
@@ -590,8 +590,6 @@ combinations. this should be removed later
#define CONFIG_UBOOTPATH "u-boot.bin"
#ifdef CONFIG_SDCARD
#define CONFIG_DEF_HWCONFIG "hwconfig=usb1:dr_mode=host,phy_type=ulpi\0"
#else
@@ -485,9 +485,6 @@
#define CONFIG_DEF_HWCONFIG fsl_ddr:ecc=on
@@ -23,8 +23,6 @@
#define CONFIG_SYS_CLK_FREQ 33330000 /* external frequency to pll */
-#define CONFIG_BAUDRATE 9600
#undef CONFIG_BOOTARGS
#undef CONFIG_BOOTCOMMAND
@@ -28,8 +28,6 @@
@@ -16,7 +16,6 @@
#define CONFIG_MCFUART
#define CONFIG_SYS_UART_PORT (0)
#undef CONFIG_WATCHDOG
#define CONFIG_WATCHDOG_TIMEOUT 5000
@@ -22,7 +22,6 @@
@@ -21,7 +21,6 @@
#define CONFIG_WATCHDOG_TIMEOUT 5000 /* timeout in milliseconds, max timeout is 6.71sec */
@@ -13,7 +13,6 @@
#undef CONFIG_WATCHDOG /* disable watchdog */
@@ -14,7 +14,6 @@
#define CONFIG_WATCHDOG_TIMEOUT 10000 /* timeout in milliseconds */
@@ -27,7 +27,6 @@
/* Configuration for environment
* Environment is embedded in u-boot in the second sector of the flash
#undef CONFIG_MONITOR_IS_IN_RAM /* define if monitor is started from a pre-loader */
#define CONFIG_WATCHDOG_TIMEOUT 3360 /* timeout in ms, max is 3.36 sec */
#define CONFIG_SYS_BAUDRATE_TABLE { 9600 , 19200 , 38400 , 57600, 115200 }
#undef CONFIG_HW_WATCHDOG
@@ -92,7 +92,6 @@
/**************************************************************
* Environment definitions
**************************************************************/
-#define CONFIG_BAUDRATE 9600 /* STD Baudrate */
/* autoboot (do NOT change this set environment variable "bootdelay" to -1 instead) */
/* #define CONFIG_BOOT_RETRY_TIME -10 /XXX* feature is available but not enabled */
@@ -500,8 +500,6 @@
#define CONFIG_HAS_ETH1
#endif
#define CONFIG_LOADADDR 800000 /* default location for tftp and bootm */
@@ -643,7 +643,6 @@
#define CONFIG_LOADADDR 800000
"netdev=" CONFIG_NETDEV "\0" \
@@ -590,8 +590,6 @@
#undef CONFIG_BOOTARGS /* the boot command will set bootargs */
@@ -487,7 +487,6 @@
@@ -561,8 +561,6 @@
@@ -725,8 +725,6 @@
#define CONFIG_PREBOOT "echo;" \
"echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
@@ -356,7 +356,6 @@ boards, we say we have two, but don't display a message if we find only one. */
{300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 115200}
#define CONSOLE ttyS0
#define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_IMMR + 0x4500)
#define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_IMMR + 0x4600)
@@ -644,8 +644,6 @@ extern int board_pci_host_broken(void);
@@ -668,7 +668,6 @@
@@ -674,8 +674,6 @@
"uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \
@@ -378,8 +378,6 @@
"consoledev=ttyS0\0" \
@@ -404,8 +404,6 @@ extern unsigned long get_clock_freq(void);
#undef CONFIG_BOOTARGS /* the boot command will set bootargs*/
"consoledev=ttyS1\0" \
@@ -422,8 +422,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
@@ -523,8 +523,6 @@ extern unsigned long get_clock_freq(void);
"hwconfig=fsl_ddr:ecc=off\0" \
@@ -400,8 +400,6 @@ extern unsigned long get_clock_freq(void);
@@ -208,8 +208,6 @@
#undef CONFIG_CONS_NONE /* define if console on something else */
#define CONFIG_CONS_INDEX 1 /* which serial channel for console */
#define CONFIG_SYS_BAUDRATE_TABLE \
{300, 600, 1200, 2400, 4800, 9600, 19200, 38400,115200}
@@ -422,8 +420,6 @@
"consoledev=ttyCPM\0" \
@@ -418,8 +418,6 @@ extern unsigned long get_clock_freq(void);
@@ -508,8 +508,6 @@ extern unsigned long get_clock_freq(void);
@@ -624,8 +624,6 @@
"hwconfig=fsl_ddr:ctlr_intlv=bank,bank_intlv=cs0_cs1,ecc=off\0" \
@@ -485,8 +485,6 @@
#if defined(CONFIG_PCI1)
#define PCI_ENV \
"pcireg=md ${a}000 3; echo o;md ${a}c00 25; echo i; md ${a}da0 15;" \
@@ -650,8 +650,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
#define CONFIG_CMD_SDRAM
#define CONFIG_BOOTARGS "console=ttySC0,115200 root=1f01"
#define CONFIG_DISPLAY_BOARDINFO
@@ -793,8 +793,6 @@ extern unsigned long get_sdram_size(void);
"hwconfig=" __stringify(CONFIG_DEF_HWCONFIG) "\0" \
@@ -655,9 +655,6 @@
@@ -295,9 +295,6 @@ extern unsigned long get_clock_freq(void);
/* Qman/Bman */
#define CONFIG_SYS_DPAA_QBMAN /* support Q/Bman */
#define CONFIG_SYS_QMAN_MEM_BASE 0xff000000
@@ -652,9 +652,6 @@ unsigned long get_board_sys_clk(unsigned long dummy);
#define __USB_PHY_TYPE utmi