diff options
| author | Tom Rini <trini@ti.com> | 2013-05-14 11:45:41 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-05-14 11:45:41 -0400 |
| commit | 805fa87f6d2366e2193f3d9eb1f793ad41ae1430 (patch) | |
| tree | 743278b9e271dc84670680a466ef2ebaabcbbce9 /include/configs/bfin_adi_common.h | |
| parent | a661b99dbc35e725f229a7b8e189ca21304ba026 (diff) | |
| parent | da34aae5fba36c1f1989fdd41fffa723f300eaad (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-blackfin into powerpc-eldk53-warning-fixes
Diffstat (limited to 'include/configs/bfin_adi_common.h')
| -rw-r--r-- | include/configs/bfin_adi_common.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/include/configs/bfin_adi_common.h b/include/configs/bfin_adi_common.h index d3ae3a71cd..e1a6fe3056 100644 --- a/include/configs/bfin_adi_common.h +++ b/include/configs/bfin_adi_common.h @@ -111,8 +111,8 @@ #ifndef CONFIG_BAUDRATE # define CONFIG_BAUDRATE 57600 #endif -#ifndef CONFIG_DEBUG_EARLY_SERIAL -# define CONFIG_SYS_BFIN_UART +#ifdef CONFIG_UART_CONSOLE +# define CONFIG_BFIN_SERIAL #endif /* @@ -317,5 +317,13 @@ #define CONFIG_BFIN_SPI_GPIO_CS /* Only matters if BFIN_SPI is enabled */ #define CONFIG_LZMA #define CONFIG_MONITOR_IS_IN_RAM - +#ifdef CONFIG_HW_WATCHDOG +# define CONFIG_BFIN_WATCHDOG +# ifndef CONFIG_WATCHDOG_TIMEOUT_MSECS +# define CONFIG_WATCHDOG_TIMEOUT_MSECS 5000 +# endif +#endif +#ifndef CONFIG_ADI_GPIO2 +# define CONFIG_ADI_GPIO1 +#endif #endif |