From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
To: barebox@lists.infradead.org
Subject: [PATCH 05/13] at91: introduce Kconfig to select the dbgu for lowlevel debug
Date: Fri, 28 Dec 2012 20:16:06 +0100 [thread overview]
Message-ID: <1356722174-22598-5-git-send-email-plagnioj@jcrosoft.com> (raw)
In-Reply-To: <1356722174-22598-1-git-send-email-plagnioj@jcrosoft.com>
so we can drop AT91_BASE_SYS too
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
arch/arm/mach-at91/Kconfig | 15 +++++++++++++++
arch/arm/mach-at91/include/mach/debug_ll.h | 6 +++++-
2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 4c2e319..0ab7e7e 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -1,5 +1,11 @@
if ARCH_AT91
+config HAVE_AT91_DBGU0
+ bool
+
+config HAVE_AT91_DBGU1
+ bool
+
config ARCH_TEXT_BASE
hex
default 0x73f00000 if ARCH_AT91SAM9G45
@@ -49,6 +55,7 @@ choice
config ARCH_AT91RM9200
bool "AT91RM9200"
select CPU_ARM920T
+ select HAVE_AT91_DBGU0
select HAS_AT91_ETHER
select MACH_HAS_LOWLEVEL_INIT
select MACH_DO_LOWLEVEL_INIT
@@ -56,46 +63,54 @@ config ARCH_AT91RM9200
config ARCH_AT91SAM9260
bool "AT91SAM9260"
select CPU_ARM926T
+ select HAVE_AT91_DBGU0
select HAS_MACB
select AT91SAM9_RESET
config ARCH_AT91SAM9261
bool "AT91SAM9261"
select CPU_ARM926T
+ select HAVE_AT91_DBGU0
select AT91SAM9_RESET
config ARCH_AT91SAM9263
bool "AT91SAM9263"
select CPU_ARM926T
+ select HAVE_AT91_DBGU1
select HAS_MACB
select AT91SAM9_RESET
config ARCH_AT91SAM9G10
bool "AT91SAM9G10"
select CPU_ARM926T
+ select HAVE_AT91_DBGU0
select AT91SAM9_RESET
config ARCH_AT91SAM9G20
bool "AT91SAM9G20"
select CPU_ARM926T
+ select HAVE_AT91_DBGU0
select HAS_MACB
select AT91SAM9_RESET
config ARCH_AT91SAM9G45
bool "AT91SAM9G45 or AT91SAM9M10"
select CPU_ARM926T
+ select HAVE_AT91_DBGU1
select HAS_MACB
select AT91SAM9G45_RESET
config ARCH_AT91SAM9X5
bool "AT91SAM9X5"
select CPU_ARM926T
+ select HAVE_AT91_DBGU0
select HAS_MACB
select AT91SAM9G45_RESET
config ARCH_AT91SAM9N12
bool "AT91SAM9N12"
select CPU_ARM926T
+ select HAVE_AT91_DBGU0
select AT91SAM9G45_RESET
endchoice
diff --git a/arch/arm/mach-at91/include/mach/debug_ll.h b/arch/arm/mach-at91/include/mach/debug_ll.h
index a85fdee..1a85ae4 100644
--- a/arch/arm/mach-at91/include/mach/debug_ll.h
+++ b/arch/arm/mach-at91/include/mach/debug_ll.h
@@ -11,7 +11,11 @@
#include <asm/io.h>
#include <mach/hardware.h>
-#define UART_BASE (AT91_BASE_SYS + AT91_DBGU)
+#ifdef COFNIG_HAVE_AT91_DBGU0
+#define UART_BASE AT91_BASE_DBGU0
+#else
+#define UART_BASE AT91_BASE_DBGU1
+#endif
#define ATMEL_US_CSR 0x0014
#define ATMEL_US_THR 0x001c
--
1.7.10.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2012-12-28 19:17 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-28 19:13 [PATCH 00/13] at91: cleanup and switch core driver to device/driver Jean-Christophe PLAGNIOL-VILLARD
2012-12-28 19:16 ` [PATCH 01/13] at91: factorise dbgu address Jean-Christophe PLAGNIOL-VILLARD
2012-12-28 19:16 ` [PATCH 02/13] at91: enable clock via clock framework Jean-Christophe PLAGNIOL-VILLARD
2013-01-02 10:58 ` Sascha Hauer
2012-12-28 19:16 ` [PATCH 03/13] at91: factoryse PMC address as it's the same on every soc Jean-Christophe PLAGNIOL-VILLARD
2013-01-02 11:00 ` Sascha Hauer
2012-12-28 19:16 ` [PATCH 04/13] at91: pmc: drop AT91_BASE_SYS Jean-Christophe PLAGNIOL-VILLARD
2012-12-28 19:16 ` Jean-Christophe PLAGNIOL-VILLARD [this message]
2012-12-28 19:16 ` [PATCH 06/13] at91: sync with the kernel address base Jean-Christophe PLAGNIOL-VILLARD
2012-12-28 19:16 ` [PATCH 07/13] at91: at91sam9: provide its own clkdev for pit Jean-Christophe PLAGNIOL-VILLARD
2012-12-28 19:16 ` [PATCH 08/13] at91: PIT: switch to platfrom_driver Jean-Christophe PLAGNIOL-VILLARD
2013-01-02 10:59 ` Sascha Hauer
2012-12-28 19:16 ` [PATCH 09/13] at91: autodetect the soc one time at postcore_initcall Jean-Christophe PLAGNIOL-VILLARD
2012-12-28 19:16 ` [PATCH 10/13] at91: SMC: switch to platfrom_driver Jean-Christophe PLAGNIOL-VILLARD
2013-01-02 10:59 ` Sascha Hauer
2012-12-28 19:16 ` [PATCH 11/13] at91: wdt: drop AT91_SYS_BASE Jean-Christophe PLAGNIOL-VILLARD
2012-12-28 19:16 ` [PATCH 12/13] at91: introduce AT91SAM9_SMC and AT91SAM9_TIMER Jean-Christophe PLAGNIOL-VILLARD
2012-12-28 19:16 ` [PATCH 13/13] at91: drop AT91_BASE_PIOx for soc specific one for none boot code Jean-Christophe PLAGNIOL-VILLARD
2013-01-02 10:07 ` [PATCH 00/13] at91: cleanup and switch core driver to device/driver Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1356722174-22598-5-git-send-email-plagnioj@jcrosoft.com \
--to=plagnioj@jcrosoft.com \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox