From b4c4fec300e87ce8b071fd8f3a9fd5bd2dce35ad Mon Sep 17 00:00:00 2001 From: Tom Rini <trini@konsulko.com> Date: Fri, 31 Jul 2015 19:55:11 -0400 Subject: [PATCH] dra7xx: Move CONS_INDEX to Kconfig and enable CONFIG_SPL_STACK_ADDR - Move the CONS_INDEX selection out of CONFIG_SYS_EXTRA_OPTIONS and into Kconfig proper. - While in here, enable CONFIG_SPL_STACK_ADDR Signed-off-by: Tom Rini <trini@konsulko.com> --- board/ti/dra7xx/Kconfig | 8 ++++++++ configs/dra7xx_evm_defconfig | 3 ++- configs/dra7xx_evm_qspiboot_defconfig | 4 +++- configs/dra7xx_evm_uart3_defconfig | 5 ++++- 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/board/ti/dra7xx/Kconfig b/board/ti/dra7xx/Kconfig index 3bbd86644d..80341d9932 100644 --- a/board/ti/dra7xx/Kconfig +++ b/board/ti/dra7xx/Kconfig @@ -9,4 +9,12 @@ 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. endif diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig index 463a7e264e..f98e7b7168 100644 --- a/configs/dra7xx_evm_defconfig +++ b/configs/dra7xx_evm_defconfig @@ -2,7 +2,8 @@ CONFIG_ARM=y CONFIG_OMAP54XX=y CONFIG_TARGET_DRA7XX_EVM=y CONFIG_SPL=y -CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1" +CONFIG_SPL_STACK_R=y +CONFIG_SPL_STACK_R_ADDR=0x82000000 # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set diff --git a/configs/dra7xx_evm_qspiboot_defconfig b/configs/dra7xx_evm_qspiboot_defconfig index 90e3cf4ad4..f14fa62a52 100644 --- a/configs/dra7xx_evm_qspiboot_defconfig +++ b/configs/dra7xx_evm_qspiboot_defconfig @@ -2,7 +2,9 @@ CONFIG_ARM=y CONFIG_OMAP54XX=y CONFIG_TARGET_DRA7XX_EVM=y CONFIG_SPL=y -CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1,QSPI_BOOT" +CONFIG_SPL_STACK_R=y +CONFIG_SPL_STACK_R_ADDR=0x82000000 +CONFIG_SYS_EXTRA_OPTIONS="QSPI_BOOT" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set diff --git a/configs/dra7xx_evm_uart3_defconfig b/configs/dra7xx_evm_uart3_defconfig index 474cada18e..8882260102 100644 --- a/configs/dra7xx_evm_uart3_defconfig +++ b/configs/dra7xx_evm_uart3_defconfig @@ -1,8 +1,11 @@ CONFIG_ARM=y CONFIG_OMAP54XX=y CONFIG_TARGET_DRA7XX_EVM=y +CONFIG_CONS_INDEX=3 CONFIG_SPL=y -CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=3,SPL_YMODEM_SUPPORT" +CONFIG_SPL_STACK_R=y +CONFIG_SPL_STACK_R_ADDR=0x82000000 +CONFIG_SYS_EXTRA_OPTIONS="SPL_YMODEM_SUPPORT" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set -- 2.39.5