diff options
| author | Daniel Allred <d-allred@ti.com> | 2016-04-06 21:59:34 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-04-18 17:11:31 -0400 |
| commit | 7e52e11f3537809e48a6e337c392a1289a692061 (patch) | |
| tree | 670568c9b452e3f4c2b6f4bdaf6517eb324a484a | |
| parent | 23922e2676ba901c0fd574a7e8df5eed0e084a97 (diff) | |
| download | talos-obmc-uboot-7e52e11f3537809e48a6e337c392a1289a692061.tar.gz talos-obmc-uboot-7e52e11f3537809e48a6e337c392a1289a692061.zip | |
am57x: Move CONS_INDEX to Kconfig
- Move the CONS_INDEX selection out of CONFIG_SYS_EXTRA_OPTIONS and
into Kconfig proper.
- Edit the relevant am57x configs to remove the now unneeded
CONFIG_SYS_EXTRA_OPTIONS.
Signed-off-by: Daniel Allred <d-allred@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
| -rw-r--r-- | board/ti/am57xx/Kconfig | 9 | ||||
| -rw-r--r-- | configs/am57xx_evm_defconfig | 1 | ||||
| -rw-r--r-- | configs/am57xx_evm_nodt_defconfig | 1 |
3 files changed, 9 insertions, 2 deletions
diff --git a/board/ti/am57xx/Kconfig b/board/ti/am57xx/Kconfig index 17745ff7ea..87654f9799 100644 --- a/board/ti/am57xx/Kconfig +++ b/board/ti/am57xx/Kconfig @@ -9,6 +9,15 @@ 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/configs/am57xx_evm_defconfig b/configs/am57xx_evm_defconfig index 10902876a1..e40c24a198 100644 --- a/configs/am57xx_evm_defconfig +++ b/configs/am57xx_evm_defconfig @@ -7,7 +7,6 @@ CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_DEFAULT_DEVICE_TREE="am57xx-beagle-x15" CONFIG_SPL=y CONFIG_SPL_STACK_R=y -CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=3" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y diff --git a/configs/am57xx_evm_nodt_defconfig b/configs/am57xx_evm_nodt_defconfig index 7641db5051..cb91719468 100644 --- a/configs/am57xx_evm_nodt_defconfig +++ b/configs/am57xx_evm_nodt_defconfig @@ -2,7 +2,6 @@ CONFIG_ARM=y CONFIG_OMAP54XX=y CONFIG_TARGET_BEAGLE_X15=y CONFIG_SPL=y -CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=3" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y |
