From: Casey Connolly <casey.conno...@linaro.org> The QCM6490 and QCS9100 targets always enable debug UART, but this is not really optimal for typical users.
Move these debug UART options to config fragments so that they aren't enabled by default. Signed-off-by: Casey Connolly <casey.conno...@linaro.org> Reviewed-by: Neil Armstrong <neil.armstr...@linaro.org> --- board/qualcomm/debug-qcm6490.config | 5 +++++ board/qualcomm/debug-qcs9100.config | 5 +++++ configs/qcm6490_defconfig | 6 ------ configs/qcs9100_defconfig | 6 ------ 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/board/qualcomm/debug-qcm6490.config b/board/qualcomm/debug-qcm6490.config new file mode 100644 index 000000000000..9ea54758794e --- /dev/null +++ b/board/qualcomm/debug-qcm6490.config @@ -0,0 +1,5 @@ +CONFIG_DEBUG_UART=y +CONFIG_DEBUG_UART_ANNOUNCE=y +CONFIG_DEBUG_UART_BASE=0x994000 +CONFIG_DEBUG_UART_MSM_GENI=y +CONFIG_DEBUG_UART_CLOCK=14745600 diff --git a/board/qualcomm/debug-qcs9100.config b/board/qualcomm/debug-qcs9100.config new file mode 100644 index 000000000000..8ca042b440d1 --- /dev/null +++ b/board/qualcomm/debug-qcs9100.config @@ -0,0 +1,5 @@ +CONFIG_DEBUG_UART=y +CONFIG_DEBUG_UART_ANNOUNCE=y +CONFIG_DEBUG_UART_BASE=0xA8C000 +CONFIG_DEBUG_UART_MSM_GENI=y +CONFIG_DEBUG_UART_CLOCK=14745600 diff --git a/configs/qcm6490_defconfig b/configs/qcm6490_defconfig index 5ddc5ab3ef8c..54eb5dedaecb 100644 --- a/configs/qcm6490_defconfig +++ b/configs/qcm6490_defconfig @@ -7,14 +7,8 @@ # Otherwise buildman thinks this isn't an ARM platform CONFIG_ARM=y -CONFIG_DEBUG_UART=y -CONFIG_DEBUG_UART_ANNOUNCE=y -CONFIG_DEBUG_UART_BASE=0x994000 -CONFIG_DEBUG_UART_MSM_GENI=y -CONFIG_DEBUG_UART_CLOCK=14745600 - # Address where U-Boot will be loaded CONFIG_TEXT_BASE=0x9fc00000 CONFIG_REMAKE_ELF=y diff --git a/configs/qcs9100_defconfig b/configs/qcs9100_defconfig index cd48973599b5..216dfa3211ec 100644 --- a/configs/qcs9100_defconfig +++ b/configs/qcs9100_defconfig @@ -4,14 +4,8 @@ # a dedicated "uefi" partition for edk2/U-Boot) #include "qcom_defconfig" -CONFIG_DEBUG_UART=y -CONFIG_DEBUG_UART_ANNOUNCE=y -CONFIG_DEBUG_UART_BASE=0xA8C000 -CONFIG_DEBUG_UART_MSM_GENI=y -CONFIG_DEBUG_UART_CLOCK=14745600 - # Address where U-Boot will be loaded CONFIG_TEXT_BASE=0xaf000000 CONFIG_REMAKE_ELF=y CONFIG_DEFAULT_DEVICE_TREE="qcom/qcs9100-ride-r3" -- 2.50.1
