summaryrefslogtreecommitdiff
path: root/board/nautilus
diff options
context:
space:
mode:
authorJett Rink <jettrink@chromium.org>2018-03-05 10:46:06 -0700
committerChromeOS Commit Bot <chromeos-commit-bot@chromium.org>2018-03-07 22:26:16 +0000
commitce08db589ad87d10794cb7d93ed4decc5c01c8cf (patch)
tree8beda6b42d6854631f5d5bad0216aca1b775f6f3 /board/nautilus
parent2d394566034f560f1146c7cdddd0a11de0d04ff5 (diff)
downloadchrome-ec-ce08db589ad87d10794cb7d93ed4decc5c01c8cf.tar.gz
npcx: Conforming CONFIG_UART_HOST define to match intention
The CONFIG_UART_HOST is supposed to be defined to the index of the UART we want to use. It is not supposed to be defined as a boolean. Updated npcx and all incorrect uses. BRANCH=none BUG=none TEST=Added the following diff to ensure that everything still built: diff --git a/chip/npcx/lpc.c b/chip/npcx/lpc.c index 446baa842..826233744 100644 --- a/chip/npcx/lpc.c +++ b/chip/npcx/lpc.c @@ -897,6 +897,9 @@ static void lpc_init(void) /* Initialize Hardware for UART Host */ #ifdef CONFIG_UART_HOST +#if !CONFIG_UART_HOST +#error "Fix me" +#endif /* Init COMx LPC UART */ /* FMCLK have to using 50MHz */ NPCX_DEVALT(0xB) = 0xFF; Signed-off-by: Jett Rink <jettrink@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/949308 Reviewed-by: Randall Spangler <rspangler@chromium.org> (cherry picked from commit 9ea3cbecb8d3fca58baf4aff8d7e97480fe25860) Change-Id: Ia46c7cb86c6040a5c75dddf23d5ccd8e33210581 Reviewed-on: https://chromium-review.googlesource.com/953790 Reviewed-by: Furquan Shaikh <furquan@chromium.org> Reviewed-by: Jett Rink <jettrink@chromium.org> Commit-Queue: Furquan Shaikh <furquan@chromium.org> Tested-by: Furquan Shaikh <furquan@chromium.org> Trybot-Ready: Furquan Shaikh <furquan@chromium.org>
Diffstat (limited to 'board/nautilus')
-rw-r--r--board/nautilus/board.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/board/nautilus/board.h b/board/nautilus/board.h
index b64973fc20..cc9a86dc11 100644
--- a/board/nautilus/board.h
+++ b/board/nautilus/board.h
@@ -35,7 +35,6 @@
#define CONFIG_SOFTWARE_PANIC
#define CONFIG_SPI_FLASH_REGS
#define CONFIG_SPI_FLASH_W25X40
-#define CONFIG_UART_HOST 0
#define CONFIG_VBOOT_HASH
#define CONFIG_SHA256_UNROLLED
#define CONFIG_VOLUME_BUTTONS