Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13079a73 authored by Jean-Christophe PLAGNIOL-VILLARD's avatar Jean-Christophe PLAGNIOL-VILLARD
Browse files

ARM: at91: make DBGU soc independent 



we will select now the DBGU used by the soc at Kconfig level

For the DEBUG_LL and early_printk this will allow to select which DBGU to use
this will also allow to select them when multiple SOC are enabled

Signed-off-by: default avatarJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
parent c1c30a29

arch/arm/Kconfig.debug

+8 −0
Original line number Diff line number Diff line
@@ -100,6 +100,14 @@ choice 
		  Note that the system will appear to hang during boot if there

		  is nothing connected to read from the DCC.



	config AT91_DEBUG_LL_DBGU0

		bool "Kernel low-level debugging on rm9200, 9260/9g20, 9261/9g10 and 9rl"

		depends on HAVE_AT91_DBGU0



	config AT91_DEBUG_LL_DBGU1

		bool "Kernel low-level debugging on 9263, 9g45 and cap9"

		depends on HAVE_AT91_DBGU1



	config DEBUG_FOOTBRIDGE_COM1

		bool "Kernel low-level debugging messages via footbridge 8250 at PCI COM1"

		depends on FOOTBRIDGE

arch/arm/mach-at91/Kconfig

+22 −2
Original line number Diff line number Diff line
@@ -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"

arch/arm/mach-at91/at91cap9_devices.c

+2 −2
Original line number Diff line number Diff line
@@ -1030,8 +1030,8 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins) {} 
#if defined(CONFIG_SERIAL_ATMEL)

static struct resource dbgu_resources[] = {

	[0] = {

		.start	= AT91_BASE_SYS + AT91_DBGU,

		.end	= AT91_BASE_SYS + AT91_DBGU + SZ_512 - 1,

		.start	= AT91CAP9_BASE_DBGU,

		.end	= AT91CAP9_BASE_DBGU + SZ_512 - 1,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

arch/arm/mach-at91/at91rm9200_devices.c

+2 −2
Original line number Diff line number Diff line
@@ -877,8 +877,8 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins) {} 
#if defined(CONFIG_SERIAL_ATMEL)

static struct resource dbgu_resources[] = {

	[0] = {

		.start	= AT91_BASE_SYS + AT91_DBGU,

		.end	= AT91_BASE_SYS + AT91_DBGU + SZ_512 - 1,

		.start	= AT91RM9200_BASE_DBGU,

		.end	= AT91RM9200_BASE_DBGU + SZ_512 - 1,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

arch/arm/mach-at91/at91sam9260_devices.c

+2 −2
Original line number Diff line number Diff line
@@ -846,8 +846,8 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins) {} 
#if defined(CONFIG_SERIAL_ATMEL)

static struct resource dbgu_resources[] = {

	[0] = {

		.start	= AT91_BASE_SYS + AT91_DBGU,

		.end	= AT91_BASE_SYS + AT91_DBGU + SZ_512 - 1,

		.start	= AT91SAM9260_BASE_DBGU,

		.end	= AT91SAM9260_BASE_DBGU + SZ_512 - 1,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {