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> --- 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 0000000000000000000000000000000000000000..9ea54758794ef9d2f698cb4026da44be2360147a --- /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 0000000000000000000000000000000000000000..8ca042b440d100e9583ff9504f1b0e67a491dfcf --- /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 5ddc5ab3ef8cfe8f9cc09eb573c1a8130b394b43..54eb5dedaecb7a82c26a4bd7f5d1807ca6d4201c 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 10ff4d2539803143c8b770b6b28e8dc52b1d5846..4ceeba63ec12cebbc2124eb256a255450500152f 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 -- 2.49.0
