From 0fff6cb9bb4f269e03839ba9f41f3459b1f6df3e Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Wed, 1 Mar 2023 09:00:34 +0100 Subject: ARM: i.MX: Only provide PUTC_LL() when activated With multi-arch support we must make sure we provide exactly one PUTC_LL() function as indicated by the "Kernel low-level debugging port" Kconfig choice. Make sure that the i.MX specific debug_ll.h only provides PUTC_LL() when specified. The i.MX specific debug_ll.h also provides other functions needed by board code regardless if the i.MX debug_ll port is enabled or not, so include it explicitly where needed. Signed-off-by: Sascha Hauer --- common/Kconfig | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'common') diff --git a/common/Kconfig b/common/Kconfig index 96ab687af2..dce83cfafc 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -1249,6 +1249,9 @@ config FRAME_POINTER will be slightly larger and slower, but it can give precise debugging information when print stack traces. +config DEBUG_IMX_UART + bool + choice prompt "Kernel low-level debugging port" depends on DEBUG_LL @@ -1256,6 +1259,7 @@ choice config DEBUG_IMX1_UART bool "i.MX1 Debug UART" depends on ARCH_IMX1 + select DEBUG_IMX_UART help Say Y here if you want kernel low-level debugging support on i.MX1. @@ -1263,6 +1267,7 @@ config DEBUG_IMX1_UART config DEBUG_IMX21_UART bool "i.MX21 Debug UART" depends on ARCH_IMX21 + select DEBUG_IMX_UART help Say Y here if you want kernel low-level debugging support on i.MX21. @@ -1270,6 +1275,7 @@ config DEBUG_IMX21_UART config DEBUG_IMX25_UART bool "i.MX25 Debug UART" depends on ARCH_IMX25 + select DEBUG_IMX_UART help Say Y here if you want kernel low-level debugging support on i.MX25. @@ -1277,6 +1283,7 @@ config DEBUG_IMX25_UART config DEBUG_IMX27_UART bool "i.MX27 Debug UART" depends on ARCH_IMX27 + select DEBUG_IMX_UART help Say Y here if you want kernel low-level debugging support on i.MX27. @@ -1284,6 +1291,7 @@ config DEBUG_IMX27_UART config DEBUG_IMX31_UART bool "i.MX31 Debug UART" depends on ARCH_IMX31 + select DEBUG_IMX_UART help Say Y here if you want kernel low-level debugging support on i.MX31. @@ -1291,6 +1299,7 @@ config DEBUG_IMX31_UART config DEBUG_IMX35_UART bool "i.MX35 Debug UART" depends on ARCH_IMX35 + select DEBUG_IMX_UART help Say Y here if you want kernel low-level debugging support on i.MX35. @@ -1298,6 +1307,7 @@ config DEBUG_IMX35_UART config DEBUG_IMX50_UART bool "i.MX50 Debug UART" depends on ARCH_IMX50 + select DEBUG_IMX_UART help Say Y here if you want kernel low-level debugging support on i.MX50. @@ -1305,6 +1315,7 @@ config DEBUG_IMX50_UART config DEBUG_IMX51_UART bool "i.MX51 Debug UART" depends on ARCH_IMX51 + select DEBUG_IMX_UART help Say Y here if you want kernel low-level debugging support on i.MX51. @@ -1312,6 +1323,7 @@ config DEBUG_IMX51_UART config DEBUG_IMX53_UART bool "i.MX53 Debug UART" depends on ARCH_IMX53 + select DEBUG_IMX_UART help Say Y here if you want kernel low-level debugging support on i.MX53. @@ -1326,6 +1338,7 @@ config DEBUG_IMX6Q_UART config DEBUG_IMX7D_UART bool "i.MX7D Debug UART" depends on ARCH_IMX7 + select DEBUG_IMX_UART help Say Y here if you want barebox low-level debugging support on i.MX7D. @@ -1333,6 +1346,7 @@ config DEBUG_IMX7D_UART config DEBUG_IMX8M_UART bool "i.MX8M Debug UART" depends on ARCH_IMX8M + select DEBUG_IMX_UART help Say Y here if you want barebox low-level debugging support on i.MX8M*. @@ -1340,6 +1354,7 @@ config DEBUG_IMX8M_UART config DEBUG_VF610_UART bool "VF610 Debug UART" depends on ARCH_VF610 + select DEBUG_IMX_UART help Say Y here if you want kernel low-level debugging support on VF610. -- cgit v1.2.1