2 files changed, 8 insertions, 0 deletions

diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index acddddac7ee4..7d4b96daad44 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -298,6 +298,13 @@ choice
                   Say Y here if you want kernel low-level debugging support
                   on MVEBU based platforms.
 
+        config DEBUG_NOMADIK_UART
+                bool "Kernel low-level debugging messages via NOMADIK UART"
+                depends on ARCH_NOMADIK
+                help
+                  Say Y here if you want kernel low-level debugging support
+                  on NOMADIK based platforms.
+
         config DEBUG_OMAP2PLUS_UART
                 bool "Kernel low-level debugging messages via OMAP2PLUS UART"
                 depends on ARCH_OMAP2PLUS
@@ -590,6 +597,7 @@ config DEBUG_LL_INCLUDE
                                  DEBUG_IMX6Q_UART
         default "debug/highbank.S" if DEBUG_HIGHBANK_UART
         default "debug/mvebu.S" if DEBUG_MVEBU_UART
+        default "debug/nomadik.S" if DEBUG_NOMADIK_UART
         default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART
         default "debug/picoxcell.S" if DEBUG_PICOXCELL_UART
         default "debug/socfpga.S" if DEBUG_SOCFPGA_UART
diff --git a/arch/arm/mach-nomadik/include/mach/debug-macro.S b/arch/arm/include/debug/nomadik.S
index 735417922ce2..735417922ce2 100644
--- a/arch/arm/mach-nomadik/include/mach/debug-macro.S
+++ b/arch/arm/include/debug/nomadik.S