summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorJett Rink <jettrink@chromium.org>2018-03-05 10:46:06 -0700
committerchrome-bot <chrome-bot@chromium.org>2018-03-06 09:59:19 -0800
commit9ea3cbecb8d3fca58baf4aff8d7e97480fe25860 (patch)
tree8beda6b42d6854631f5d5bad0216aca1b775f6f3 /board
parent3b10e08bc341367f19de19946cbd21c36b4d95be (diff)
downloadchrome-ec-9ea3cbecb8d3fca58baf4aff8d7e97480fe25860.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; Change-Id: Ia46c7cb86c6040a5c75dddf23d5ccd8e33210581 Signed-off-by: Jett Rink <jettrink@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/949308 Reviewed-by: Randall Spangler <rspangler@chromium.org>
Diffstat (limited to 'board')
-rw-r--r--board/coral/board.h1
-rw-r--r--board/eve/board.h1
-rw-r--r--board/fizz/board.h1
-rw-r--r--board/glkrvp/board.h1
-rw-r--r--board/grunt/board.h1
-rw-r--r--board/kahlee/board.h1
-rw-r--r--board/nami/board.h1
-rw-r--r--board/nautilus/board.h1
-rw-r--r--board/npcx7_evb/board.h3
-rw-r--r--board/npcx_evb/board.h1
-rw-r--r--board/poppy/board.h1
-rw-r--r--board/reef/board.h1
-rw-r--r--board/wheatley/board.h1
-rw-r--r--board/zoombini/board.h1
14 files changed, 0 insertions, 16 deletions
diff --git a/board/coral/board.h b/board/coral/board.h
index 90dae6032e..ce84d9caaf 100644
--- a/board/coral/board.h
+++ b/board/coral/board.h
@@ -144,7 +144,6 @@
#define CONFIG_DPTF
#define CONFIG_DPTF_DEVICE_ORIENTATION
#define CONFIG_SCI_GPIO GPIO_PCH_SCI_L
-#define CONFIG_UART_HOST 0
#define CONFIG_VBOOT_HASH
#define CONFIG_VOLUME_BUTTONS
#define GPIO_VOLUME_DOWN_L GPIO_EC_VOLDN_BTN_ODL
diff --git a/board/eve/board.h b/board/eve/board.h
index e843f3a952..bb72e4c3b4 100644
--- a/board/eve/board.h
+++ b/board/eve/board.h
@@ -44,7 +44,6 @@
#define CONFIG_PWM_KBLIGHT
#define CONFIG_SPI_FLASH_REGS
#define CONFIG_SPI_FLASH_W25X40
-#define CONFIG_UART_HOST 0
#define CONFIG_VBOOT_HASH
#define CONFIG_VOLUME_BUTTONS
#define CONFIG_VSTORE
diff --git a/board/fizz/board.h b/board/fizz/board.h
index 3ee3e86dd1..63fd62b7b0 100644
--- a/board/fizz/board.h
+++ b/board/fizz/board.h
@@ -38,7 +38,6 @@
#define CONFIG_CHIP_PANIC_BACKUP
#define CONFIG_SPI_FLASH_REGS
#define CONFIG_SPI_FLASH_W25X40
-#define CONFIG_UART_HOST 0
#define CONFIG_WATCHDOG_HELP
#define CONFIG_WIRELESS
#define CONFIG_WIRELESS_SUSPEND \
diff --git a/board/glkrvp/board.h b/board/glkrvp/board.h
index 521095ff36..0d8eaddcce 100644
--- a/board/glkrvp/board.h
+++ b/board/glkrvp/board.h
@@ -97,7 +97,6 @@
#define CONFIG_LID_SWITCH
#define CONFIG_LTO
-#define CONFIG_UART_HOST 0
#define CONFIG_LOW_POWER_IDLE
diff --git a/board/grunt/board.h b/board/grunt/board.h
index 905f57f850..1e6e4da251 100644
--- a/board/grunt/board.h
+++ b/board/grunt/board.h
@@ -67,7 +67,6 @@
#define CONFIG_POWER_SHUTDOWN_PAUSE_IN_S5
#define CONFIG_POWER_BUTTON
#define CONFIG_POWER_BUTTON_X86
-#define CONFIG_UART_HOST 0
#define CONFIG_KEYBOARD_BOARD_CONFIG
#define CONFIG_KEYBOARD_COL2_INVERTED
diff --git a/board/kahlee/board.h b/board/kahlee/board.h
index 316c8bcca1..307943c17a 100644
--- a/board/kahlee/board.h
+++ b/board/kahlee/board.h
@@ -119,7 +119,6 @@
#define CONFIG_TEMP_SENSOR
#define CONFIG_TEMP_SENSOR_G781
#define CONFIG_SCI_GPIO GPIO_PCH_SCI_L
-#define CONFIG_UART_HOST 0
#define CONFIG_VBOOT_HASH
#define CONFIG_BACKLIGHT_LID
#define CONFIG_WIRELESS
diff --git a/board/nami/board.h b/board/nami/board.h
index 6f13ca741d..c01f7db400 100644
--- a/board/nami/board.h
+++ b/board/nami/board.h
@@ -40,7 +40,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
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
diff --git a/board/npcx7_evb/board.h b/board/npcx7_evb/board.h
index adff4a9cd7..4f9c5ecf61 100644
--- a/board/npcx7_evb/board.h
+++ b/board/npcx7_evb/board.h
@@ -52,9 +52,6 @@
#define I2C_PORT_MASTER NPCX_I2C_PORT0_0
#define I2C_PORT_HOST 0
-/* LPC UART */
-#define CONFIG_UART_HOST 0
-
/* Fans for testing */
#define CONFIG_FANS 1
diff --git a/board/npcx_evb/board.h b/board/npcx_evb/board.h
index 4ca106bf8c..f3eb270314 100644
--- a/board/npcx_evb/board.h
+++ b/board/npcx_evb/board.h
@@ -39,7 +39,6 @@
#define CONFIG_CMD_SCRATCHPAD
#define CONFIG_CMD_I2CWEDGE
-#define CONFIG_UART_HOST 0
#define CONFIG_FANS 1
/* Optional feature - used by nuvoton */
diff --git a/board/poppy/board.h b/board/poppy/board.h
index 57723cbbf1..a092a1e870 100644
--- a/board/poppy/board.h
+++ b/board/poppy/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
diff --git a/board/reef/board.h b/board/reef/board.h
index 4931c70306..8f57420a8a 100644
--- a/board/reef/board.h
+++ b/board/reef/board.h
@@ -138,7 +138,6 @@
#define CONFIG_DPTF
#define CONFIG_DPTF_DEVICE_ORIENTATION
#define CONFIG_SCI_GPIO GPIO_PCH_SCI_L
-#define CONFIG_UART_HOST 0
#define CONFIG_VOLUME_BUTTONS
#define GPIO_VOLUME_DOWN_L GPIO_EC_VOLDN_BTN_ODL
#define GPIO_VOLUME_UP_L GPIO_EC_VOLUP_BTN_ODL
diff --git a/board/wheatley/board.h b/board/wheatley/board.h
index 84eb25091c..ee58ef8de5 100644
--- a/board/wheatley/board.h
+++ b/board/wheatley/board.h
@@ -40,7 +40,6 @@
#define CONFIG_I2C
#define CONFIG_I2C_MASTER
#define CONFIG_LPC
-#define CONFIG_UART_HOST 0
#define CONFIG_KEYBOARD_PROTOCOL_8042
#define CONFIG_LED_COMMON
#define CONFIG_LID_ANGLE
diff --git a/board/zoombini/board.h b/board/zoombini/board.h
index 18f280aefc..298b6ff8f9 100644
--- a/board/zoombini/board.h
+++ b/board/zoombini/board.h
@@ -82,7 +82,6 @@
#define CONFIG_POWER_PP5000_CONTROL
#define CONFIG_POWER_S0IX
#define CONFIG_POWER_TRACK_HOST_SLEEP_STATE
-#define CONFIG_UART_HOST 0
#define CONFIG_I2C_MASTER