2 files changed, 2 insertions, 26 deletions

diff --git a/arch/arm/mach-ep93xx/Kconfig b/arch/arm/mach-ep93xx/Kconfig
index fe3c1fa5462b..93e54fd4e3d5 100644
--- a/arch/arm/mach-ep93xx/Kconfig
+++ b/arch/arm/mach-ep93xx/Kconfig
@@ -194,20 +194,6 @@ config MACH_VISION_EP9307
           Say 'Y' here if you want your kernel to support the
           Vision Engraving Systems EP9307 SoM.
 
-choice
-        prompt "Select a UART for early kernel messages"
-
-config EP93XX_EARLY_UART1
-        bool "UART1"
-
-config EP93XX_EARLY_UART2
-        bool "UART2"
-
-config EP93XX_EARLY_UART3
-        bool "UART3"
-
-endchoice
-
 endmenu
 
 endif
diff --git a/arch/arm/mach-ep93xx/include/mach/uncompress.h b/arch/arm/mach-ep93xx/include/mach/uncompress.h
index b5cc77d2380b..03c42e5400d2 100644
--- a/arch/arm/mach-ep93xx/include/mach/uncompress.h
+++ b/arch/arm/mach-ep93xx/include/mach/uncompress.h
@@ -31,18 +31,8 @@ static void __raw_writel(unsigned int value, unsigned int ptr)
         *((volatile unsigned int *)ptr) = value;
 }
 
-#if defined(CONFIG_EP93XX_EARLY_UART1)
-#define UART_BASE               EP93XX_UART1_PHYS_BASE
-#elif defined(CONFIG_EP93XX_EARLY_UART2)
-#define UART_BASE               EP93XX_UART2_PHYS_BASE
-#elif defined(CONFIG_EP93XX_EARLY_UART3)
-#define UART_BASE               EP93XX_UART3_PHYS_BASE
-#else
-#define UART_BASE               EP93XX_UART1_PHYS_BASE
-#endif
-
-#define PHYS_UART_DATA          (UART_BASE + 0x00)
-#define PHYS_UART_FLAG          (UART_BASE + 0x18)
+#define PHYS_UART_DATA          (CONFIG_DEBUG_UART_PHYS + 0x00)
+#define PHYS_UART_FLAG          (CONFIG_DEBUG_UART_PHYS + 0x18)
 #define UART_FLAG_TXFF          0x20
 
 static inline void putc(int c)