diff options
author | Tom Rini <trini@konsulko.com> | 2016-07-12 12:15:17 (GMT) |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-07-12 12:15:17 (GMT) |
commit | b8e599746cac1833328bc3a8e37eeefe346baf90 (patch) | |
tree | ec49cc9ac3c8638fe11774e945cf0bcc4e87c1f4 /board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c | |
parent | bff97dde8c8cf6fd5f04bb26fca83f61eadc1741 (diff) | |
parent | 9532fe3b40ddf66ef976dee3d5cf1d8b3396bf4d (diff) | |
download | u-boot-b8e599746cac1833328bc3a8e37eeefe346baf90.tar.xz |
Merge branch 'master' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c')
-rw-r--r-- | board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c b/board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c index 6a946d5..737e610 100644 --- a/board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c +++ b/board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c @@ -12,6 +12,7 @@ int board_early_init_f(void) { +#ifndef CONFIG_INTERNAL_UART /* * The FSP enables the BayTrail internal legacy UART (again). * Disable it again, so that the Winbond one can be used. @@ -21,6 +22,7 @@ int board_early_init_f(void) /* Enable the legacy UART in the Winbond W83627 Super IO chip */ winbond_enable_serial(PNP_DEV(WINBOND_IO_PORT, W83627DHG_SP1), UART0_BASE, UART0_IRQ); +#endif return 0; } |