Clean up and document UART config options

No functional changes, just renaming config options.

BUG=chrome-os-partner:18343
BRANCH=none
TEST=build all platforms

Change-Id: I91584cb1f8990dd0f980abd32c04465a66243e71
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/63244

13 files changed, 15 insertions, 39 deletions

diff --git a/board/bds/board.h b/board/bds/board.h
index 98b0945515..ed25fac20c 100644
--- a/board/bds/board.h
+++ b/board/bds/board.h
@@ -37,9 +37,8 @@ enum adc_channel
 #define I2C_PORTS_USED 1
 
 /* GPIOs for second UART port */
-#define CONFIG_HOST_UART 1
-#define CONFIG_HOST_UART_IRQ LM4_IRQ_UART1
-#define CONFIG_HOST_UART1_GPIOS_PB0_1
+#define CONFIG_UART_HOST 1
+#define CONFIG_UART_HOST_GPIOS_PB0_1
 
 /* GPIO signal list */
 enum gpio_signal {
diff --git a/board/bolt/board.h b/board/bolt/board.h
index 7d0b451611..0d9d6782bc 100644
--- a/board/bolt/board.h
+++ b/board/bolt/board.h
@@ -79,9 +79,8 @@
 #define USB_PORT_COUNT 2
 
 /* GPIOs for second UART port */
-#define CONFIG_HOST_UART 2
-#define CONFIG_HOST_UART_IRQ LM4_IRQ_UART2
-#define CONFIG_HOST_UART2_GPIOS_PG4_5
+#define CONFIG_UART_HOST 2
+#define CONFIG_UART_HOST_GPIOS_PG4_5
 
 /* GPIO signal definitions. */
 enum gpio_signal {
diff --git a/board/daisy/board.h b/board/daisy/board.h
index cbadd0464e..a0fb0bd168 100644
--- a/board/daisy/board.h
+++ b/board/daisy/board.h
@@ -11,9 +11,6 @@
 /* 16 MHz SYSCLK clock frequency */
 #define CPU_CLOCK 16000000
 
-/* Use USART1 as console serial port */
-#define CONFIG_CONSOLE_UART 1
-
 /* Optional features */
 #define CONFIG_BATTERY_SMART
 #define CONFIG_BOARD_POST_GPIO_INIT
diff --git a/board/falco/board.h b/board/falco/board.h
index de500dd0d2..2b8874a91f 100644
--- a/board/falco/board.h
+++ b/board/falco/board.h
@@ -60,9 +60,8 @@
 #define USB_PORT_COUNT 2
 
 /* GPIOs for second UART port */
-#define CONFIG_HOST_UART 2
-#define CONFIG_HOST_UART_IRQ LM4_IRQ_UART2
-#define CONFIG_HOST_UART2_GPIOS_PG4_5
+#define CONFIG_UART_HOST 2
+#define CONFIG_UART_HOST_GPIOS_PG4_5
 
 /* GPIO signal definitions. */
 enum gpio_signal {
diff --git a/board/link/board.h b/board/link/board.h
index 82b68c56f8..30c8389213 100644
--- a/board/link/board.h
+++ b/board/link/board.h
@@ -84,9 +84,8 @@ enum adc_channel
 #define USB_CHARGE_PORT_COUNT 2
 
 /* GPIOs for second UART port */
-#define CONFIG_HOST_UART 1
-#define CONFIG_HOST_UART_IRQ LM4_IRQ_UART1
-#define CONFIG_HOST_UART1_GPIOS_PC4_5
+#define CONFIG_UART_HOST 1
+#define CONFIG_UART_HOST_GPIOS_PC4_5
 
 /* GPIO signal definitions. */
 enum gpio_signal {
diff --git a/board/mccroskey/board.h b/board/mccroskey/board.h
index e5fa6c79e3..bc3578ae97 100644
--- a/board/mccroskey/board.h
+++ b/board/mccroskey/board.h
@@ -11,9 +11,6 @@
 /* 48 MHz SYSCLK clock frequency */
 #define CPU_CLOCK 48000000
 
-/* Use USART1 as console serial port */
-#define CONFIG_CONSOLE_UART 1
-
 /* Debug features */
 #define CONFIG_I2C_DEBUG	/* FIXME(dhendrix): remove this eventually */
 #undef  CONFIG_TASK_PROFILING
diff --git a/board/peppy/board.h b/board/peppy/board.h
index ac46d2a948..cf5ad95563 100644
--- a/board/peppy/board.h
+++ b/board/peppy/board.h
@@ -60,9 +60,8 @@
 #define USB_PORT_COUNT 2
 
 /* GPIOs for second UART port */
-#define CONFIG_HOST_UART 2
-#define CONFIG_HOST_UART_IRQ LM4_IRQ_UART2
-#define CONFIG_HOST_UART2_GPIOS_PG4_5
+#define CONFIG_UART_HOST 2
+#define CONFIG_UART_HOST_GPIOS_PG4_5
 
 /* GPIO signal definitions. */
 enum gpio_signal {
diff --git a/board/pit/board.h b/board/pit/board.h
index 036184c5ea..1c510b2565 100644
--- a/board/pit/board.h
+++ b/board/pit/board.h
@@ -8,9 +8,6 @@
 #ifndef __BOARD_H
 #define __BOARD_H
 
-/* Use USART1 as console serial port */
-#define CONFIG_CONSOLE_UART 1
-
 /* Optional features */
 #define CONFIG_BATTERY_BQ20Z453
 #define CONFIG_BATTERY_SMART
diff --git a/board/puppy/board.h b/board/puppy/board.h
index 39789080e4..9a1be1d9ac 100644
--- a/board/puppy/board.h
+++ b/board/puppy/board.h
@@ -8,9 +8,6 @@
 #ifndef __BOARD_H
 #define __BOARD_H
 
-/* Use USART1 as console serial port */
-#define CONFIG_CONSOLE_UART 1
-
 /* Optional features */
 #define CONFIG_BATTERY_BQ20Z453
 #define CONFIG_BATTERY_SMART
diff --git a/board/slippy/board.h b/board/slippy/board.h
index cbe72b5d32..3d7e7753bd 100644
--- a/board/slippy/board.h
+++ b/board/slippy/board.h
@@ -61,9 +61,8 @@
 #define USB_PORT_COUNT 2
 
 /* GPIOs for second UART port */
-#define CONFIG_HOST_UART 2
-#define CONFIG_HOST_UART_IRQ LM4_IRQ_UART2
-#define CONFIG_HOST_UART2_GPIOS_PG4_5
+#define CONFIG_UART_HOST 2
+#define CONFIG_UART_HOST_GPIOS_PG4_5
 
 /* GPIO signal definitions. */
 enum gpio_signal {
diff --git a/board/snow/board.h b/board/snow/board.h
index 32906b9ad6..5a5b3be161 100644
--- a/board/snow/board.h
+++ b/board/snow/board.h
@@ -11,9 +11,6 @@
 /* 16 MHz SYSCLK clock frequency */
 #define CPU_CLOCK 16000000
 
-/* Use USART1 as console serial port */
-#define CONFIG_CONSOLE_UART 1
-
 /* Debug features */
 #undef CONFIG_TASK_PROFILING
 
diff --git a/board/spring/board.h b/board/spring/board.h
index 893ddc1b07..c74275ea07 100644
--- a/board/spring/board.h
+++ b/board/spring/board.h
@@ -11,9 +11,6 @@
 /* 16 MHz SYSCLK clock frequency */
 #define CPU_CLOCK 16000000
 
-/* Use USART1 as console serial port */
-#define CONFIG_CONSOLE_UART 1
-#define CONFIG_CONSOLE_RESTRICTED_INPUT
 
 /* Debug features */
 #undef  CONFIG_TASK_PROFILING
@@ -27,6 +24,7 @@
 #define CONFIG_CHIPSET_GAIA
 #endif
 #define CONFIG_CMD_PMU
+#define CONFIG_CONSOLE_RESTRICTED_INPUT
 #define CONFIG_EXTPOWER_USB
 #define CONFIG_HOST_COMMAND_STATUS
 #define CONFIG_I2C
diff --git a/board/wolf/board.h b/board/wolf/board.h
index 7cbbd9c003..7ee3554b5b 100644
--- a/board/wolf/board.h
+++ b/board/wolf/board.h
@@ -53,9 +53,8 @@
 #define USB_PORT_COUNT 2
 
 /* GPIOs for second UART port */
-#define CONFIG_HOST_UART 2
-#define CONFIG_HOST_UART_IRQ LM4_IRQ_UART2
-#define CONFIG_HOST_UART2_GPIOS_PG4_5
+#define CONFIG_UART_HOST 2
+#define CONFIG_UART_HOST_GPIOS_PG4_5
 
 /* GPIO signal definitions. */
 enum gpio_signal {