Skip to content

debug_ll: Cleanup conflicts for multiple SoCs

Sascha Hauer barebox 1 version Applied

Status from this message: Applied, thanks!

Get series with b4
b4 am [email protected] change-id 20260601-debug-ll-conflicts-a5aeab40b99b

Versions newest first

  1. v1 Latest3 patches 1 replyApplied

Patches in v1 Applied

#Subject and filesSizeRepliesApplied
1/3debug_ll: give PUTC_LL a common prototypearch/mips/mach-ath79/include/mach/debug_ll_ar9331.h arch/openrisc/include/asm/debug_ll.h arch/powerpc/include/asm/debug_ll.h +10 more+14 -140 replies
2/3debug_ll: Add Kconfig options for debug uarts that have nonearch/arm/include/asm/debug_ll.h common/Kconfig.debug_ll+52 -450 replies
3/3debug_ll: pl011: define PUTC_LL only when requestedinclude/debug_ll.h include/debug_ll/pl011.h+3 -50 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [PATCH 0/3] debug_ll: Cleanup conflicts for multiple SoCs

This cleans up some problems we have with debug_ll when it comes to multi SoC images. debug_ll relies on having exactly one PUTC_LL() implementation available. Most SoCs have their own DEBUG_*_UART Kconfig option and the Kconfig choice around them makes sure only a single debug UART can be selected. Some SoCs do not have a dedicated option though and provide PUTC_LL() whenever the SoC is enabled which can to multiple definitions of PUTC_LL(). Fix that by adding a DEBUG_*_UART option to the SoC that currently do not have one.

Another problem is that pl011.h provides PUTC_LL() and debug_ll_pl011_putc(). The former is needed when included indirectly from debug_ll.h, the latter is needed by board code to specify a putc() to the PBL console. This too ends up in multiple definitions of PUTC_LL().

Both problems are fixed in this series

---
Sascha Hauer (3):
debug_ll: give PUTC_LL a common prototype
debug_ll: Add Kconfig options for debug uarts that have none
debug_ll: pl011: define PUTC_LL only when requested

 arch/arm/include/asm/debug_ll.h                    | 69 ++++++++--------------
 .../mips/mach-ath79/include/mach/debug_ll_ar9331.h |  2 +-
 arch/openrisc/include/asm/debug_ll.h               |  2 +-
 arch/powerpc/include/asm/debug_ll.h                |  2 +-
 common/Kconfig.debug_ll                            | 28 +++++++++
 include/debug_ll.h                                 |  2 +
 include/debug_ll/pl011.h                           |  6 +-
 include/mach/bcm283x/debug_ll.h                    |  4 +-
 include/mach/imx/debug_ll.h                        |  2 +-
 include/mach/k3/debug_ll.h                         |  2 +-
 include/mach/layerscape/debug_ll.h                 |  2 +-
 include/mach/mxs/debug_ll.h                        |  2 +-
 include/mach/omap/debug_ll.h                       |  2 +-
 include/mach/rockchip/debug_ll.h                   |  2 +-
 include/mach/stm32mp/debug_ll.h                    |  2 +-
 include/mach/zynq/debug_ll.h                       |  2 +-
 include/mach/zynqmp/debug_ll.h                     |  2 +-
 17 files changed, 69 insertions(+), 64 deletions(-)

---
base-commit: 81fbe2e8d0d445032498a0bfecf9fd270f00985a
change-id: 20260601-debug-ll-conflicts-a5aeab40b99b

Best regards,

Signature · 1 line
Sascha Hauer <[email protected]>