1 files changed, 22 insertions, 2 deletions

diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index d111c3e99249..4f991f295284 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -3,6 +3,12 @@ if ARCH_AT91
 config HAVE_AT91_DATAFLASH_CARD
         bool
 
+config HAVE_AT91_DBGU0
+        bool
+
+config HAVE_AT91_DBGU1
+        bool
+
 config HAVE_AT91_USART3
         bool
 
@@ -21,12 +27,14 @@ config ARCH_AT91RM9200
         bool "AT91RM9200"
         select CPU_ARM920T
         select GENERIC_CLOCKEVENTS
+        select HAVE_AT91_DBGU0
         select HAVE_AT91_USART3
 
 config ARCH_AT91SAM9260
         bool "AT91SAM9260 or AT91SAM9XE"
         select CPU_ARM926T
         select GENERIC_CLOCKEVENTS
+        select HAVE_AT91_DBGU0
         select HAVE_AT91_USART3
         select HAVE_AT91_USART4
         select HAVE_AT91_USART5
@@ -37,11 +45,13 @@ config ARCH_AT91SAM9261
         select CPU_ARM926T
         select GENERIC_CLOCKEVENTS
         select HAVE_FB_ATMEL
+        select HAVE_AT91_DBGU0
 
 config ARCH_AT91SAM9G10
         bool "AT91SAM9G10"
         select CPU_ARM926T
         select GENERIC_CLOCKEVENTS
+        select HAVE_AT91_DBGU0
         select HAVE_FB_ATMEL
 
 config ARCH_AT91SAM9263
@@ -50,6 +60,7 @@ config ARCH_AT91SAM9263
         select GENERIC_CLOCKEVENTS
         select HAVE_FB_ATMEL
         select HAVE_NET_MACB
+        select HAVE_AT91_DBGU1
 
 config ARCH_AT91SAM9RL
         bool "AT91SAM9RL"
@@ -57,11 +68,13 @@ config ARCH_AT91SAM9RL
         select GENERIC_CLOCKEVENTS
         select HAVE_AT91_USART3
         select HAVE_FB_ATMEL
+        select HAVE_AT91_DBGU0
 
 config ARCH_AT91SAM9G20
         bool "AT91SAM9G20"
         select CPU_ARM926T
         select GENERIC_CLOCKEVENTS
+        select HAVE_AT91_DBGU0
         select HAVE_AT91_USART3
         select HAVE_AT91_USART4
         select HAVE_AT91_USART5
@@ -74,6 +87,7 @@ config ARCH_AT91SAM9G45
         select HAVE_AT91_USART3
         select HAVE_FB_ATMEL
         select HAVE_NET_MACB
+        select HAVE_AT91_DBGU1
 
 config ARCH_AT91CAP9
         bool "AT91CAP9"
@@ -81,6 +95,7 @@ config ARCH_AT91CAP9
         select GENERIC_CLOCKEVENTS
         select HAVE_FB_ATMEL
         select HAVE_NET_MACB
+        select HAVE_AT91_DBGU1
 
 config ARCH_AT91X40
         bool "AT91x40"
@@ -510,8 +525,13 @@ config AT91_TIMER_HZ
 choice
         prompt "Select a UART for early kernel messages"
 
-config AT91_EARLY_DBGU
-        bool "DBGU"
+config AT91_EARLY_DBGU0
+        bool "DBGU on rm9200, 9260/9g20, 9261/9g10 and 9rl"
+        depends on HAVE_AT91_DBGU0
+
+config AT91_EARLY_DBGU1
+        bool "DBGU on 9263, 9g45 and cap9"
+        depends on HAVE_AT91_DBGU1
 
 config AT91_EARLY_USART0
         bool "USART0"