diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index 4488920..35e3908 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -36,6 +36,7 @@ CONFIG_CPU_IDLE=y
 CONFIG_CRASH_DUMP=y
 CONFIG_CRYPTO_LZO=m
 CONFIG_DEBUG_INFO=y
+CONFIG_DEBUG_LL_UART_NONE=y
 CONFIG_DEBUG_USER=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
 CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
diff --git a/debian.master/config/armhf/config.flavour.highbank b/debian.master/config/armhf/config.flavour.highbank
index 36f1d8e..159e03c 100644
--- a/debian.master/config/armhf/config.flavour.highbank
+++ b/debian.master/config/armhf/config.flavour.highbank
@@ -23,6 +23,7 @@ CONFIG_CACHE_L2X0=y
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 # CONFIG_CPU_IDLE is not set
 # CONFIG_CRASH_DUMP is not set
+# CONFIG_DEBUG_LL_UART_NONE is not set
 # CONFIG_DEBUG_USER is not set
 # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
 CONFIG_EDAC=y
diff --git a/debian.master/config/armhf/config.flavour.omap b/debian.master/config/armhf/config.flavour.omap
index 11d014e..93abab6 100644
--- a/debian.master/config/armhf/config.flavour.omap
+++ b/debian.master/config/armhf/config.flavour.omap
@@ -23,6 +23,7 @@ CONFIG_CLEANCACHE=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_CPU_IDLE=y
 CONFIG_CRASH_DUMP=y
+CONFIG_DEBUG_LL_UART_NONE=y
 CONFIG_DEBUG_USER=y
 CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
 # CONFIG_EDAC is not set
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index e69d07e..1cb592b 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -1252,7 +1252,7 @@ CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
 CONFIG_DEBUG_FS=y
 # CONFIG_DEBUG_GPIO is not set
-# CONFIG_DEBUG_HIGHBANK_UART is not set
+CONFIG_DEBUG_HIGHBANK_UART=y
 # CONFIG_DEBUG_HIGHMEM is not set
 # CONFIG_DEBUG_ICEDCC is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
@@ -1261,7 +1261,6 @@ CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_KOBJECT is not set
 # CONFIG_DEBUG_LIST is not set
 CONFIG_DEBUG_LL=y
-CONFIG_DEBUG_LL_UART_NONE=y
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_DEBUG_LOCK_ALLOC is not set
 CONFIG_DEBUG_MEMORY_INIT=y