Patchwork [U-Boot,0/1] at91: USART3_BASE use AT91_DBGU_BASE instead of (AT91_BASE_SYS + AT91_DBGU)

login
register
mail settings
Submitter Asen Dimov
Date Dec. 12, 2010, 10:40 a.m.
Message ID <1292150441-3423-1-git-send-email-dimov@ronetix.at>
Download mbox | patch
Permalink /patch/75236/
State Rejected
Delegated to: Reinhard Meyer
Headers show

Comments

Asen Dimov - Dec. 12, 2010, 10:40 a.m.
Signed-off-by: Asen Dimov <dimov@ronetix.at>
---
 arch/arm/include/asm/arch-at91/at91cap9.h    |    1 +
 arch/arm/include/asm/arch-at91/at91sam9260.h |    1 +
 arch/arm/include/asm/arch-at91/at91sam9261.h |    1 +
 arch/arm/include/asm/arch-at91/at91sam9g45.h |    1 +
 arch/arm/include/asm/arch-at91/at91sam9rl.h  |    1 +
 arch/arm/include/asm/arch-at91/memory-map.h  |    5 ++++-
 6 files changed, 9 insertions(+), 1 deletions(-)
Reinhard Meyer - Dec. 12, 2010, 7:06 p.m.
Dear Asen Dimov,
>
> Signed-off-by: Asen Dimov<dimov@ronetix.at>
> ---
>   arch/arm/include/asm/arch-at91/at91cap9.h    |    1 +
>   arch/arm/include/asm/arch-at91/at91sam9260.h |    1 +
>   arch/arm/include/asm/arch-at91/at91sam9261.h |    1 +
>   arch/arm/include/asm/arch-at91/at91sam9g45.h |    1 +
>   arch/arm/include/asm/arch-at91/at91sam9rl.h  |    1 +
>   arch/arm/include/asm/arch-at91/memory-map.h  |    5 ++++-
>   6 files changed, 9 insertions(+), 1 deletions(-)

We are currently reworking the avr32 and at91 files.

Please rebase your work on top of the u-boot-atmel.git, rework101209 branch.
You will find that most of your changes to common files are already done.

With best regards,
Reinhard
Asen Dimov - Dec. 13, 2010, 9:15 a.m.
Hello Reinhard,

Reinhard Meyer wrote:
> Dear Asen Dimov,
>>
>> Signed-off-by: Asen Dimov<dimov@ronetix.at>
>> ---
>>   arch/arm/include/asm/arch-at91/at91cap9.h    |    1 +
>>   arch/arm/include/asm/arch-at91/at91sam9260.h |    1 +
>>   arch/arm/include/asm/arch-at91/at91sam9261.h |    1 +
>>   arch/arm/include/asm/arch-at91/at91sam9g45.h |    1 +
>>   arch/arm/include/asm/arch-at91/at91sam9rl.h  |    1 +
>>   arch/arm/include/asm/arch-at91/memory-map.h  |    5 ++++-
>>   6 files changed, 9 insertions(+), 1 deletions(-)
>
> We are currently reworking the avr32 and at91 files.
>
> Please rebase your work on top of the u-boot-atmel.git, rework101209 
> branch.
> You will find that most of your changes to common files are already done.
>
in this case you can discard this patch.

> With best regards,
> Reinhard

Regards,
Asen

Patch

diff --git a/arch/arm/include/asm/arch-at91/at91cap9.h b/arch/arm/include/asm/arch-at91/at91cap9.h
index 5af6fdc..19c280d 100644
--- a/arch/arm/include/asm/arch-at91/at91cap9.h
+++ b/arch/arm/include/asm/arch-at91/at91cap9.h
@@ -53,6 +53,7 @@ 
 #define AT91CAP9_ID_IRQ0	30	/* Advanced Interrupt Controller (IRQ0) */
 #define AT91CAP9_ID_IRQ1	31	/* Advanced Interrupt Controller (IRQ1) */
 
+#define AT91_DBGU_BASE	0xffffee00
 #define AT91_PIO_BASE	0xfffff200
 #define AT91_PMC_BASE	0xfffffc00
 #define AT91_RSTC_BASE	0xfffffd00
diff --git a/arch/arm/include/asm/arch-at91/at91sam9260.h b/arch/arm/include/asm/arch-at91/at91sam9260.h
index 7fd60b7..cc3adc3 100644
--- a/arch/arm/include/asm/arch-at91/at91sam9260.h
+++ b/arch/arm/include/asm/arch-at91/at91sam9260.h
@@ -53,6 +53,7 @@ 
 #define AT91_SDRAMC_BASE	0xffffea00
 #define AT91_SMC_BASE		0xffffec00
 #define AT91_MATRIX_BASE	0xffffee00
+#define AT91_DBGU_BASE		0xfffff200
 #define AT91_PIO_BASE		0xfffff400
 #define AT91_PMC_BASE		0xfffffc00
 #define AT91_RSTC_BASE		0xfffffd00
diff --git a/arch/arm/include/asm/arch-at91/at91sam9261.h b/arch/arm/include/asm/arch-at91/at91sam9261.h
index 7ca0283..bd638f9 100644
--- a/arch/arm/include/asm/arch-at91/at91sam9261.h
+++ b/arch/arm/include/asm/arch-at91/at91sam9261.h
@@ -46,6 +46,7 @@ 
 #define AT91_SDRAMC_BASE	0xffffea00
 #define AT91_SMC_BASE		0xffffec00
 #define AT91_MATRIX_BASE	0xffffee00
+#define AT91_DBGU_BASE		0xfffff200
 #define AT91_PIO_BASE		0xfffff400
 #define AT91_PMC_BASE		0xfffffc00
 #define AT91_RSTC_BASE		0xfffffd00
diff --git a/arch/arm/include/asm/arch-at91/at91sam9g45.h b/arch/arm/include/asm/arch-at91/at91sam9g45.h
index 445f4b2..32bddc9 100644
--- a/arch/arm/include/asm/arch-at91/at91sam9g45.h
+++ b/arch/arm/include/asm/arch-at91/at91sam9g45.h
@@ -54,6 +54,7 @@ 
 #define AT91_EMAC_BASE		0xfffbc000
 #define AT91_SMC_BASE		0xffffe800
 #define AT91_MATRIX_BASE	0xffffea00
+#define AT91_DBGU_BASE		0xffffee00
 #define AT91_PIO_BASE		0xfffff200
 #define AT91_PMC_BASE		0xfffffc00
 #define AT91_RSTC_BASE		0xfffffd00
diff --git a/arch/arm/include/asm/arch-at91/at91sam9rl.h b/arch/arm/include/asm/arch-at91/at91sam9rl.h
index 8eb0d4f..2e6be18 100644
--- a/arch/arm/include/asm/arch-at91/at91sam9rl.h
+++ b/arch/arm/include/asm/arch-at91/at91sam9rl.h
@@ -47,6 +47,7 @@ 
 #define AT91_SDRAMC_BASE	0xffffea00
 #define AT91_SMC_BASE		0xffffec00
 #define AT91_MATRIX_BASE	0xffffee00
+#define AT91_DBGU_BASE		0xfffff200
 #define AT91_PIO_BASE		0xfffff400
 #define AT91_PMC_BASE		0xfffffc00
 #define AT91_RSTC_BASE		0xfffffd00
diff --git a/arch/arm/include/asm/arch-at91/memory-map.h b/arch/arm/include/asm/arch-at91/memory-map.h
index d489fa2..fb6d1d3 100644
--- a/arch/arm/include/asm/arch-at91/memory-map.h
+++ b/arch/arm/include/asm/arch-at91/memory-map.h
@@ -29,7 +29,10 @@ 
 #define USART0_BASE AT91_USART0
 #define USART1_BASE AT91_USART1
 #define USART2_BASE AT91_USART2
-#define USART3_BASE (AT91_BASE_SYS + AT91_DBGU)
+/*
+ *  The UART of DBGU is named USART3.
+*/
+#define USART3_BASE AT91_DBGU_BASE
 #define SPI0_BASE	AT91_BASE_SPI
 #define SPI1_BASE	AT91_BASE_SPI1