mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 10:29:37 +00:00
ARM: at91: stop using HAVE_AT91_DBGUx
In order to remove SOC_SAM9xxx options, stop using HAVE_AT91_DBGUx. Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
This commit is contained in:
parent
ea69f99849
commit
ae57d0c609
2 changed files with 3 additions and 22 deletions
|
@ -118,19 +118,19 @@ choice
|
||||||
bool "Kernel low-level debugging on rm9200, 9260/9g20, 9261/9g10, 9rl, 9x5, 9n12"
|
bool "Kernel low-level debugging on rm9200, 9260/9g20, 9261/9g10, 9rl, 9x5, 9n12"
|
||||||
select DEBUG_AT91_UART
|
select DEBUG_AT91_UART
|
||||||
depends on ARCH_AT91
|
depends on ARCH_AT91
|
||||||
depends on HAVE_AT91_DBGU0
|
depends on SOC_AT91RM9200 || SOC_AT91SAM9
|
||||||
|
|
||||||
config AT91_DEBUG_LL_DBGU1
|
config AT91_DEBUG_LL_DBGU1
|
||||||
bool "Kernel low-level debugging on 9263, 9g45 and sama5d3"
|
bool "Kernel low-level debugging on 9263, 9g45 and sama5d3"
|
||||||
select DEBUG_AT91_UART
|
select DEBUG_AT91_UART
|
||||||
depends on ARCH_AT91
|
depends on ARCH_AT91
|
||||||
depends on HAVE_AT91_DBGU1
|
depends on SOC_AT91SAM9 || SOC_SAMA5
|
||||||
|
|
||||||
config AT91_DEBUG_LL_DBGU2
|
config AT91_DEBUG_LL_DBGU2
|
||||||
bool "Kernel low-level debugging on sama5d4"
|
bool "Kernel low-level debugging on sama5d4"
|
||||||
select DEBUG_AT91_UART
|
select DEBUG_AT91_UART
|
||||||
depends on ARCH_AT91
|
depends on ARCH_AT91
|
||||||
depends on HAVE_AT91_DBGU2
|
depends on SOC_SAMA5
|
||||||
|
|
||||||
config DEBUG_BCM2835
|
config DEBUG_BCM2835
|
||||||
bool "Kernel low-level debugging on BCM2835 PL011 UART"
|
bool "Kernel low-level debugging on BCM2835 PL011 UART"
|
||||||
|
|
|
@ -6,15 +6,6 @@ config HAVE_AT91_UTMI
|
||||||
config HAVE_AT91_USB_CLK
|
config HAVE_AT91_USB_CLK
|
||||||
bool
|
bool
|
||||||
|
|
||||||
config HAVE_AT91_DBGU0
|
|
||||||
bool
|
|
||||||
|
|
||||||
config HAVE_AT91_DBGU1
|
|
||||||
bool
|
|
||||||
|
|
||||||
config HAVE_AT91_DBGU2
|
|
||||||
bool
|
|
||||||
|
|
||||||
config COMMON_CLK_AT91
|
config COMMON_CLK_AT91
|
||||||
bool
|
bool
|
||||||
select COMMON_CLK
|
select COMMON_CLK
|
||||||
|
@ -70,7 +61,6 @@ config SOC_SAMA5D3
|
||||||
bool "SAMA5D3 family"
|
bool "SAMA5D3 family"
|
||||||
select SOC_SAMA5
|
select SOC_SAMA5
|
||||||
select HAVE_FB_ATMEL
|
select HAVE_FB_ATMEL
|
||||||
select HAVE_AT91_DBGU1
|
|
||||||
select HAVE_AT91_UTMI
|
select HAVE_AT91_UTMI
|
||||||
select HAVE_AT91_SMD
|
select HAVE_AT91_SMD
|
||||||
select HAVE_AT91_USB_CLK
|
select HAVE_AT91_USB_CLK
|
||||||
|
@ -81,7 +71,6 @@ config SOC_SAMA5D3
|
||||||
config SOC_SAMA5D4
|
config SOC_SAMA5D4
|
||||||
bool "SAMA5D4 family"
|
bool "SAMA5D4 family"
|
||||||
select SOC_SAMA5
|
select SOC_SAMA5
|
||||||
select HAVE_AT91_DBGU2
|
|
||||||
select CLKSRC_MMIO
|
select CLKSRC_MMIO
|
||||||
select CACHE_L2X0
|
select CACHE_L2X0
|
||||||
select CACHE_PL310
|
select CACHE_PL310
|
||||||
|
@ -101,12 +90,10 @@ config SOC_AT91RM9200
|
||||||
select COMMON_CLK_AT91
|
select COMMON_CLK_AT91
|
||||||
select CPU_ARM920T
|
select CPU_ARM920T
|
||||||
select GENERIC_CLOCKEVENTS
|
select GENERIC_CLOCKEVENTS
|
||||||
select HAVE_AT91_DBGU0
|
|
||||||
select HAVE_AT91_USB_CLK
|
select HAVE_AT91_USB_CLK
|
||||||
|
|
||||||
config SOC_AT91SAM9260
|
config SOC_AT91SAM9260
|
||||||
bool "AT91SAM9260, AT91SAM9XE or AT91SAM9G20"
|
bool "AT91SAM9260, AT91SAM9XE or AT91SAM9G20"
|
||||||
select HAVE_AT91_DBGU0
|
|
||||||
select SOC_AT91SAM9
|
select SOC_AT91SAM9
|
||||||
select HAVE_AT91_USB_CLK
|
select HAVE_AT91_USB_CLK
|
||||||
help
|
help
|
||||||
|
@ -115,7 +102,6 @@ config SOC_AT91SAM9260
|
||||||
|
|
||||||
config SOC_AT91SAM9261
|
config SOC_AT91SAM9261
|
||||||
bool "AT91SAM9261 or AT91SAM9G10"
|
bool "AT91SAM9261 or AT91SAM9G10"
|
||||||
select HAVE_AT91_DBGU0
|
|
||||||
select HAVE_FB_ATMEL
|
select HAVE_FB_ATMEL
|
||||||
select SOC_AT91SAM9
|
select SOC_AT91SAM9
|
||||||
select HAVE_AT91_USB_CLK
|
select HAVE_AT91_USB_CLK
|
||||||
|
@ -124,21 +110,18 @@ config SOC_AT91SAM9261
|
||||||
|
|
||||||
config SOC_AT91SAM9263
|
config SOC_AT91SAM9263
|
||||||
bool "AT91SAM9263"
|
bool "AT91SAM9263"
|
||||||
select HAVE_AT91_DBGU1
|
|
||||||
select HAVE_FB_ATMEL
|
select HAVE_FB_ATMEL
|
||||||
select SOC_AT91SAM9
|
select SOC_AT91SAM9
|
||||||
select HAVE_AT91_USB_CLK
|
select HAVE_AT91_USB_CLK
|
||||||
|
|
||||||
config SOC_AT91SAM9RL
|
config SOC_AT91SAM9RL
|
||||||
bool "AT91SAM9RL"
|
bool "AT91SAM9RL"
|
||||||
select HAVE_AT91_DBGU0
|
|
||||||
select HAVE_FB_ATMEL
|
select HAVE_FB_ATMEL
|
||||||
select SOC_AT91SAM9
|
select SOC_AT91SAM9
|
||||||
select HAVE_AT91_UTMI
|
select HAVE_AT91_UTMI
|
||||||
|
|
||||||
config SOC_AT91SAM9G45
|
config SOC_AT91SAM9G45
|
||||||
bool "AT91SAM9G45 or AT91SAM9M10 families"
|
bool "AT91SAM9G45 or AT91SAM9M10 families"
|
||||||
select HAVE_AT91_DBGU1
|
|
||||||
select HAVE_FB_ATMEL
|
select HAVE_FB_ATMEL
|
||||||
select SOC_AT91SAM9
|
select SOC_AT91SAM9
|
||||||
select HAVE_AT91_UTMI
|
select HAVE_AT91_UTMI
|
||||||
|
@ -149,7 +132,6 @@ config SOC_AT91SAM9G45
|
||||||
|
|
||||||
config SOC_AT91SAM9X5
|
config SOC_AT91SAM9X5
|
||||||
bool "AT91SAM9x5 family"
|
bool "AT91SAM9x5 family"
|
||||||
select HAVE_AT91_DBGU0
|
|
||||||
select HAVE_FB_ATMEL
|
select HAVE_FB_ATMEL
|
||||||
select SOC_AT91SAM9
|
select SOC_AT91SAM9
|
||||||
select HAVE_AT91_UTMI
|
select HAVE_AT91_UTMI
|
||||||
|
@ -164,7 +146,6 @@ config SOC_AT91SAM9X5
|
||||||
|
|
||||||
config SOC_AT91SAM9N12
|
config SOC_AT91SAM9N12
|
||||||
bool "AT91SAM9N12 family"
|
bool "AT91SAM9N12 family"
|
||||||
select HAVE_AT91_DBGU0
|
|
||||||
select HAVE_FB_ATMEL
|
select HAVE_FB_ATMEL
|
||||||
select SOC_AT91SAM9
|
select SOC_AT91SAM9
|
||||||
select HAVE_AT91_USB_CLK
|
select HAVE_AT91_USB_CLK
|
||||||
|
|
Loading…
Reference in a new issue