summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2018-03-06 19:02:27 -0500
committerTom Rini <trini@konsulko.com>2018-03-16 10:28:52 -0400
commit6f6b7cfa89e5aa3b643196a4ccc8b1ba5d6fa7a4 (patch)
treeb2da03ec76a5c1f3737b201c95de45ebc68d1a58 /board
parent7dc7a38c79d2f3fccda845ce7ec4a623e1d26335 (diff)
downloadu-boot-6f6b7cfa89e5aa3b643196a4ccc8b1ba5d6fa7a4.tar.gz
Convert all of CONFIG_CONS_INDEX to Kconfig
This converts the following to Kconfig: CONFIG_CONS_INDEX We have existing entries for this option in a number of places, with different guards on them. They're also sometimes used for things not directly inside of the serial driver. First, introduce a new symbol to guard the use of CONFIG_CONS_INDEX, so that in the case where we don't need this for the serial driver, but for some other use, we can still do it. Next, consolidate all of these into the single entry in drivers/serial/Kconfig. Finally, introduce CONS_INDEX_[023456] so that we can imply a correct value here to make the defconfig side of this smaller. Signed-off-by: Adam Ford <aford173@gmail.com> [trini: Rework a lot of the logic here, such that I took authorship from Adam, but kept his S-o-B line] Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'board')
-rw-r--r--board/birdland/bav335x/Kconfig10
-rw-r--r--board/eets/pdu001/Kconfig16
-rw-r--r--board/hisilicon/hikey/Kconfig7
-rw-r--r--board/tcl/sl50/Kconfig10
-rw-r--r--board/ti/am335x/Kconfig10
-rw-r--r--board/ti/am57xx/Kconfig9
-rw-r--r--board/ti/dra7xx/Kconfig9
-rw-r--r--board/vscom/baltos/Kconfig9
8 files changed, 0 insertions, 80 deletions
diff --git a/board/birdland/bav335x/Kconfig b/board/birdland/bav335x/Kconfig
index 3380ed39b2..40053665aa 100644
--- a/board/birdland/bav335x/Kconfig
+++ b/board/birdland/bav335x/Kconfig
@@ -12,16 +12,6 @@ config SYS_SOC
config SYS_CONFIG_NAME
default "bav335x"
-config CONS_INDEX
- int "UART used for console"
- range 1 6
- default 1
- help
- The AM335x SoC has a total of 6 UARTs (UART0 to UART5 as referenced
- in documentation, etc) available to it. Depending on your specific
- board you may want something other than UART0 as for example the IDK
- uses UART3 so enter 4 here.
-
config BAV_VERSION
int "BAV335x Version (1=A, 2=B)"
range 1 2
diff --git a/board/eets/pdu001/Kconfig b/board/eets/pdu001/Kconfig
index 6217a8f99b..f28ba6e7bf 100644
--- a/board/eets/pdu001/Kconfig
+++ b/board/eets/pdu001/Kconfig
@@ -17,22 +17,6 @@ config SYS_SOC
config SYS_CONFIG_NAME
default "pdu001"
-config CONS_INDEX
- int "UART used for console"
- range 1 6
- default 4
- help
- The AM335x SoC has a total of 6 UARTs (UART0 to UART5 as referenced
- in documentation, etc) available to it. The best choice for the
- PDU001 is UART3 as it is wired to the header K2; enter 4 here to
- use UART3. UART0 is connected to the EIA-485 transceiver. If you
- really need to use it, you are advised to remove the transceiver U14
- from the board. UART1 is wired to the backplane and therefore
- accessible from there or by the backplane connector K1 of the PDU.
- Any other UART then UART3 (enter 4 here), UART1 (enter 2 here) or
- UART0 (enter 1 here) are not sensible since they are not wired to
- any connector and therefore difficult to access.
-
choice
prompt "State of Run LED"
default PDU001_RUN_LED_RED
diff --git a/board/hisilicon/hikey/Kconfig b/board/hisilicon/hikey/Kconfig
index 9171502a19..f7f1055e17 100644
--- a/board/hisilicon/hikey/Kconfig
+++ b/board/hisilicon/hikey/Kconfig
@@ -12,11 +12,4 @@ config SYS_SOC
config SYS_CONFIG_NAME
default "hikey"
-config CONS_INDEX
- int "UART used for console"
- range 1 4
- default 4
- help
- The hi6220 SoC has 5 UARTs. For example to use UART0 enter 1 here.
-
endif
diff --git a/board/tcl/sl50/Kconfig b/board/tcl/sl50/Kconfig
index d0068d9324..1b3f5cfc61 100644
--- a/board/tcl/sl50/Kconfig
+++ b/board/tcl/sl50/Kconfig
@@ -12,14 +12,4 @@ config SYS_SOC
config SYS_CONFIG_NAME
default "am335x_sl50"
-config CONS_INDEX
- int "UART used for console"
- range 1 6
- default 1
- help
- The AM335x SoC has a total of 6 UARTs (UART0 to UART5 as referenced
- in documentation, etc) available to it. Depending on your specific
- board you may want something other than UART0 as for example the IDK
- uses UART3 so enter 4 here.
-
endif
diff --git a/board/ti/am335x/Kconfig b/board/ti/am335x/Kconfig
index 97374bdc12..b66ca1a579 100644
--- a/board/ti/am335x/Kconfig
+++ b/board/ti/am335x/Kconfig
@@ -12,16 +12,6 @@ config SYS_SOC
config SYS_CONFIG_NAME
default "am335x_evm"
-config CONS_INDEX
- int "UART used for console"
- range 1 6
- default 1
- help
- The AM335x SoC has a total of 6 UARTs (UART0 to UART5 as referenced
- in documentation, etc) available to it. Depending on your specific
- board you may want something other than UART0 as for example the IDK
- uses UART3 so enter 4 here.
-
config NOR
bool "Support for NOR flash"
help
diff --git a/board/ti/am57xx/Kconfig b/board/ti/am57xx/Kconfig
index cead0f4f04..0c56682015 100644
--- a/board/ti/am57xx/Kconfig
+++ b/board/ti/am57xx/Kconfig
@@ -9,15 +9,6 @@ config SYS_VENDOR
config SYS_CONFIG_NAME
default "am57xx_evm"
-config CONS_INDEX
- int "UART used for console"
- range 1 6
- default 3
- help
- The AM57x (and DRA7xx) SoC has a total of 6 UARTs available to it.
- Depending on your specific board you may want something other than UART3
- here.
-
source "board/ti/common/Kconfig"
endif
diff --git a/board/ti/dra7xx/Kconfig b/board/ti/dra7xx/Kconfig
index b642113b83..f6a8e07c5b 100644
--- a/board/ti/dra7xx/Kconfig
+++ b/board/ti/dra7xx/Kconfig
@@ -9,15 +9,6 @@ config SYS_VENDOR
config SYS_CONFIG_NAME
default "dra7xx_evm"
-config CONS_INDEX
- int "UART used for console"
- range 1 6
- default 1
- help
- The DRA7xx (and AM57x) SoC has a total of 6 UARTs available to it.
- Depending on your specific board you may want something other than UART1
- here.
-
source "board/ti/common/Kconfig"
endif
diff --git a/board/vscom/baltos/Kconfig b/board/vscom/baltos/Kconfig
index bc1edcf3a4..b721ed19d8 100644
--- a/board/vscom/baltos/Kconfig
+++ b/board/vscom/baltos/Kconfig
@@ -12,13 +12,4 @@ config SYS_SOC
config SYS_CONFIG_NAME
default "baltos"
-config CONS_INDEX
- int "UART used for console"
- range 1 6
- default 1
- help
- The AM335x SoC has a total of 6 UARTs (UART0 to UART5 as referenced
- in documentation, etc) available to it. Depending on your specific
- board you may want something other than UART0.
-
endif