summaryrefslogtreecommitdiff
path: root/board/congatec/conga-qeval20-qa3-e3845
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2016-06-15 14:15:25 +0200
committerBin Meng <bmeng.cn@gmail.com>2016-07-12 13:46:01 +0800
commitf2a751bebafed498d216f8d9a49d21f0d8335fe3 (patch)
treedc5414cd8c804c70808f4442e976d9c5931cc340 /board/congatec/conga-qeval20-qa3-e3845
parentd9703a0725707dc39d58c1de486af26ea3886e56 (diff)
downloadu-boot-f2a751bebafed498d216f8d9a49d21f0d8335fe3.tar.gz
u-boot-f2a751bebafed498d216f8d9a49d21f0d8335fe3.tar.bz2
u-boot-f2a751bebafed498d216f8d9a49d21f0d8335fe3.zip
x86: conga-qeval20-qa3: Add support for internal UART
This patch adds support to enable and use the internal BayTrail UART instead of the one integrated in the Super IO Winbond chip. For this, a 2nd defconfig file is added. This is useful for tests done for the congatec SoM used on baseboards without such a Super IO chip. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Bin Meng <bmeng.cn@gmail.com> Cc: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'board/congatec/conga-qeval20-qa3-e3845')
-rw-r--r--board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c2
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 6a946d5758..737e6103f3 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;
}