diff options
| author | Tom Rini <[email protected]> | 2021-09-01 07:52:08 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-09-01 10:11:21 -0400 |
| commit | 48cf96fbdf9cf70c4f249c0207ce57c7dff4dd55 (patch) | |
| tree | c869edaf6a47bc8b5c864a8901c0312a8ac90546 /include | |
| parent | b15a17be0c75238e7bdb2c9baf0c375040d95952 (diff) | |
| parent | 4116a0f38a8ba6bc5e762cd291a65df4946216e7 (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-marvell
- mvebu: a38x: Define supported UART baudrates (Pali)
- kwbimage: Misc improvements (Pali)
- espressobin/turris_mox/turris_omnia: Enable some more devices
like SATA via PCIe, SATA & NVMe (Pali)
- a37xx: Remove unused CONFIG_DEBUG_UART_SHIFT options (Pali)
- turris_omnia: Disable MCU watchdog in SPL when booting over
UART (Marek)
- kwbimage: Fix some Coverity issue (Heinrich)
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/mv-common.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h index d61c90a4315..53d7acbb103 100644 --- a/include/configs/mv-common.h +++ b/include/configs/mv-common.h @@ -39,6 +39,15 @@ #define CONFIG_SYS_NS16550_COM1 MV_UART_CONSOLE_BASE #endif +#if defined(CONFIG_ARMADA_38X) && !defined(CONFIG_SYS_BAUDRATE_TABLE) +#define CONFIG_SYS_BAUDRATE_TABLE { 300, 600, 1200, 1800, 2400, 4800, \ + 9600, 19200, 38400, 57600, 115200, \ + 230400, 460800, 500000, 576000, \ + 921600, 1000000, 1152000, 1500000, \ + 2000000, 2500000, 3125000, 4000000, \ + 5150000 } +#endif + /* auto boot */ /* |