various at91 patches to make some boards compilable again
Subsystems (4)
This patch series changes some at91 boards to SoC access and adds some defines to make the boards compilable again.
Please note: All changes are untested!
Best regards,
Alexander
PATCH 1/11 at91sam9260: Replace PHYS_SDRAM with CONFIG_SYS_SDRAM_BASE
Same for PHYS_SDRAM_SIZE and CONFIG_SYS_SDRAM_SIZE and use SZ_* macros
--- board/atmel/at91sam9260ek/at91sam9260ek.c | 6 +++--- include/configs/at91sam9260ek.h | 17 ++++++++++++----- 2 files changed, 15 insertions(+), 8 deletions(-)
board/atmel/at91sam9260ek/at91sam9260ek.c +3 -3
@@ -153,7 +153,7 @@ int board_init(void) gd->bd->bi_arch_number =MACH_TYPE_AT91SAM9260EK ;#endif /* adress of boot parameters */ - gd->bd->bi_boot_params =PHYS_SDRAM +0x100 ; + gd->bd->bi_boot_params =CONFIG_SYS_SDRAM_BASE +0x100 ;at91_serial_hw_init ();#ifdef CONFIG_CMD_NAND
@@ -171,8 +171,8 @@ int board_init(void)int dram_init (void ) { - gd->bd->bi_dram[0 ].start =PHYS_SDRAM ; - gd->bd->bi_dram[0 ].size =PHYS_SDRAM_SIZE ; + gd->bd->bi_dram[0 ].start =CONFIG_SYS_SDRAM_BASE ; + gd->bd->bi_dram[0 ].size =CONFIG_SYS_SDRAM_SIZE ;return 0 ; }
include/configs/at91sam9260ek.h +12 -5
@@ -27,6 +27,8 @@#ifndef __CONFIG_H#define __CONFIG_H +#include <asm/sizes.h> +#define CONFIG_AT91_LEGACY /* ARM asynchronous clock */
@@ -40,6 +42,7 @@#else #define CONFIG_AT91SAM9260 1/* It's an Atmel AT91SAM9260 SoC*/ #endif +#define CONFIG_AT91FAMILY #define CONFIG_ARCH_CPU_INIT #undef CONFIG_USE_IRQ/* we don't need IRQ/FIQ stuff */
@@ -93,8 +96,8 @@/* SDRAM */ #define CONFIG_NR_DRAM_BANKS 1 -#define PHYS_SDRAM 0x20000000 -#define PHYS_SDRAM_SIZE 0x04000000/* 64 megs */ +#define CONFIG_SYS_SDRAM_BASE 0x20000000 +#define CONFIG_SYS_SDRAM_SIZE SZ_64M/* DataFlash */ #define CONFIG_ATMEL_DATAFLASH_SPI
@@ -150,7 +153,7 @@#define CONFIG_SYS_LOAD_ADDR 0x22000000/* load address */ -#define CONFIG_SYS_MEMTEST_START PHYS_SDRAM +#define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE#define CONFIG_SYS_MEMTEST_END 0x23e00000#ifdef CONFIG_SYS_USE_DATAFLASH_CS0
@@ -211,9 +214,13 @@/* * Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN ROUND(3 * CONFIG_ENV_SIZE + 128*1024, 0x1000) +#define CONFIG_SYS_MALLOC_LEN ROUND(3 * CONFIG_ENV_SIZE + SZ_128K, 0x1000) +/* size in bytes reserved for initial data */ + +#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + SZ_4K \ + - GENERATED_GBL_DATA_SIZE) -#define CONFIG_STACKSIZE (32*1024)/* regular stack */ +#define CONFIG_STACKSIZE (SZ_32K)/* regular stack */ #ifdef CONFIG_USE_IRQ #error CONFIG_USE_IRQ not supported
Signature · 1 line
1.7.2.2
PATCH 1/11 at91sam9260: Replace PHYS_SDRAM with CONFIG_SYS_SDRAM_BASE
Dear Alexander Stein,
Quoted 3 lines · In message <1288600195-6960-2-git-send-email-alexander.stein@systec-electronic.…
Same for
PHYS_SDRAM_SIZEandCONFIG_SYS_SDRAM_SIZEand use SZ_* macrosSigned-off-by Alexander Stein <[email protected]>
Please don't add more use to the SZ macros. They are on my kill-list.
Best regards,
Wolfgang Denk
Signature · 4 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de Monday is an awful way to spend one seventh of your life.
PATCH 2/11 at91: Add USART & DBGU base address defines
In reply to Alexander Stein--- arch/arm/include/asm/arch-at91/at91cap9.h | 12 ++++++++---- arch/arm/include/asm/arch-at91/at91sam9260.h | 7 +++++++ arch/arm/include/asm/arch-at91/at91sam9261.h | 4 ++++ arch/arm/include/asm/arch-at91/at91sam9263.h | 3 +++ arch/arm/include/asm/arch-at91/at91sam9g45.h | 5 +++++ arch/arm/include/asm/arch-at91/at91sam9rl.h | 4 ++++ 6 files changed, 31 insertions(+), 4 deletions(-)
arch/arm/include/asm/arch-at91/at91cap9.h +8 -4
@@ -53,10 +53,14 @@#define AT91CAP9_ID_IRQ0 30/* Advanced Interrupt Controller (IRQ0) */ #define AT91CAP9_ID_IRQ1 31/* Advanced Interrupt Controller (IRQ1) */ -#define AT91_PIO_BASE 0xfffff200 -#define AT91_PMC_BASE 0xfffffc00 -#define AT91_RSTC_BASE 0xfffffd00 -#define AT91_PIT_BASE 0xfffffd30 +#define AT91_USART0_BASE 0xfff8c000 +#define AT91_USART1_BASE 0xfff90000 +#define AT91_USART2_BASE 0xfff94000 +#define AT91_DBGU_BASE 0xffffee00 +#define AT91_PIO_BASE 0xfffff200 +#define AT91_PMC_BASE 0xfffffc00 +#define AT91_RSTC_BASE 0xfffffd00 +#define AT91_PIT_BASE 0xfffffd30#ifdef CONFIG_AT91_LEGACY
arch/arm/include/asm/arch-at91/at91sam9260.h +7 -0
@@ -49,10 +49,17 @@#define AT91SAM9260_ID_IRQ1 30/* Advanced Interrupt Controller (IRQ1) */ #define AT91SAM9260_ID_IRQ2 31/* Advanced Interrupt Controller (IRQ2) */ +#define AT91_USART0_BASE 0xfffb0000 +#define AT91_USART1_BASE 0xfffb4000 +#define AT91_USART2_BASE 0xfffb8000#define AT91_EMAC_BASE 0xfffc4000 +#define AT91_USART3_BASE 0xfffd0000 +#define AT91_USART4_BASE 0xfffd4000 +#define AT91_USART5_BASE 0xfffd8000#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
arch/arm/include/asm/arch-at91/at91sam9261.h +4 -0
@@ -43,9 +43,13 @@#define AT91SAM9261_ID_IRQ1 30/* Advanced Interrupt Controller (IRQ1) */ #define AT91SAM9261_ID_IRQ2 31/* Advanced Interrupt Controller (IRQ2) */ +#define AT91_USART0_BASE 0xfffb0000 +#define AT91_USART1_BASE 0xfffb4000 +#define AT91_USART2_BASE 0xfffb8000#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
arch/arm/include/asm/arch-at91/at91sam9263.h +3 -0
@@ -47,6 +47,9 @@#define AT91SAM9263_ID_IRQ0 30/* Advanced Interrupt Controller (IRQ0) */ #define AT91SAM9263_ID_IRQ1 31/* Advanced Interrupt Controller (IRQ1) */ +#define AT91_US0_BASE 0xfff8c000 +#define AT91_US1_BASE 0xfff90000 +#define AT91_US2_BASE 0xfff94000#define AT91_EMAC_BASE 0xfffbc000#define AT91_ECC0_BASE 0xffffe000#define AT91_SDRAMC0_BASE 0xffffe200
arch/arm/include/asm/arch-at91/at91sam9g45.h +5 -0
@@ -51,9 +51,14 @@#define AT91SAM9G45_ID_VDEC 30/* Video Decoder */ #define AT91SAM9G45_ID_IRQ0 31/* Advanced Interrupt Controller */ +#define AT91_USART0_BASE 0xfff8c000 +#define AT91_USART1_BASE 0xfff90000 +#define AT91_USART2_BASE 0xfff94000 +#define AT91_USART3_BASE 0xfff98000#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
arch/arm/include/asm/arch-at91/at91sam9rl.h +4 -0
@@ -44,6 +44,10 @@#define AT91SAM9RL_ID_AC97C 24/* AC97 Controller */ #define AT91SAM9RL_ID_IRQ0 31/* Advanced Interrupt Controller (IRQ0) */ +#define AT91_US0_BASE 0xfffb0000 +#define AT91_US1_BASE 0xfffb4000 +#define AT91_US2_BASE 0xfffb8000 +#define AT91_US3_BASE 0xfffbc000#define AT91_SDRAMC_BASE 0xffffea00#define AT91_SMC_BASE 0xffffec00#define AT91_MATRIX_BASE 0xffffee00
Signature · 1 line
1.7.2.2
PATCH 2/11 at91: Add USART & DBGU base address defines
Dear Alexander Stein,
Am 01.11.2010 um 09:29 schrieb Alexander Stein:
Quoted 34 lines
Signed-off-by Alexander Stein <[email protected]>---
arch/arm/include/asm/arch-at91/at91cap9.h | 12 ++++++++---- arch/arm/include/asm/arch-at91/at91sam9260.h | 7 +++++++ arch/arm/include/asm/arch-at91/at91sam9261.h | 4 ++++ arch/arm/include/asm/arch-at91/at91sam9263.h | 3 +++ arch/arm/include/asm/arch-at91/at91sam9g45.h | 5 +++++ arch/arm/include/asm/arch-at91/at91sam9rl.h | 4 ++++ 6 files changed, 31 insertions(+), 4 deletions(-)arch/arm/include/asm/arch-at91/at91sam9g45.h +5
-0@@ -51,9 +51,14 @@#define AT91SAM9G45_ID_VDEC 30/* Video Decoder */ #define AT91SAM9G45_ID_IRQ0 31/* Advanced Interrupt Controller */ +#define AT91_USART0_BASE 0xfff8c000 +#define AT91_USART1_BASE 0xfff90000 +#define AT91_USART2_BASE 0xfff94000 +#define AT91_USART3_BASE 0xfff98000#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 0xfffffd00arch/arm/include/asm/arch-at91/at91sam9rl.h +0
-0
arch/arm/include/asm/arch-at91/at91sam9rl.h line 53
Quoted 10 lines
arch/arm/include/asm/arch-at91/at91sam9rl.h +4
-0@@ -44,6 +44,10 @@#define AT91SAM9RL_ID_AC97C 24/* AC97 Controller */ #define AT91SAM9RL_ID_IRQ0 31/* Advanced Interrupt Controller (IRQ0) */ +#define AT91_US0_BASE 0xfffb0000 +#define AT91_US1_BASE 0xfffb4000 +#define AT91_US2_BASE 0xfffb8000 +#define AT91_US3_BASE 0xfffbc000#define AT91_SDRAMC_BASE 0xffffea00#define AT91_SMC_BASE 0xffffec00#define AT91_MATRIX_BASE 0xffffee00
can we just use one naming scheme here? I dunno whether it should be AT91_USx or AT91_USARTx but it should be the same in any case.
regards
Andreas Bie?mann
PATCH 2/11 at91: Add USART & DBGU base address defines
Dear Andreas,
Quoted 33 lines · On Monday 01 November 2010, 11:57:14 Andreas Bie?mann wrote:
Am 01.11.2010 um 09:29 schrieb Alexander Stein:
Quoted 32 lines
Signed-off-by Alexander Stein <[email protected]>---
arch/arm/include/asm/arch-at91/at91cap9.h | 12 ++++++++---- arch/arm/include/asm/arch-at91/at91sam9260.h | 7 +++++++ arch/arm/include/asm/arch-at91/at91sam9261.h | 4 ++++ arch/arm/include/asm/arch-at91/at91sam9263.h | 3 +++ arch/arm/include/asm/arch-at91/at91sam9g45.h | 5 +++++ arch/arm/include/asm/arch-at91/at91sam9rl.h | 4 ++++ 6 files changed, 31 insertions(+), 4 deletions(-)arch/arm/include/asm/arch-at91/at91sam9g45.h +5
-0@@ -51,9 +51,14 @@#define AT91SAM9G45_ID_VDEC 30/* Video Decoder */ #define AT91SAM9G45_ID_IRQ0 31/* Advanced Interrupt Controller */ +#define AT91_USART0_BASE 0xfff8c000 +#define AT91_USART1_BASE 0xfff90000 +#define AT91_USART2_BASE 0xfff94000 +#define AT91_USART3_BASE 0xfff98000#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(quoted diff) +0
-0
b/arch/arm/include/asm/arch-at91/at91sam9rl.hindex 8eb0d4f..ffa6687 100644
Quoted 5 lines
arch/arm/include/asm/arch-at91/at91sam9rl.h line 45
Quoted 5 lines
arch/arm/include/asm/arch-at91/at91sam9rl.h +0
-0@@ -44,6 +44,10 @@#define AT91SAM9RL_ID_AC97C 24/* AC97 Controller */ #define AT91SAM9RL_ID_IRQ0 31/* Advanced Interrupt Controller (IRQ0)
*/
Quoted 11 lines
arch/arm/include/asm/arch-at91/at91sam9rl.h line 53
Quoted 8 lines
arch/arm/include/asm/arch-at91/at91sam9rl.h +4
-0+#define AT91_US0_BASE 0xfffb0000 +#define AT91_US1_BASE 0xfffb4000 +#define AT91_US2_BASE 0xfffb8000 +#define AT91_US3_BASE 0xfffbc000#define AT91_SDRAMC_BASE 0xffffea00#define AT91_SMC_BASE 0xffffec00#define AT91_MATRIX_BASE 0xffffee00can we just use one naming scheme here? I dunno whether it should be
AT91_USxorAT91_USARTxbut it should be the same in any case.
Yes, sure. I justed copied the dfine and reworded it to match the AT91_$COMPONENT_BASE scheme. Always using USARTx is fine though.
Best regards,
Alexander Stein
PATCH 2/11 at91: Add USART & DBGU base address defines
Dear Alexander,
Am 01.11.2010 um 12:05 schrieb Alexander Stein:
Quoted 54 lines
Dear Andreas,
Quoted 33 lines · On Monday 01 November 2010, 11:57:14 Andreas Bie?mann wrote:
Am 01.11.2010 um 09:29 schrieb Alexander Stein:
Quoted 32 lines
Signed-off-by Alexander Stein <[email protected]>---
arch/arm/include/asm/arch-at91/at91cap9.h | 12 ++++++++---- arch/arm/include/asm/arch-at91/at91sam9260.h | 7 +++++++ arch/arm/include/asm/arch-at91/at91sam9261.h | 4 ++++ arch/arm/include/asm/arch-at91/at91sam9263.h | 3 +++ arch/arm/include/asm/arch-at91/at91sam9g45.h | 5 +++++ arch/arm/include/asm/arch-at91/at91sam9rl.h | 4 ++++ 6 files changed, 31 insertions(+), 4 deletions(-)arch/arm/include/asm/arch-at91/at91sam9g45.h +5
-0@@ -51,9 +51,14 @@#define AT91SAM9G45_ID_VDEC 30/* Video Decoder */ #define AT91SAM9G45_ID_IRQ0 31/* Advanced Interrupt Controller */ +#define AT91_USART0_BASE 0xfff8c000 +#define AT91_USART1_BASE 0xfff90000 +#define AT91_USART2_BASE 0xfff94000 +#define AT91_USART3_BASE 0xfff98000#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(quoted diff) +0
-0
b/arch/arm/include/asm/arch-at91/at91sam9rl.hindex 8eb0d4f..ffa6687 100644Quoted 5 lines
arch/arm/include/asm/arch-at91/at91sam9rl.h line 45
Quoted 5 lines
arch/arm/include/asm/arch-at91/at91sam9rl.h +0
-0@@ -44,6 +44,10 @@#define AT91SAM9RL_ID_AC97C 24/* AC97 Controller */ #define AT91SAM9RL_ID_IRQ0 31/* Advanced Interrupt Controller (IRQ0) */
Quoted 11 lines
arch/arm/include/asm/arch-at91/at91sam9rl.h line 53
Quoted 8 lines
arch/arm/include/asm/arch-at91/at91sam9rl.h +4
-0+#define AT91_US0_BASE 0xfffb0000 +#define AT91_US1_BASE 0xfffb4000 +#define AT91_US2_BASE 0xfffb8000 +#define AT91_US3_BASE 0xfffbc000#define AT91_SDRAMC_BASE 0xffffea00#define AT91_SMC_BASE 0xffffec00#define AT91_MATRIX_BASE 0xffffee00can we just use one naming scheme here? I dunno whether it should be
AT91_USxorAT91_USARTxbut it should be the same in any case.
Quoted 2 lines
Yes, sure. I justed copied the dfine and reworded it to match the AT91_$COMPONENT_BASE scheme. Always using USARTx is fine though.
Hmm ... I just thought they have renamed their registers in spec, but all checked datasheets use US_xx for USART register names. I also prefer USART here but Reinhard can you please give a comment?
regards
Andreas Bie?mann
PATCH 2/11 at91: Add USART & DBGU base address defines
Dear All concerned,
Quoted 52 lines
Quoted 52 lines · On Monday 01 November 2010, 11:57:14 Andreas Bie?mann wrote:
Quoted 33 lines
Am 01.11.2010 um 09:29 schrieb Alexander Stein:
Quoted 32 lines
Signed-off-by Alexander Stein<[email protected]>---
arch/arm/include/asm/arch-at91/at91cap9.h | 12 ++++++++---- arch/arm/include/asm/arch-at91/at91sam9260.h | 7 +++++++ arch/arm/include/asm/arch-at91/at91sam9261.h | 4 ++++ arch/arm/include/asm/arch-at91/at91sam9263.h | 3 +++ arch/arm/include/asm/arch-at91/at91sam9g45.h | 5 +++++ arch/arm/include/asm/arch-at91/at91sam9rl.h | 4 ++++ 6 files changed, 31 insertions(+), 4 deletions(-)arch/arm/include/asm/arch-at91/at91sam9g45.h +5
-0@@ -51,9 +51,14 @@#define AT91SAM9G45_ID_VDEC 30/* Video Decoder */ #define AT91SAM9G45_ID_IRQ0 31/* Advanced Interrupt Controller */ +#define AT91_USART0_BASE 0xfff8c000 +#define AT91_USART1_BASE 0xfff90000 +#define AT91_USART2_BASE 0xfff94000 +#define AT91_USART3_BASE 0xfff98000#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(quoted diff) +0
-0
b/arch/arm/include/asm/arch-at91/at91sam9rl.hindex 8eb0d4f..ffa6687 100644Quoted 5 lines
arch/arm/include/asm/arch-at91/at91sam9rl.h line 45
Quoted 5 lines
arch/arm/include/asm/arch-at91/at91sam9rl.h +0
-0@@ -44,6 +44,10 @@#define AT91SAM9RL_ID_AC97C 24/* AC97 Controller */ #define AT91SAM9RL_ID_IRQ0 31/* Advanced Interrupt Controller (IRQ0) */
Quoted 11 lines
arch/arm/include/asm/arch-at91/at91sam9rl.h line 53
Quoted 8 lines
arch/arm/include/asm/arch-at91/at91sam9rl.h +4
-0+#define AT91_US0_BASE 0xfffb0000 +#define AT91_US1_BASE 0xfffb4000 +#define AT91_US2_BASE 0xfffb8000 +#define AT91_US3_BASE 0xfffbc000#define AT91_SDRAMC_BASE 0xffffea00#define AT91_SMC_BASE 0xffffec00#define AT91_MATRIX_BASE 0xffffee00can we just use one naming scheme here? I dunno whether it should be
AT91_USxorAT91_USARTxbut it should be the same in any case.
Quoted 5 lines
Quoted 2 lines
Yes, sure. I justed copied the dfine and reworded it to match the AT91_$COMPONENT_BASE scheme. Always using USARTx is fine though.
Hmm ... I just thought they have renamed their registers in spec, but all checked datasheets use
US_xxfor USART register names. I also prefer USART here but Reinhard can you please give a comment?
Honestly I would prefer a much more thorough cleanup on the long run (or instantly):
As was pointed out long ago and just now: a triple indirection of the defines until used in the driver is bad.
Since only one of the at91samxxxx.h files is included, all files should directly define the address of a component like follows:
#define ATMEL_USART0_BASE 0x'something'
Note: that I used ATMEL, not AT91, since the same components are used in AVR32 as well.
The name should be descriptive enough, and preferably adhere to what the component is called in the datasheet(s). (Hopefully its consistent there...)
Another note: even if currently there is only one incarnation of some peripherals like emac or mci we should try to number them starting from 0, e.g. ATMEL_EMAC0_BASE.
As a way to go there I can offer to make a branch at91cleanup where I collect all work and which allows everyone to do incremental improvements which can be squashed into fewer patches later. Then we don't need to base all patch revisions on current master.
If you see no other priority, I would delay "build-fixing" individual boards, but concentrate on cleanup work. Right now is the best opportunity for that since most boards are not building anyway and do not need to be utterly concerned with breaking them even more. After the cleanup is done, we can attend to fixing certain boards.
Work could therefore start with cleaning up the at91samxxxx.h files. I am also game with throwing out all LEGACY stuff and fix build problems that occur when they occur.
If you agree, the cleanup in the *.h files should entail:
1. remove legacy parts
2. rename AT91xxxx_<component>_BASE consistently into ATMEL_<component>_BASE and make for example EMAC into EMAC0, I2C into I2C0. I am currently unsure if that needs to be done for SDRAMC, SMC. I think here we can live with SDRAMC and having SDRAMC1 _if_ there is a second one.
3. get rid of hardware.h and have a simple #if-elif-endif chain in memory_map.h instead. So that when memory_map.h is included and the proper #define AT91SAMxxxx is set we get exactly the defines valid for that SoC. memory_map.h is consistent with the AVR32 case. The common drivers all include memory_map.h.
This *.h cleanup could be patch 1/n of a series. Each individual driver cleanup to remove legacy and adapt to the naming would be 2/n, 3/n, etc. I am willing to collect them in the above mentioned branch and also squash incremental improvements later to produce a clean patch series later.
With best regards,
Reinhard
PATCH 2/11 at91: Add USART & DBGU base address defines
Dear All concerned,
Quoted 101 lines
Quoted 49 lines
Quoted 49 lines · On Monday 01 November 2010, 11:57:14 Andreas Bie?mann wrote:
Quoted 33 lines
Am 01.11.2010 um 09:29 schrieb Alexander Stein:
Quoted 32 lines
Signed-off-by Alexander Stein<[email protected]>---
arch/arm/include/asm/arch-at91/at91cap9.h | 12 ++++++++---- arch/arm/include/asm/arch-at91/at91sam9260.h | 7 +++++++ arch/arm/include/asm/arch-at91/at91sam9261.h | 4 ++++ arch/arm/include/asm/arch-at91/at91sam9263.h | 3 +++ arch/arm/include/asm/arch-at91/at91sam9g45.h | 5 +++++ arch/arm/include/asm/arch-at91/at91sam9rl.h | 4 ++++ 6 files changed, 31 insertions(+), 4 deletions(-)arch/arm/include/asm/arch-at91/at91sam9g45.h +5
-0@@ -51,9 +51,14 @@#define AT91SAM9G45_ID_VDEC 30/* Video Decoder */ #define AT91SAM9G45_ID_IRQ0 31/* Advanced Interrupt Controller */ +#define AT91_USART0_BASE 0xfff8c000 +#define AT91_USART1_BASE 0xfff90000 +#define AT91_USART2_BASE 0xfff94000 +#define AT91_USART3_BASE 0xfff98000#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(quoted diff) +0
-0
b/arch/arm/include/asm/arch-at91/at91sam9rl.hindex 8eb0d4f..ffa6687 100644Quoted 5 lines
arch/arm/include/asm/arch-at91/at91sam9rl.h line 45
Quoted 5 lines
arch/arm/include/asm/arch-at91/at91sam9rl.h +0
-0@@ -44,6 +44,10 @@#define AT91SAM9RL_ID_AC97C 24/* AC97 Controller */ #define AT91SAM9RL_ID_IRQ0 31/* Advanced Interrupt Controller (IRQ0) */
Quoted 9 lines
arch/arm/include/asm/arch-at91/at91sam9rl.h line 53
Quoted 7 lines
arch/arm/include/asm/arch-at91/at91sam9rl.h +4
-0+#define AT91_US0_BASE 0xfffb0000 +#define AT91_US1_BASE 0xfffb4000 +#define AT91_US2_BASE 0xfffb8000 +#define AT91_US3_BASE 0xfffbc000#define AT91_SDRAMC_BASE 0xffffea00#define AT91_SMC_BASE 0xffffec00#define AT91_MATRIX_BASE 0xffffee00can we just use one naming scheme here? I dunno whether it should be
AT91_USxorAT91_USARTxbut it should be the same in any case.Quoted 4 lines
Quoted 2 lines
Yes, sure. I justed copied the dfine and reworded it to match the AT91_$COMPONENT_BASE scheme. Always using USARTx is fine though.
Hmm ... I just thought they have renamed their registers in spec, but all checked datasheets use
US_xxfor USART register names. I also prefer USART here but Reinhard can you please give a comment?Honestly I would prefer a much more thorough cleanup on the long run (or instantly):
As was pointed out long ago and just now: a triple indirection of the defines until used in the driver is bad.
Since only one of the
at91samxxxx.hfiles is included, all files should directly define the address of a component like follows:#define
ATMEL_USART0_BASE0x'something'Note: that I used ATMEL, not AT91, since the same components are used in AVR32 as well.
The name should be descriptive enough, and preferably adhere to what the component is called in the datasheet(s). (Hopefully its consistent there...)
Another note: even if currently there is only one incarnation of some peripherals like emac or mci we should try to number them starting from 0, e.g.
ATMEL_EMAC0_BASE.As a way to go there I can offer to make a branch at91cleanup where I collect all work and which allows everyone to do incremental improvements which can be squashed into fewer patches later. Then we don't need to base all patch revisions on current master.
If you see no other priority, I would delay "build-fixing" individual boards, but concentrate on cleanup work. Right now is the best opportunity for that since most boards are not building anyway and do not need to be utterly concerned with breaking them even more. After the cleanup is done, we can attend to fixing certain boards.
Work could therefore start with cleaning up the
at91samxxxx.hfiles. I am also game with throwing out all LEGACY stuff and fix build problems that occur when they occur.If you agree, the cleanup in the *.h files should entail:
1. remove legacy parts
2. rename AT91xxxx_<component>_BASE consistently into ATMEL_<component>_BASE and make for example EMAC into EMAC0, I2C into I2C0. I am currently unsure if that needs to be done for SDRAMC, SMC. I think here we can live with SDRAMC and having SDRAMC1 _if_ there is a second one.
3. get rid ofhardware.hand have a simple #if-elif-endif chain inmemory_map.hinstead. So that whenmemory_map.his included and the proper #define AT91SAMxxxx is set we get exactly the defines valid for that SoC.memory_map.his consistent with the AVR32 case. The common drivers all includememory_map.h.
Quoted 4 lines
This *.h cleanup could be patch 1/n of a series. Each individual driver cleanup to remove legacy and adapt to the naming would be 2/n, 3/n, etc. I am willing to collect them in the above mentioned branch and also squash incremental improvements later to produce a clean patch series later.
Another optical issue:
We have ATxxx_ID_yyy consistently. but
both ATxxx_BASE_yyy or ATxxx_yyy_BASE.
ATxxx_BASE_yyy would be consistent with the ID variant and look better:ATMEL_BASE_USART0ATMEL_BASE_SPI0
...
With best regards,
Reinhard
[U-Boot] [RFC] AT91 cleanup, was: Re: [PATCH 02/11] at91: Add USART & DBGU base address defines
Quoted 4 lines · Reinhard Meyer
Dear All concerned,
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines · On Monday 01 November 2010, 11:57:14 Andreas Bie?mann wrote:
Quoted 2 lines
Am 01.11.2010 um 09:29 schrieb Alexander Stein:
Quoted 1 line
Signed-off-by Alexander Stein<[email protected]>
...
Quoted 62 lines
Quoted 55 lines
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
Quoted 1 line
#define
AT91_MATRIX_BASE0xffffee00can we just use one naming scheme here? I dunno whether it should be
AT91_USxorAT91_USARTxbut it should be the same in any case.Yes, sure. I justed copied the dfine and reworded it to match the AT91_$COMPONENT_BASE scheme. Always using USARTx is fine though.
Hmm ... I just thought they have renamed their registers in spec, but all checked datasheets use
US_xxfor USART register names. I also prefer USART here but Reinhard can you please give a comment?Honestly I would prefer a much more thorough cleanup on the long run (or instantly):
As was pointed out long ago and just now: a triple indirection of the defines until used in the driver is bad.
Since only one of the
at91samxxxx.hfiles is included, all files should directly define the address of a component like follows:#define
ATMEL_USART0_BASE0x'something'Note: that I used ATMEL, not AT91, since the same components are used in AVR32 as well.
The name should be descriptive enough, and preferably adhere to what the component is called in the datasheet(s). (Hopefully its consistent there...)
Another note: even if currently there is only one incarnation of some peripherals like emac or mci we should try to number them starting from 0, e.g.
ATMEL_EMAC0_BASE.As a way to go there I can offer to make a branch at91cleanup where I collect all work and which allows everyone to do incremental improvements which can be squashed into fewer patches later. Then we don't need to base all patch revisions on current master.
If you see no other priority, I would delay "build-fixing" individual boards, but concentrate on cleanup work. Right now is the best opportunity for that since most boards are not building anyway and do not need to be utterly concerned with breaking them even more. After the cleanup is done, we can attend to fixing certain boards.
Work could therefore start with cleaning up the
at91samxxxx.hfiles. I am also game with throwing out all LEGACY stuff and fix build problems that occur when they occur.If you agree, the cleanup in the *.h files should entail:
1. remove legacy parts
2. rename AT91xxxx_<component>_BASE consistently into ATMEL_<component>_BASE and make for example EMAC into EMAC0, I2C into I2C0. I am currently unsure if that needs to be done for SDRAMC, SMC. I think here we can live with SDRAMC and having SDRAMC1 _if_ there is a second one.
3. get rid ofhardware.hand have a simple #if-elif-endif chain inmemory_map.hinstead. So that whenmemory_map.his included and the proper #define AT91SAMxxxx is set we get exactly the defines valid for that SoC.memory_map.his consistent with the AVR32 case. The common drivers all includememory_map.h.Quoted 4 lines
This *.h cleanup could be patch 1/n of a series. Each individual driver cleanup to remove legacy and adapt to the naming would be 2/n, 3/n, etc. I am willing to collect them in the above mentioned branch and also squash incremental improvements later to produce a clean patch series later.
Another optical issue:
Quoted 8 lines
We have
ATxxx_ID_yyyconsistently. butboth
ATxxx_BASE_yyyorATxxx_yyy_BASE.
ATxxx_BASE_yyywould be consistent with the ID variant and look better:ATMEL_BASE_USART0ATMEL_BASE_SPI0
...
I leaped a bit ahead there, and did some cleanups already. Note that they are not complete and are up for discussion. In order to avoid flooding the list with patches, you can have a look at u-boot-atmel, at91cleanup branch.
With best regards,
Reinhard
[U-Boot] [RFC] AT91 cleanup, was: Re: [PATCH 02/11] at91: Add USART & DBGU base address defines
Hello,
Quoted 4 lines · On Tuesday 02 November 2010, 15:11:00 Reinhard Meyer wrote:
I leaped a bit ahead there, and did some cleanups already. Note that they are not complete and are up for discussion. In order to avoid flooding the list with patches, you can have a look at u-boot-atmel, at91cleanup branch.
At a first look it seems OK to me. Could be a good starting base.
Best regards,
Alexander
[U-Boot] [RFC] AT91 cleanup, was: Re: [PATCH 02/11] at91: Add USART & DBGU base address defines
Dear Alexander Stein,
Quoted 9 lines
Hello,
Quoted 4 lines · On Tuesday 02 November 2010, 15:11:00 Reinhard Meyer wrote:
I leaped a bit ahead there, and did some cleanups already. Note that they are not complete and are up for discussion. In order to avoid flooding the list with patches, you can have a look at u-boot-atmel, at91cleanup branch.
At a first look it seems OK to me. Could be a good starting base.
Thank you. I see the following issues left:
Basically all legacy is gone in the drivers I use for TOP9000, except for accesses to SMC, PMC and MATRIX.
When that is fixed arch/asm/io.h is not needed anymore.
ATMEL_ID_EMAC --> ATMEL_ID_EMAC0
CONFIG_USART_ID should be set to ATMEL_ID_USARTx to be prepared once there are different clock domains per USART (this is not the case right now on AT91 SoCs, but used in AVR32)
CONFIG_SYS_AT91_xxx_CLOCK could be shorter: CONFIG_SYS_xxx_CLOCK
AVR32 includes "memory-map.h", AT91 did include "hardware.h". I changed that to "memory-map.h" and deleted hardware.h. However including "hardware.h" seems common in other architectures. We could go for hardware.h and adapt the AVR32 case.
Finally eliminate all LEGACY definitions in the header files.
...?
Best Regards,
Reinhard
[U-Boot] [RFC] AT91 cleanup, was: Re: [PATCH 02/11] at91: Add USART & DBGU base address defines
Dear Reinhard Meyer,
Am 03.11.2010 10:17, schrieb Reinhard Meyer:
Quoted 1 line
ATMEL_ID_EMAC-->ATMEL_ID_EMAC0
emac? isn't the sam9/avr32 mac called macb?
Quoted 4 lines
AVR32 includes "
memory-map.h", AT91 did include "hardware.h". I changed that to "memory-map.h" and deletedhardware.h. However including "hardware.h" seems common in other architectures. We could go forhardware.hand adapt the AVR32 case.
I prefer hardware.h, will change avr32 case cause i am currently working with avr32 board.
Quoted 1 line
Finally eliminate all LEGACY definitions in the header files.
would be fine
regards
Andreas Bie?mann
[U-Boot] [RFC] AT91 cleanup, was: Re: [PATCH 02/11] at91: Add USART & DBGU base address defines
Quoted 6 lines · Andreas Bie?mann
Dear Reinhard Meyer,
Am 03.11.2010 10:17, schrieb Reinhard Meyer:Quoted 1 line
ATMEL_ID_EMAC-->ATMEL_ID_EMAC0emac? isn't the sam9/avr32 mac called macb?
In AT91 its called EMAC, but uses the MACB driver. Ask ATMEL why it is named differently :)
The value ATMEL_BASE_EMAC0 is a parameter to the MACB driver, so it does not matter how it is named.
I try to use the component names as used in the chapter headers of the datasheets. Where it is likely that there are multiple incarnations of the same component in the future, I will number the only one with "0". (There are 2x EMAC variants of the AT91 in the cooker).
Quoted 7 lines
Quoted 4 lines
AVR32 includes "
memory-map.h", AT91 did include "hardware.h". I changed that to "memory-map.h" and deletedhardware.h. However including "hardware.h" seems common in other architectures. We could go forhardware.hand adapt the AVR32 case.I prefer
hardware.h, will change avr32 case cause i am currently working with avr32 board.
Do you have a ATNGW100 to check changes for that one? Ok, I will undo the changes and remove "memory-map.h" instead.
Quoted 3 lines
Quoted 1 line
Finally eliminate all LEGACY definitions in the header files.
would be fine
All in at91sam9260.h have gone already.
Best Regards,
Reinhard
[U-Boot] [RFC] AT91 cleanup, was: Re: [PATCH 02/11] at91: Add USART & DBGU base address defines
Dear Reinhard Meyer,
Am 03.11.2010 11:03, schrieb Reinhard Meyer:
Quoted 8 lines
Quoted 5 lines · Andreas Bie?mann
Dear Reinhard Meyer,
Am 03.11.2010 10:17, schrieb Reinhard Meyer:I prefer
hardware.h, will change avr32 case cause i am currently working with avr32 board.Do you have a ATNGW100 to check changes for that one?
No, I have a stk1002. But the RFC patch just sent was only tested on my own board.
Quoted 1 line
Ok, I will undo the changes and remove "
memory-map.h" instead.
sounds good
regards
Andreas Bie?mann
RFC PATCH v2 1/2 AVR32: move memory-map.h to hardware.h
In reply to Reinhard Meyer - fixup address definitions as done in at91
- fixup required files in arch/avr32
--- arch/avr32/cpu/at32ap700x/clk.c | 2 +- arch/avr32/cpu/at32ap700x/portmux.c | 2 +- arch/avr32/cpu/at32ap700x/sm.h | 4 +- arch/avr32/cpu/cpu.c | 2 +- arch/avr32/cpu/hsdramc.c | 2 +- arch/avr32/cpu/hsdramc1.h | 4 +- arch/avr32/cpu/hsmc3.h | 4 +- arch/avr32/cpu/interrupts.c | 4 +- arch/avr32/cpu/portmux-gpio.c | 2 +- arch/avr32/cpu/portmux-pio.c | 2 +- arch/avr32/include/asm/arch-at32ap700x/gpio.h | 12 ++-- arch/avr32/include/asm/arch-at32ap700x/hardware.h | 86 ++++++++++++++++++++ .../avr32/include/asm/arch-at32ap700x/memory-map.h | 86 -------------------- arch/avr32/include/asm/arch-at32ap700x/portmux.h | 10 +- arch/avr32/include/asm/hmatrix-common.h | 2 +- 15 files changed, 112 insertions(+), 112 deletions(-) create mode 100644 arch/avr32/include/asm/arch-at32ap700x/hardware.h delete mode 100644 arch/avr32/include/asm/arch-at32ap700x/memory-map.h
arch/avr32/cpu/at32ap700x/clk.c +1 -1
@@ -24,7 +24,7 @@#include <asm/io.h> #include <asm/arch/clk.h> -#include <asm/arch/memory-map.h> +#include <asm/arch/hardware.h> #include <asm/arch/portmux.h> #include "sm.h"
arch/avr32/cpu/at32ap700x/portmux.c +1 -1
@@ -24,7 +24,7 @@#include <asm/io.h> #include <asm/arch/chip-features.h> -#include <asm/arch/memory-map.h> +#include <asm/arch/hardware.h> #include <asm/arch/portmux.h> /*
arch/avr32/cpu/at32ap700x/sm.h +2 -2
@@ -197,8 +197,8 @@/* Register access macros */ #define sm_readl (reg) \ - readl((void *)SM_BASE + SM_##reg) + readl((void *)ATMEL_BASE_SM + SM_##reg)#define sm_writel (reg,value) \ - writel((value), (void *)SM_BASE + SM_##reg) + writel((value), (void *)ATMEL_BASE_SM + SM_##reg)#endif /* __CPU_AT32AP_SM_H__ */
arch/avr32/cpu/cpu.c +1 -1
@@ -27,7 +27,7 @@#include <asm/sysreg.h> #include <asm/arch/clk.h> -#include <asm/arch/memory-map.h> +#include <asm/arch/hardware.h> #include "hsmc3.h"
arch/avr32/cpu/hsdramc.c +1 -1
@@ -25,7 +25,7 @@#include <asm/sdram.h> #include <asm/arch/clk.h> -#include <asm/arch/memory-map.h> +#include <asm/arch/hardware.h> #include "hsdramc1.h"
arch/avr32/cpu/hsdramc1.h +2 -2
@@ -136,8 +136,8 @@/* Register access macros */ #define hsdramc1_readl (reg) \ - readl((void *)HSDRAMC_BASE + HSDRAMC1_##reg) + readl((void *)ATMEL_BASE_HSDRAMC + HSDRAMC1_##reg)#define hsdramc1_writel (reg,value) \ - writel((value), (void *)HSDRAMC_BASE + HSDRAMC1_##reg) + writel((value), (void *)ATMEL_BASE_HSDRAMC + HSDRAMC1_##reg)#endif /* __ASM_AVR32_HSDRAMC1_H__ */
arch/avr32/cpu/hsmc3.h +2 -2
@@ -119,8 +119,8 @@/* Register access macros */ #define hsmc3_readl (reg) \ - readl((void *)HSMC_BASE + HSMC3_##reg) + readl((void *)ATMEL_BASE_HSMC + HSMC3_##reg)#define hsmc3_writel (reg,value) \ - writel((value), (void *)HSMC_BASE + HSMC3_##reg) + writel((value), (void *)ATMEL_BASE_HSMC + HSMC3_##reg)#endif /* __CPU_AT32AP_HSMC3_H__ */
arch/avr32/cpu/interrupts.c +2 -2
@@ -27,7 +27,7 @@#include <asm/processor.h> #include <asm/sysreg.h> -#include <asm/arch/memory-map.h> +#include <asm/arch/hardware.h> #define HANDLER_MASK 0x00ffffff#define INTLEV_SHIFT 30
@@ -125,7 +125,7 @@ static int set_interrupt_handler(unsigned int nr, void (*handler)(void), intpr = (handler_addr &HANDLER_MASK ); intpr |= (priority &INTLEV_MASK ) <<INTLEV_SHIFT ; -writel (intpr, (void *)INTC_BASE +4 * nr); +writel (intpr, (void *)ATMEL_BASE_INTC +4 * nr);return 0 ; }
arch/avr32/cpu/portmux-gpio.c +1 -1
@@ -22,7 +22,7 @@#include <common.h> #include <asm/io.h> -#include <asm/arch/memory-map.h> +#include <asm/arch/hardware.h> #include <asm/arch/gpio.h> void portmux_select_peripheral(void *port, unsigned long pin_mask,
arch/avr32/cpu/portmux-pio.c +1 -1
@@ -22,7 +22,7 @@#include <common.h> #include <asm/io.h> -#include <asm/arch/memory-map.h> +#include <asm/arch/hardware.h> #include <asm/arch/gpio.h> void portmux_select_peripheral(void *port, unsigned long pin_mask,
arch/avr32/include/asm/arch-at32ap700x/gpio.h +6 -6
@@ -23,7 +23,7 @@#define __ASM_AVR32_ARCH_GPIO_H__#include <asm/arch/chip-features.h> -#include <asm/arch/memory-map.h> +#include <asm/arch/hardware.h> #define NR_GPIO_CONTROLLERS 5
@@ -45,15 +45,15 @@ static inline void *pio_pin_to_port(unsigned int pin) {switch (pin >>5 ) {case 0 : -return (void *)PIOA_BASE ; +return (void *)ATMEL_BASE_PIOA ;case 1 : -return (void *)PIOB_BASE ; +return (void *)ATMEL_BASE_PIOB ;case 2 : -return (void *)PIOC_BASE ; +return (void *)ATMEL_BASE_PIOC ;case 3 : -return (void *)PIOD_BASE ; +return (void *)ATMEL_BASE_PIOD ;case 4 : -return (void *)PIOE_BASE ; +return (void *)ATMEL_BASE_PIOE ;default :return NULL ; }
arch/avr32/include/asm/arch-at32ap700x/hardware.h new file +86 -0
86 lines not on this page · raw message
arch/avr32/include/asm/arch-at32ap700x/memory-map.h deleted +0 -86
86 lines not on this page · raw message
arch/avr32/include/asm/arch-at32ap700x/portmux.h +5 -5
@@ -24,11 +24,11 @@#include <asm/arch/gpio.h> -#define PORTMUX_PORT_A ((void *)PIOA_BASE) -#define PORTMUX_PORT_B ((void *)PIOB_BASE) -#define PORTMUX_PORT_C ((void *)PIOC_BASE) -#define PORTMUX_PORT_D ((void *)PIOD_BASE) -#define PORTMUX_PORT_E ((void *)PIOE_BASE) +#define PORTMUX_PORT_A ((void *)ATMEL_BASE_PIOA) +#define PORTMUX_PORT_B ((void *)ATMEL_BASE_PIOB) +#define PORTMUX_PORT_C ((void *)ATMEL_BASE_PIOC) +#define PORTMUX_PORT_D ((void *)ATMEL_BASE_PIOD) +#define PORTMUX_PORT_E ((void *)ATMEL_BASE_PIOE)void portmux_enable_ebi (unsigned int bus_width,unsigned int addr_width,unsigned long flags,unsigned long drive_strength);
arch/avr32/include/asm/hmatrix-common.h +1 -1
@@ -117,7 +117,7 @@ struct hmatrix_regs {/* Register access macros */ #define __hmatrix_reg (reg) \ - (((volatile struct hmatrix_regs *)HMATRIX_BASE)->reg) + (((volatile struct hmatrix_regs *)ATMEL_BASE_HMATRIX)->reg)#define hmatrix_read (reg) \ (__hmatrix_reg(reg))#define hmatrix_write (reg, value) \
Signature · 1 line
1.7.2.3
RFC PATCH 1/2 AVR32: move memory-map.h to hardware.h
Dear Andreas Bie?mann,
Quoted 8 lines
- fixup address definitions as done in at91
- fixup required files inarch/avr32Signed-off-by Andreas Bie?mann <[email protected]>---
create mode 100644 arch/avr32/include/asm/arch-at32ap700x/hardware.h delete mode 100644 arch/avr32/include/asm/arch-at32ap700x/memory-map.h
You should use git mv <old> <new> and then git format-patch -C to have a rename operation in the patch. So everyone later can see it was a rename with subsequent edit.
And then checkpatch complains as follows:
ERROR: patch seems to be corrupt (line wrapped?)
#71: FILE: arch/avr32/cpu/at32ap700x/clk.c:24:
=20
WARNING: Use of volatile is usually wrong: see Documentation/volatile-considered-harmful.txt #467: FILE: arch/avr32/include/asm/hmatrix-common.h:119:
+ (((volatile struct hmatrix_regs *)ATMEL_BASE_HMATRIX)->reg)
total: 1 errors, 1 warnings, 275 lines checked
The warning can be ignored.
Best Regards,
Reinhard
RFC PATCH 1/2 AVR32: move memory-map.h to hardware.h
In reply to Andreas BießmannDear Andreas Bie?mann,
Quoted 2 lines
- fixup address definitions as done in at91
- fixup required files inarch/avr32
Please also rebase onto the at91cleanup-rework branch, three common files (usart, spi, gen_mci) were fixed by me already, since they are used in my top9000 board.
Best Regards,
Reinhard
v2 cover adopt avr32 to latest changes in u-boot-atmel/at91cleanup-rework
In reply to Andreas BießmannDear Reinhard Meyer,
This series is on top of da94dc9ab80b30da0cd3ecadea27fd04f03a4489 in u-boot-atmel/at91cleanup-rework. It renames memory-map.h to hardware.h and do the rename of definitions like ATMEL_BASE_xx schema used in at91.
Tested to work on atstk1002 and selfmade, not jet upstream board.
regards
Andreas Bie?mann
Andreas Bie?mann (2):
avr32: rename memory-map.h -> hardware.h
avr32: fixup definitions to ATMEL_BASE_xxx
arch/avr32/cpu/at32ap700x/clk.c | 2 +-
arch/avr32/cpu/at32ap700x/portmux.c | 2 +-
arch/avr32/cpu/at32ap700x/sm.h | 4 +-
arch/avr32/cpu/cpu.c | 2 +-
arch/avr32/cpu/hsdramc.c | 2 +-
arch/avr32/cpu/hsdramc1.h | 4 +-
arch/avr32/cpu/hsmc3.h | 4 +-
arch/avr32/cpu/interrupts.c | 4 +-
arch/avr32/cpu/portmux-gpio.c | 2 +-
arch/avr32/cpu/portmux-pio.c | 2 +-
arch/avr32/include/asm/arch-at32ap700x/gpio.h | 12 ++--
.../arch-at32ap700x/{memory-map.h => hardware.h} | 76 ++++++++++----------
arch/avr32/include/asm/arch-at32ap700x/portmux.h | 10 ++--
arch/avr32/include/asm/hmatrix-common.h | 2 +-
board/atmel/atngw100/atngw100.c | 4 +-
board/atmel/atstk1000/atstk1000.c | 4 +-
board/earthlcd/favr-32-ezkit/favr-32-ezkit.c | 2 +-
board/mimc/mimc200/mimc200.c | 4 +-
board/miromico/hammerhead/hammerhead.c | 4 +-
drivers/mmc/atmel_mci.c | 2 +-
drivers/mmc/atmel_mci.h | 4 +-
include/configs/atngw100.h | 6 +-
include/configs/atstk1002.h | 8 +--
include/configs/atstk1003.h | 8 +--
include/configs/atstk1004.h | 8 +--
include/configs/atstk1006.h | 8 +--
include/configs/favr-32-ezkit.h | 8 +--
include/configs/hammerhead.h | 3 +-
include/configs/mimc200.h | 6 +-
29 files changed, 100 insertions(+), 107 deletions(-)
rename arch/avr32/include/asm/arch-at32ap700x/{memory-map.h => hardware.h} (53%)Signature · 1 line
1.7.2.3
PATCH v2 1/2 avr32: rename memory-map.h -> hardware.h
In reply to Andreas Bießmann---
changes since v1:
- only rename in this patch and fixup includes in respective includes
- use 'format-patch -C'
arch/avr32/cpu/at32ap700x/clk.c | 2 +-
arch/avr32/cpu/at32ap700x/portmux.c | 2 +-
arch/avr32/cpu/cpu.c | 2 +-
arch/avr32/cpu/hsdramc.c | 2 +-
arch/avr32/cpu/interrupts.c | 2 +-
arch/avr32/cpu/portmux-gpio.c | 2 +-
arch/avr32/cpu/portmux-pio.c | 2 +-
arch/avr32/include/asm/arch-at32ap700x/gpio.h | 2 +-
.../arch-at32ap700x/{memory-map.h => hardware.h} | 0
board/miromico/hammerhead/hammerhead.c | 2 +-
drivers/mmc/atmel_mci.c | 2 +-
include/configs/atngw100.h | 2 +-
include/configs/atstk1002.h | 2 +-
include/configs/atstk1003.h | 2 +-
include/configs/atstk1004.h | 2 +-
include/configs/atstk1006.h | 2 +-
include/configs/favr-32-ezkit.h | 2 +-
include/configs/mimc200.h | 2 +-
18 files changed, 17 insertions(+), 17 deletions(-)
rename arch/avr32/include/asm/arch-at32ap700x/{memory-map.h => hardware.h} (100%)arch/avr32/cpu/at32ap700x/clk.c +1 -1
@@ -24,7 +24,7 @@#include <asm/io.h> #include <asm/arch/clk.h> -#include <asm/arch/memory-map.h> +#include <asm/arch/hardware.h> #include <asm/arch/portmux.h> #include "sm.h"
arch/avr32/cpu/at32ap700x/portmux.c +1 -1
@@ -24,7 +24,7 @@#include <asm/io.h> #include <asm/arch/chip-features.h> -#include <asm/arch/memory-map.h> +#include <asm/arch/hardware.h> #include <asm/arch/portmux.h> /*
arch/avr32/cpu/cpu.c +1 -1
@@ -27,7 +27,7 @@#include <asm/sysreg.h> #include <asm/arch/clk.h> -#include <asm/arch/memory-map.h> +#include <asm/arch/hardware.h> #include "hsmc3.h"
arch/avr32/cpu/hsdramc.c +1 -1
@@ -25,7 +25,7 @@#include <asm/sdram.h> #include <asm/arch/clk.h> -#include <asm/arch/memory-map.h> +#include <asm/arch/hardware.h> #include "hsdramc1.h"
arch/avr32/cpu/interrupts.c +1 -1
@@ -27,7 +27,7 @@#include <asm/processor.h> #include <asm/sysreg.h> -#include <asm/arch/memory-map.h> +#include <asm/arch/hardware.h> #define HANDLER_MASK 0x00ffffff#define INTLEV_SHIFT 30
arch/avr32/cpu/portmux-gpio.c +1 -1
@@ -22,7 +22,7 @@#include <common.h> #include <asm/io.h> -#include <asm/arch/memory-map.h> +#include <asm/arch/hardware.h> #include <asm/arch/gpio.h> void portmux_select_peripheral(void *port, unsigned long pin_mask,
arch/avr32/cpu/portmux-pio.c +1 -1
@@ -22,7 +22,7 @@#include <common.h> #include <asm/io.h> -#include <asm/arch/memory-map.h> +#include <asm/arch/hardware.h> #include <asm/arch/gpio.h> void portmux_select_peripheral(void *port, unsigned long pin_mask,
arch/avr32/include/asm/arch-at32ap700x/gpio.h +1 -1
@@ -23,7 +23,7 @@#define __ASM_AVR32_ARCH_GPIO_H__#include <asm/arch/chip-features.h> -#include <asm/arch/memory-map.h> +#include <asm/arch/hardware.h> #define NR_GPIO_CONTROLLERS 5
arch/avr32/include/asm/arch-at32ap700x/hardware.h renamed from arch/avr32/include/asm/arch-at32ap700x/memory-map.h +0 -0
board/miromico/hammerhead/hammerhead.c +1 -1
@@ -29,7 +29,7 @@#include <asm/sdram.h> #include <asm/arch/clk.h> #include <asm/arch/hmatrix.h> -#include <asm/arch/memory-map.h> +#include <asm/arch/hardware.h> #include <asm/arch/mmu.h> #include <asm/arch/portmux.h>
drivers/mmc/atmel_mci.c +1 -1
@@ -28,7 +28,7 @@#include <asm/errno.h> #include <asm/byteorder.h> #include <asm/arch/clk.h> -#include <asm/arch/memory-map.h> +#include <asm/arch/hardware.h> #include "atmel_mci.h"
include/configs/atngw100.h +1 -1
@@ -24,7 +24,7 @@#ifndef __CONFIG_H#define __CONFIG_H -#include <asm/arch/memory-map.h> +#include <asm/arch/hardware.h> #define CONFIG_AVR32 1#define CONFIG_AT32AP 1
include/configs/atstk1002.h +1 -1
@@ -24,7 +24,7 @@#ifndef __CONFIG_H#define __CONFIG_H -#include <asm/arch/memory-map.h> +#include <asm/arch/hardware.h> #define CONFIG_AVR32 1#define CONFIG_AT32AP 1
include/configs/atstk1003.h +1 -1
@@ -24,7 +24,7 @@#ifndef __CONFIG_H#define __CONFIG_H -#include <asm/arch/memory-map.h> +#include <asm/arch/hardware.h> #define CONFIG_AVR32 1#define CONFIG_AT32AP 1
include/configs/atstk1004.h +1 -1
@@ -24,7 +24,7 @@#ifndef __CONFIG_H#define __CONFIG_H -#include <asm/arch/memory-map.h> +#include <asm/arch/hardware.h> #define CONFIG_AVR32 1#define CONFIG_AT32AP 1
include/configs/atstk1006.h +1 -1
@@ -24,7 +24,7 @@#ifndef __CONFIG_H#define __CONFIG_H -#include <asm/arch/memory-map.h> +#include <asm/arch/hardware.h> #define CONFIG_AVR32 1#define CONFIG_AT32AP 1
include/configs/favr-32-ezkit.h +1 -1
@@ -22,7 +22,7 @@#ifndef __CONFIG_H#define __CONFIG_H -#include <asm/arch/memory-map.h> +#include <asm/arch/hardware.h> #define CONFIG_AVR32 1#define CONFIG_AT32AP 1
include/configs/mimc200.h +1 -1
@@ -24,7 +24,7 @@#ifndef __CONFIG_H#define __CONFIG_H -#include <asm/arch/memory-map.h> +#include <asm/arch/hardware.h> #define CONFIG_AVR32 1#define CONFIG_AT32AP 1
Signature · 1 line
1.7.2.3
PATCH v2 1/2 avr32: rename memory-map.h -> hardware.h
Dear Andreas Bie?mann:
Quoted 18 lines
Signed-off-by Andreas Bie?mann <[email protected]>---
changes since v1:
- only rename in this patch and fixup includes in respective includes
- use 'format-patch -C'arch/avr32/cpu/at32ap700x/clk.c | 2 +- arch/avr32/cpu/at32ap700x/portmux.c | 2 +- arch/avr32/cpu/cpu.c | 2 +- arch/avr32/cpu/hsdramc.c | 2 +- arch/avr32/cpu/interrupts.c | 2 +- arch/avr32/cpu/portmux-gpio.c | 2 +- arch/avr32/cpu/portmux-pio.c | 2 +- arch/avr32/include/asm/arch-at32ap700x/gpio.h | 2 +- .../arch-at32ap700x/{memory-map.h => hardware.h} | 0 board/miromico/hammerhead/hammerhead.c | 2 +- drivers/mmc/atmel_mci.c | 2 +- include/configs/atngw100.h | 2 +-
Quoted 8 lines
include/configs/atstk1002.h | 2 +-
include/configs/atstk1003.h | 2 +-
include/configs/atstk1004.h | 2 +-
include/configs/atstk1006.h | 2 +-
include/configs/favr-32-ezkit.h | 2 +-
include/configs/mimc200.h | 2 +-
18 files changed, 17 insertions(+), 17 deletions(-)
rename arch/avr32/include/asm/arch-at32ap700x/{memory-map.h => hardware.h} (100%)Applied into u-boot-atmel/next.
Thanks,
Reinhard
PATCH v2 2/2 avr32: fixup definitions to ATMEL_BASE_xxx
In reply to Andreas Bießmann---
changes since v1:
- only rename definitions to ATMEL_BASE_xx schema in this patch
- rename of memeory-map.h -> hardweare.h is required before
arch/avr32/cpu/at32ap700x/sm.h | 4 +- arch/avr32/cpu/hsdramc1.h | 4 +- arch/avr32/cpu/hsmc3.h | 4 +- arch/avr32/cpu/interrupts.c | 2 +- arch/avr32/include/asm/arch-at32ap700x/gpio.h | 10 ++-- arch/avr32/include/asm/arch-at32ap700x/hardware.h | 76 ++++++++++---------- arch/avr32/include/asm/arch-at32ap700x/portmux.h | 10 ++-- arch/avr32/include/asm/hmatrix-common.h | 2 +- board/atmel/atngw100/atngw100.c | 4 +- board/atmel/atstk1000/atstk1000.c | 4 +- board/earthlcd/favr-32-ezkit/favr-32-ezkit.c | 2 +- board/mimc/mimc200/mimc200.c | 4 +- board/miromico/hammerhead/hammerhead.c | 2 +- drivers/mmc/atmel_mci.h | 4 +- include/configs/atngw100.h | 4 +- include/configs/atstk1002.h | 6 +- include/configs/atstk1003.h | 6 +- include/configs/atstk1004.h | 6 +- include/configs/atstk1006.h | 6 +- include/configs/favr-32-ezkit.h | 6 +- include/configs/hammerhead.h | 3 +- include/configs/mimc200.h | 4 +- 22 files changed, 83 insertions(+), 90 deletions(-)
arch/avr32/cpu/at32ap700x/sm.h +2 -2
@@ -197,8 +197,8 @@/* Register access macros */ #define sm_readl (reg) \ - readl((void *)SM_BASE + SM_##reg) + readl((void *)ATMEL_BASE_SM + SM_##reg)#define sm_writel (reg,value) \ - writel((value), (void *)SM_BASE + SM_##reg) + writel((value), (void *)ATMEL_BASE_SM + SM_##reg)#endif /* __CPU_AT32AP_SM_H__ */
arch/avr32/cpu/hsdramc1.h +2 -2
@@ -136,8 +136,8 @@/* Register access macros */ #define hsdramc1_readl (reg) \ - readl((void *)HSDRAMC_BASE + HSDRAMC1_##reg) + readl((void *)ATMEL_BASE_HSDRAMC + HSDRAMC1_##reg)#define hsdramc1_writel (reg,value) \ - writel((value), (void *)HSDRAMC_BASE + HSDRAMC1_##reg) + writel((value), (void *)ATMEL_BASE_HSDRAMC + HSDRAMC1_##reg)#endif /* __ASM_AVR32_HSDRAMC1_H__ */
arch/avr32/cpu/hsmc3.h +2 -2
@@ -119,8 +119,8 @@/* Register access macros */ #define hsmc3_readl (reg) \ - readl((void *)HSMC_BASE + HSMC3_##reg) + readl((void *)ATMEL_BASE_HSMC + HSMC3_##reg)#define hsmc3_writel (reg,value) \ - writel((value), (void *)HSMC_BASE + HSMC3_##reg) + writel((value), (void *)ATMEL_BASE_HSMC + HSMC3_##reg)#endif /* __CPU_AT32AP_HSMC3_H__ */
arch/avr32/cpu/interrupts.c +1 -1
@@ -125,7 +125,7 @@ static int set_interrupt_handler(unsigned int nr, void (*handler)(void), intpr = (handler_addr &HANDLER_MASK ); intpr |= (priority &INTLEV_MASK ) <<INTLEV_SHIFT ; -writel (intpr, (void *)INTC_BASE +4 * nr); +writel (intpr, (void *)ATMEL_BASE_INTC +4 * nr);return 0 ; }
arch/avr32/include/asm/arch-at32ap700x/gpio.h +5 -5
@@ -45,15 +45,15 @@ static inline void *pio_pin_to_port(unsigned int pin) {switch (pin >>5 ) {case 0 : -return (void *)PIOA_BASE ; +return (void *)ATMEL_BASE_PIOA ;case 1 : -return (void *)PIOB_BASE ; +return (void *)ATMEL_BASE_PIOB ;case 2 : -return (void *)PIOC_BASE ; +return (void *)ATMEL_BASE_PIOC ;case 3 : -return (void *)PIOD_BASE ; +return (void *)ATMEL_BASE_PIOD ;case 4 : -return (void *)PIOE_BASE ; +return (void *)ATMEL_BASE_PIOE ;default :return NULL ; }
arch/avr32/include/asm/arch-at32ap700x/hardware.h +38 -38
90 lines not on this page · raw message
arch/avr32/include/asm/arch-at32ap700x/portmux.h +5 -5
@@ -24,11 +24,11 @@#include <asm/arch/gpio.h> -#define PORTMUX_PORT_A ((void *)PIOA_BASE) -#define PORTMUX_PORT_B ((void *)PIOB_BASE) -#define PORTMUX_PORT_C ((void *)PIOC_BASE) -#define PORTMUX_PORT_D ((void *)PIOD_BASE) -#define PORTMUX_PORT_E ((void *)PIOE_BASE) +#define PORTMUX_PORT_A ((void *)ATMEL_BASE_PIOA) +#define PORTMUX_PORT_B ((void *)ATMEL_BASE_PIOB) +#define PORTMUX_PORT_C ((void *)ATMEL_BASE_PIOC) +#define PORTMUX_PORT_D ((void *)ATMEL_BASE_PIOD) +#define PORTMUX_PORT_E ((void *)ATMEL_BASE_PIOE)void portmux_enable_ebi (unsigned int bus_width,unsigned int addr_width,unsigned long flags,unsigned long drive_strength);
arch/avr32/include/asm/hmatrix-common.h +1 -1
@@ -117,7 +117,7 @@ struct hmatrix_regs {/* Register access macros */ #define __hmatrix_reg (reg) \ - (((volatile struct hmatrix_regs *)HMATRIX_BASE)->reg) + (((volatile struct hmatrix_regs *)ATMEL_BASE_HMATRIX)->reg)#define hmatrix_read (reg) \ (__hmatrix_reg(reg))#define hmatrix_write (reg, value) \
board/atmel/atngw100/atngw100.c +2 -2
@@ -112,8 +112,8 @@ int board_early_init_r(void)#ifdef CONFIG_CMD_NET int board_eth_init (bd_t *bi) { -macb_eth_initialize (0 , (void *)MACB0_BASE , bi->bi_phy_id[0 ]); -macb_eth_initialize (1 , (void *)MACB1_BASE , bi->bi_phy_id[1 ]); +macb_eth_initialize (0 , (void *)ATMEL_BASE_MACB0 , bi->bi_phy_id[0 ]); +macb_eth_initialize (1 , (void *)ATMEL_BASE_MACB1 , bi->bi_phy_id[1 ]);return 0 ; }#endif
board/atmel/atstk1000/atstk1000.c +2 -2
@@ -134,8 +134,8 @@ int board_early_init_r(void)#ifdef CONFIG_CMD_NET int board_eth_init (bd_t *bi) { -macb_eth_initialize (0 , (void *)MACB0_BASE , bi->bi_phy_id[0 ]); -macb_eth_initialize (1 , (void *)MACB1_BASE , bi->bi_phy_id[1 ]); +macb_eth_initialize (0 , (void *)ATMEL_BASE_MACB0 , bi->bi_phy_id[0 ]); +macb_eth_initialize (1 , (void *)ATMEL_BASE_MACB1 , bi->bi_phy_id[1 ]);return 0 ; }#endif
board/earthlcd/favr-32-ezkit/favr-32-ezkit.c +1 -1
@@ -104,6 +104,6 @@ int board_early_init_r(void)#if defined(CONFIG_MACB ) && defined(CONFIG_CMD_NET )int board_eth_init (bd_t *bi) { -return macb_eth_initialize (0 , (void *)MACB0_BASE , bi->bi_phy_id[0 ]); +return macb_eth_initialize (0 , (void *)ATMEL_BASE_MACB0 , bi->bi_phy_id[0 ]); }#endif
board/mimc/mimc200/mimc200.c +2 -2
@@ -221,8 +221,8 @@ void spi_cs_deactivate(struct spi_slave *slave)#ifdef CONFIG_CMD_NET int board_eth_init (bd_t *bi) { -macb_eth_initialize (0 , (void *)MACB0_BASE , bi->bi_phy_id[0 ]); -macb_eth_initialize (1 , (void *)MACB1_BASE , bi->bi_phy_id[1 ]); +macb_eth_initialize (0 , (void *)ATMEL_BASE_MACB0 , bi->bi_phy_id[0 ]); +macb_eth_initialize (1 , (void *)ATMEL_BASE_MACB1 , bi->bi_phy_id[1 ]);return 0 ; }
board/miromico/hammerhead/hammerhead.c +1 -1
@@ -68,7 +68,7 @@ static const struct sdram_config sdram_config = {#ifdef CONFIG_CMD_NET int board_eth_init (bd_t *bis) { -return macb_eth_initialize (0 , (void *)MACB0_BASE , bis->bi_phy_id[0 ]); +return macb_eth_initialize (0 , (void *)ATMEL_BASE_MACB0 , bis->bi_phy_id[0 ]); }#endif
drivers/mmc/atmel_mci.h +2 -2
@@ -238,8 +238,8 @@ typedef struct atmel_mci {* Register access macros */ #define mmci_readl (reg) \ - readl((void *)MMCI_BASE + MMCI_##reg) + readl((void *)ATMEL_BASE_MMCI + MMCI_##reg)#define mmci_writel (reg,value) \ - writel((value), (void *)MMCI_BASE + MMCI_##reg) + writel((value), (void *)ATMEL_BASE_MMCI + MMCI_##reg)#endif /* __CPU_AT32AP_ATMEL_MCI_H__ */
include/configs/atngw100.h +2 -2
@@ -61,8 +61,8 @@*/ #define CONFIG_SYS_PLL0_OPT 0x04 -#define CONFIG_USART1 1 - +#define CONFIG_USART_BASE ATMEL_BASE_USART1 +#define CONFIG_USART_ID 1/* User serviceable stuff */ #define CONFIG_DOS_PARTITION 1
include/configs/atstk1002.h +2 -4
@@ -85,10 +85,8 @@*/ #define CONFIG_SYS_PLL0_OPT 0x04 -#undef CONFIG_USART0 -#define CONFIG_USART1 1 -#undef CONFIG_USART2 -#undef CONFIG_USART3 +#define CONFIG_USART_BASE ATMEL_BASE_USART1 +#define CONFIG_USART_ID 1/* User serviceable stuff */ #define CONFIG_DOS_PARTITION 1
include/configs/atstk1003.h +2 -4
@@ -85,10 +85,8 @@*/ #define CONFIG_SYS_PLL0_OPT 0x04 -#undef CONFIG_USART0 -#define CONFIG_USART1 1 -#undef CONFIG_USART2 -#undef CONFIG_USART3 +#define CONFIG_USART_BASE ATMEL_BASE_USART1 +#define CONFIG_USART_ID 1/* User serviceable stuff */ #define CONFIG_DOS_PARTITION 1
include/configs/atstk1004.h +2 -4
@@ -85,10 +85,8 @@*/ #define CONFIG_SYS_PLL0_OPT 0x04 -#undef CONFIG_USART0 -#define CONFIG_USART1 1 -#undef CONFIG_USART2 -#undef CONFIG_USART3 +#define CONFIG_USART_BASE ATMEL_BASE_USART1 +#define CONFIG_USART_ID 1/* User serviceable stuff */ #define CONFIG_DOS_PARTITION 1
include/configs/atstk1006.h +2 -4
@@ -85,10 +85,8 @@*/ #define CONFIG_SYS_PLL0_OPT 0x04 -#undef CONFIG_USART0 -#define CONFIG_USART1 1 -#undef CONFIG_USART2 -#undef CONFIG_USART3 +#define CONFIG_USART_BASE ATMEL_BASE_USART1 +#define CONFIG_USART_ID 1/* User serviceable stuff */ #define CONFIG_DOS_PARTITION 1
include/configs/favr-32-ezkit.h +2 -4
@@ -82,10 +82,8 @@*/ #define CONFIG_SYS_PLL0_OPT 0x04 -#undef CONFIG_USART0 -#undef CONFIG_USART1 -#undef CONFIG_USART2 -#define CONFIG_USART3 1 +#define CONFIG_USART_BASE ATMEL_BASE_USART3 +#define CONFIG_USART_ID 3/* User serviceable stuff */ #define CONFIG_DOS_PARTITION 1
include/configs/hammerhead.h +2 -1
@@ -59,7 +59,8 @@*/ #define CONFIG_SYS_PLL0_OPT 0x04 -#define CONFIG_USART1 1 +#define CONFIG_USART_BASE ATMEL_BASE_USART1 +#define CONFIG_USART_ID 1#define CONFIG_HOSTNAME hammerhead
include/configs/mimc200.h +3 -1
@@ -63,7 +63,9 @@*/ #define CONFIG_SYS_PLL0_OPT 0x04 -#define CONFIG_USART1 1 +#define CONFIG_USART_BASE ATMEL_BASE_USART1 +#define CONFIG_USART_ID 1 +#define CONFIG_MIMC200_DBGLINK 1/* User serviceable stuff */
Signature · 1 line
1.7.2.3
PATCH v2 2/2 avr32: fixup definitions to ATMEL_BASE_xxx
Dear Andreas Bie?mann,
Quoted 1 line
Signed-off-by Andreas Bie?mann <[email protected]>
*maybe* your mailing system would abstain from escaping the patch if you would use "ss" instead "?" ;)
(I am waiting for the first patch to arrive signed off in ???, or even better, farsi (from right to left). My mailer can handle that, but can git-am ?)
Quoted 20 lines
---
changes since v1:
- only rename definitions toATMEL_BASE_xxschema in this patch
- rename ofmemeory-map.h->hardweare.his required beforearch/avr32/cpu/at32ap700x/sm.h | 4 +- arch/avr32/cpu/hsdramc1.h | 4 +- arch/avr32/cpu/hsmc3.h | 4 +- arch/avr32/cpu/interrupts.c | 2 +- arch/avr32/include/asm/arch-at32ap700x/gpio.h | 10 ++-- arch/avr32/include/asm/arch-at32ap700x/hardware.h | 76 ++++++++++---------- arch/avr32/include/asm/arch-at32ap700x/portmux.h | 10 ++-- arch/avr32/include/asm/hmatrix-common.h | 2 +- board/atmel/atngw100/atngw100.c | 4 +- board/atmel/atstk1000/atstk1000.c | 4 +- board/earthlcd/favr-32-ezkit/favr-32-ezkit.c | 2 +- board/mimc/mimc200/mimc200.c | 4 +- board/miromico/hammerhead/hammerhead.c | 2 +- drivers/mmc/atmel_mci.h | 4 +- include/configs/atngw100.h | 4 +-
Quoted 8 lines
include/configs/atstk1002.h | 6 +- include/configs/atstk1003.h | 6 +- include/configs/atstk1004.h | 6 +- include/configs/atstk1006.h | 6 +- include/configs/favr-32-ezkit.h | 6 +- include/configs/hammerhead.h | 3 +- include/configs/mimc200.h | 4 +- 22 files changed, 83 insertions(+), 90 deletions(-)
After hand-fixing the escape sequences,
applied into u-boot-atmel avr32cleanup branch:
Quoted 16 lines
arch/avr32/include/asm/arch-at32ap700x/hardware.h +2
-2@@ -19,8 +19,8 @@* Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA */ -#ifndef __AT32AP7000_MEMORY_MAP_H__ -#define __AT32AP7000_MEMORY_MAP_H__ +#ifndef __AT32AP7000_HARDWARE_H__ +#define __AT32AP7000_HARDWARE_H__/* Internal and external memories */ #define EBI_SRAM_CS0_BASE 0x00000000
arch/avr32/include/asm/arch-at32ap700x/hardware.h line 48
Quoted 9 lines
arch/avr32/include/asm/arch-at32ap700x/hardware.h +3
-3@@ -43,44 +43,44 @@#define INTERNAL_SRAM_SIZE 0x00008000/* Devices on the High Speed Bus (HSB) */ -#define LCDC_BASE 0xFF000000 -#define DMAC_BASE 0xFF200000 -#define USB_FIFO 0xFF300000 +#define LCDC_BASE 0xFF000000 +#define DMAC_BASE 0xFF200000 +#define USB_FIFO 0xFF300000
ATMEL_BASE_*, ATMEL_SIZE_* for above defines in a later patch, maybe?
Otherwise it looks very good.
Best Regards,
Reinhard
PATCH v2 2/2 avr32: fixup definitions to ATMEL_BASE_xxx
In reply to Andreas BießmannDear Andreas Bie?mann:
Quoted 21 lines
Signed-off-by Andreas Bie?mann <[email protected]>---
changes since v1:
- only rename definitions toATMEL_BASE_xxschema in this patch
- rename ofmemeory-map.h->hardweare.his required beforearch/avr32/cpu/at32ap700x/sm.h | 4 +- arch/avr32/cpu/hsdramc1.h | 4 +- arch/avr32/cpu/hsmc3.h | 4 +- arch/avr32/cpu/interrupts.c | 2 +- arch/avr32/include/asm/arch-at32ap700x/gpio.h | 10 ++-- arch/avr32/include/asm/arch-at32ap700x/hardware.h | 76 ++++++++++---------- arch/avr32/include/asm/arch-at32ap700x/portmux.h | 10 ++-- arch/avr32/include/asm/hmatrix-common.h | 2 +- board/atmel/atngw100/atngw100.c | 4 +- board/atmel/atstk1000/atstk1000.c | 4 +- board/earthlcd/favr-32-ezkit/favr-32-ezkit.c | 2 +- board/mimc/mimc200/mimc200.c | 4 +- board/miromico/hammerhead/hammerhead.c | 2 +- drivers/mmc/atmel_mci.h | 4 +- include/configs/atngw100.h | 4 +-
Quoted 8 lines
include/configs/atstk1002.h | 6 +- include/configs/atstk1003.h | 6 +- include/configs/atstk1004.h | 6 +- include/configs/atstk1006.h | 6 +- include/configs/favr-32-ezkit.h | 6 +- include/configs/hammerhead.h | 3 +- include/configs/mimc200.h | 4 +- 22 files changed, 83 insertions(+), 90 deletions(-)
Has the following issues:
WARNING: Use of volatile is usually wrong: see Documentation/volatile-considered-harmful.txt #210: FILE: arch/avr32/include/asm/hmatrix-common.h:120:
+ (((volatile struct hmatrix_regs *)ATMEL_BASE_HMATRIX)->reg)
[left as it is - since this is only a name change patch]
WARNING: line over 80 characters
#253: FILE: board/earthlcd/favr-32-ezkit/favr-32-ezkit.c:107:
+ return macb_eth_initialize(0, (void *)ATMEL_BASE_MACB0, bi->bi_phy_id[0]);
[manually fixed]
WARNING: line over 80 characters
#280: FILE: board/miromico/hammerhead/hammerhead.c:71:
+ return macb_eth_initialize(0, (void *)ATMEL_BASE_MACB0, bis->bi_phy_id[0]);
[manually fixed]
Applied into u-boot-atmel/next.
Thanks,
Reinhard
RFC PATCH v2 2/2 drivers:atmel-related: fixup include to hardware.h
In reply to Reinhard Meyer - change includes from memory-map.h to hardware.h
- fixup mmci_writel()/mmci_readl()
--- drivers/mmc/atmel_mci.c | 2 +- drivers/mmc/atmel_mci.h | 4 ++-- drivers/mmc/gen_atmel_mci.c | 2 +- drivers/serial/atmel_usart.c | 2 +- drivers/spi/atmel_spi.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-)
drivers/mmc/atmel_mci.c +1 -1
@@ -28,7 +28,7 @@#include <asm/errno.h> #include <asm/byteorder.h> #include <asm/arch/clk.h> -#include <asm/arch/memory-map.h> +#include <asm/arch/hardware.h> #include "atmel_mci.h"
drivers/mmc/atmel_mci.h +2 -2
@@ -238,8 +238,8 @@ typedef struct atmel_mci {* Register access macros */ #define mmci_readl (reg) \ - readl((void *)MMCI_BASE + MMCI_##reg) + readl((void *)ATMEL_BASE_MMCI + MMCI_##reg)#define mmci_writel (reg,value) \ - writel((value), (void *)MMCI_BASE + MMCI_##reg) + writel((value), (void *)ATMEL_BASE_MMCI + MMCI_##reg)#endif /* __CPU_AT32AP_ATMEL_MCI_H__ */
drivers/mmc/gen_atmel_mci.c +1 -1
@@ -33,7 +33,7 @@#include <asm/errno.h> #include <asm/byteorder.h> #include <asm/arch/clk.h> -#include <asm/arch/memory-map.h> +#include <asm/arch/hardware.h> #include "atmel_mci.h" #ifndef CONFIG_SYS_MMC_CLK_OD
drivers/serial/atmel_usart.c +1 -1
@@ -23,7 +23,7 @@#include <asm/io.h> #include <asm/arch/clk.h> -#include <asm/arch/memory-map.h> +#include <asm/arch/hardware.h> #include "atmel_usart.h"
drivers/spi/atmel_spi.c +1 -1
@@ -26,7 +26,7 @@#include <asm/io.h> #include <asm/arch/clk.h> -#include <asm/arch/memory-map.h> +#include <asm/arch/hardware.h> #include "atmel_spi.h"
Signature · 1 line
1.7.2.3
RFC PATCH 2/2 drivers:atmel-related: fixup include to hardware.h
Dear Andreas Bie?mann,
Quoted 11 lines
- change includes from
memory-map.htohardware.h
- fixup mmci_writel()/mmci_readl()Signed-off-by Andreas Bie?mann <[email protected]>--- drivers/mmc/atmel_mci.c | 2 +- drivers/mmc/atmel_mci.h | 4 ++-- drivers/mmc/gen_atmel_mci.c | 2 +- drivers/serial/atmel_usart.c | 2 +- drivers/spi/atmel_spi.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-)
ERROR: patch seems to be corrupt (line wrapped?)
#60: FILE: drivers/mmc/atmel_mci.c:31:
=20
total: 1 errors, 0 warnings, 57 lines checked
I'll fix that while applying.
Best Regards,
Reinhard
PATCH 3/11 at91: Use AT91_USART0_BASE instead of AT91_USART0
In reply to Alexander Stein--- arch/arm/include/asm/arch-at91/memory-map.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
arch/arm/include/asm/arch-at91/memory-map.h +4 -4
@@ -26,10 +26,10 @@#include <asm/arch/hardware.h> -#define USART0_BASE AT91_USART0 -#define USART1_BASE AT91_USART1 -#define USART2_BASE AT91_USART2 -#define USART3_BASE (AT91_BASE_SYS + AT91_DBGU) +#define USART0_BASE AT91_USART0_BASE +#define USART1_BASE AT91_USART1_BASE +#define USART2_BASE AT91_USART2_BASE +#define USART3_BASE AT91_DBGU_BASE#define SPI0_BASE AT91_BASE_SPI#endif /* __ASM_ARM_ARCH_MEMORYMAP_H__ */
Signature · 1 line
1.7.2.2
PATCH 3/11 at91: Use AT91_USART0_BASE instead of AT91_USART0
Dear Alexander Stein,
Am 01.11.2010 um 09:29 schrieb Alexander Stein:
Quoted 12 lines
Signed-off-by Alexander Stein <[email protected]>---
arch/arm/include/asm/arch-at91/memory-map.h| 8 ++++----1 files changed, 4 insertions(+), 4 deletions(-)arch/arm/include/asm/arch-at91/memory-map.h +0
-0@@ -26,10 +26,10 @@#include <asm/arch/hardware.h>
arch/arm/include/asm/arch-at91/memory-map.h line 33
Quoted 10 lines
arch/arm/include/asm/arch-at91/memory-map.h +4
-4-#define USART0_BASE AT91_USART0 -#define USART1_BASE AT91_USART1 -#define USART2_BASE AT91_USART2 -#define USART3_BASE (AT91_BASE_SYS + AT91_DBGU) +#define USART0_BASE AT91_USART0_BASE +#define USART1_BASE AT91_USART1_BASE +#define USART2_BASE AT91_USART2_BASE +#define USART3_BASE AT91_DBGU_BASE#define SPI0_BASE AT91_BASE_SPI
can we just drop these definitions? Not to criticize your patch but this is on my todo list, I just hate this USART3->DBGU redefinition.
RFC:
I would like to get rid of the three time definition/translation of these AT91 USART stuff.
The board config include uses CONFIG_USARTx, the atmel_usart.c use this definition to get USART_BASE/USART_ID out of some other definitions in asm/arch/hardware.h and asm/arch/memory-map.h which are also re-definitions of some other values in the respective SOC header files.
But beware, avr32 uses the same driver and needs to be changed in the same way.
A nice solution could be to define USART_BASE/USART_ID in respective board config files directly and get rid of the re-definitions in hardware.h/memory-map.h
regards
Andreas Bie?mann
PATCH 4/11 at91sam9260ek: Convert to SoC
In reply to Alexander Stein--- board/atmel/at91sam9260ek/at91sam9260ek.c | 88 +++++++++++++--------------- board/atmel/at91sam9260ek/led.c | 12 ++-- include/configs/at91sam9260ek.h | 12 ++-- 3 files changed, 53 insertions(+), 59 deletions(-)
board/atmel/at91sam9260ek/at91sam9260ek.c +41 -47
@@ -29,6 +29,7 @@#include <asm/arch/at91_common.h> #include <asm/arch/at91_pmc.h> #include <asm/arch/at91_rstc.h> +#include <asm/arch/at91_matrix.h> #include <asm/arch/gpio.h> #include <asm/arch/io.h> #include <asm/arch/hardware.h>
@@ -48,48 +49,55 @@ DECLARE_GLOBAL_DATA_PTR; static void at91sam9260ek_nand_hw_init(void) { unsigned long csa; + at91_smc_t *smc = (at91_smc_t *) AT91_SMC_BASE; + at91_matrix_t *matrix = (at91_matrix_t *) AT91_MATRIX_BASE; + at91_pmc_t *pmc = (at91_pmc_t *) AT91_PMC_BASE; /* Enable CS3 */ - csa =at91_sys_read (AT91_MATRIX_EBICSA ); -at91_sys_write (AT91_MATRIX_EBICSA , - csa |AT91_MATRIX_CS3A_SMC_SMARTMEDIA ); + csa = readl(&matrix->csa) | AT91_MATRIX_CSA_EBI_CS3A; + writel(csa, &matrix->csa); /* Configure SMC CS3 for NAND/SmartMedia */ -at91_sys_write (AT91_SMC_SETUP (3 ), -AT91_SMC_NWESETUP_ (1 ) |AT91_SMC_NCS_WRSETUP_ (0 ) | -AT91_SMC_NRDSETUP_ (1 ) |AT91_SMC_NCS_RDSETUP_ (0 )); -at91_sys_write (AT91_SMC_PULSE (3 ), -AT91_SMC_NWEPULSE_ (3 ) |AT91_SMC_NCS_WRPULSE_ (3 ) | -AT91_SMC_NRDPULSE_ (3 ) |AT91_SMC_NCS_RDPULSE_ (3 )); -at91_sys_write (AT91_SMC_CYCLE (3 ), -AT91_SMC_NWECYCLE_ (5 ) |AT91_SMC_NRDCYCLE_ (5 )); -at91_sys_write (AT91_SMC_MODE (3 ), -AT91_SMC_READMODE |AT91_SMC_WRITEMODE | -AT91_SMC_EXNWMODE_DISABLE | + writel(AT91_SMC_SETUP_NWE(1) | AT91_SMC_SETUP_NCS_WR(0) | + AT91_SMC_SETUP_NRD(1) | AT91_SMC_SETUP_NCS_RD(0), + &smc->cs[3].setup); + + writel(AT91_SMC_PULSE_NWE(3) | AT91_SMC_PULSE_NCS_WR(3) | + AT91_SMC_PULSE_NRD(3) | AT91_SMC_PULSE_NCS_RD(3), + &smc->cs[3].pulse); + + writel(AT91_SMC_CYCLE_NWE(5) | AT91_SMC_CYCLE_NRD(5), + &smc->cs[3].cycle); + writel(AT91_SMC_MODE_RM_NRD | AT91_SMC_MODE_WM_NWE | + AT91_SMC_MODE_EXNW_DISABLE | #ifdef CONFIG_SYS_NAND_DBW_16 -AT91_SMC_DBW_16 | + AT91_SMC_MODE_DBW_16 | #else /* CONFIG_SYS_NAND_DBW_8 */ -AT91_SMC_DBW_8 | + AT91_SMC_MODE_DBW_8 | #endif -AT91_SMC_TDF_ (2 )); + AT91_SMC_MODE_TDF_CYCLE(2), + &smc->cs[3].mode); -at91_sys_write (AT91_PMC_PCER ,1 <<AT91SAM9260_ID_PIOC ); + writel(1 << AT91SAM9260_ID_PIOC, &pmc->pcer); /* Configure RDY/BSY */ -at91_set_gpio_input (CONFIG_SYS_NAND_READY_PIN ,1 ); + at91_set_pio_input(CONFIG_SYS_NAND_READY_PIN, 1); /* Enable NandFlash */ -at91_set_gpio_output (CONFIG_SYS_NAND_ENABLE_PIN ,1 ); + at91_set_pio_input(CONFIG_SYS_NAND_ENABLE_PIN, 1); } #endif #ifdef CONFIG_MACB static void at91sam9260ek_macb_hw_init(void) { -unsigned long rstc; + unsigned long erstl; + at91_pmc_t *pmc = (at91_pmc_t *) AT91_PMC_BASE; + at91_pio_t *pio = (at91_pio_t *) AT91_PIO_BASE; + at91_rstc_t *rstc = (at91_rstc_t *) AT91_RSTC_BASE; /* Enable clock */ -at91_sys_write (AT91_PMC_PCER ,1 <<AT91SAM9260_ID_EMAC ); + writel(1 << AT91SAM9260_ID_EMAC, &pmc->pcer); /* * Disable pull-up on:
@@ -102,39 +110,25 @@ static void at91sam9260ek_macb_hw_init(void)* * PHY has internal pull-down */ -writel (pin_to_mask (AT91_PIN_PA14 ) | -pin_to_mask (AT91_PIN_PA15 ) | -pin_to_mask (AT91_PIN_PA17 ) | -pin_to_mask (AT91_PIN_PA25 ) | -pin_to_mask (AT91_PIN_PA26 ) | -pin_to_mask (AT91_PIN_PA28 ), -pin_to_controller (AT91_PIN_PA0 ) +PIO_PUDR ); - rstc =at91_sys_read (AT91_RSTC_MR ) &AT91_RSTC_ERSTL ; +writel ((1 <<17 ) | (1 <<14 ) | (1 <<15 ) | (1 <<25 ) | (1 <<26 ) | (1 <<28 ), &pio->pioa.pudr); -/* Need to reset PHY -> 500ms reset */ -at91_sys_write (AT91_RSTC_MR ,AT91_RSTC_KEY | - (AT91_RSTC_ERSTL & (0x0D <<8 )) | -AT91_RSTC_URSTEN ); + erstl =readl (&rstc->mr) &AT91_RSTC_MR_ERSTL_MASK ; -at91_sys_write (AT91_RSTC_CR ,AT91_RSTC_KEY |AT91_RSTC_EXTRST ); +/* Need to reset PHY -> 500ms reset */ +writel (AT91_RSTC_KEY |AT91_RSTC_MR_ERSTL (0x0D ) | +AT91_RSTC_MR_URSTEN , &rstc->mr); +writel (AT91_RSTC_KEY |AT91_RSTC_CR_EXTRST , &rstc->cr);/* Wait for end hardware reset */ -while (!(at91_sys_read (AT91_RSTC_SR ) &AT91_RSTC_NRSTL )); +while (!(readl (&rstc->sr) &AT91_RSTC_SR_NRSTL )) + ;/* Restore NRST value */ -at91_sys_write (AT91_RSTC_MR ,AT91_RSTC_KEY | - (rstc) | -AT91_RSTC_URSTEN ); +writel (AT91_RSTC_KEY | erstl |AT91_RSTC_MR_URSTEN , &rstc->mr);/* Re-enable pull-up */ -writel (pin_to_mask (AT91_PIN_PA14 ) | -pin_to_mask (AT91_PIN_PA15 ) | -pin_to_mask (AT91_PIN_PA17 ) | -pin_to_mask (AT91_PIN_PA25 ) | -pin_to_mask (AT91_PIN_PA26 ) | -pin_to_mask (AT91_PIN_PA28 ), -pin_to_controller (AT91_PIN_PA0 ) +PIO_PUER ); +writel ((1 <<17 ) | (1 <<14 ) | (1 <<15 ) | (1 <<25 ) | (1 <<26 ) | (1 <<28 ), &pio->pioa.puer);at91_macb_hw_init (); }
@@ -186,7 +180,7 @@ int board_eth_init(bd_t *bis) {int rc =0 ;#ifdef CONFIG_MACB - rc =macb_eth_initialize (0 , (void *)AT91SAM9260_BASE_EMAC ,0x00 ); + rc =macb_eth_initialize (0 , (void *)AT91_EMAC_BASE ,0x00 );#endif return rc; }
board/atmel/at91sam9260ek/led.c +7 -5
@@ -30,12 +30,14 @@void coloured_LED_init (void ) { +at91_pmc_t *pmc = (at91_pmc_t *)AT91_PMC_BASE ; +/* Enable clock */ -at91_sys_write (AT91_PMC_PCER ,1 <<AT91SAM9260_ID_PIOA ); +writel (1 <<AT91SAM9260_ID_PIOA , &pmc->pcer); -at91_set_gpio_output (CONFIG_RED_LED ,1 ); -at91_set_gpio_output (CONFIG_GREEN_LED ,1 ); +at91_set_pio_output (CONFIG_RED_LED ,1 ); +at91_set_pio_output (CONFIG_GREEN_LED ,1 ); -at91_set_gpio_value (CONFIG_RED_LED ,0 ); -at91_set_gpio_value (CONFIG_GREEN_LED ,1 ); +at91_set_pio_output (CONFIG_RED_LED ,0 ); +at91_set_pio_output (CONFIG_GREEN_LED ,1 ); }
include/configs/at91sam9260ek.h +5 -7
@@ -29,8 +29,6 @@#include <asm/sizes.h> -#define CONFIG_AT91_LEGACY -/* ARM asynchronous clock */ #define CONFIG_SYS_AT91_MAIN_CLOCK 18432000/* 18.432 MHz crystal */ #define CONFIG_SYS_HZ 1000
@@ -65,8 +63,8 @@/* LED */ #define CONFIG_AT91_LED -#define CONFIG_RED_LED AT91_PIN_PA9/* this is the power led */ -#define CONFIG_GREEN_LED AT91_PIN_PA6/* this is the user led */ +#define CONFIG_RED_LED AT91_PIO_PORTA, 9/* this is the power led */ +#define CONFIG_GREEN_LED AT91_PIO_PORTA, 6/* this is the user led */ #define CONFIG_BOOTDELAY 3
@@ -101,7 +99,7 @@/* DataFlash */ #define CONFIG_ATMEL_DATAFLASH_SPI -#define CONFIG_HAS_DATAFLASH 1 +#define CONFIG_HAS_DATAFLASH #define CONFIG_SYS_SPI_WRITE_TOUT (5*CONFIG_SYS_HZ)#define CONFIG_SYS_MAX_DATAFLASH_BANKS 2#define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 0xC0000000/* CS0 */
@@ -125,8 +123,8 @@#define CONFIG_SYS_NAND_MASK_ALE (1 << 21)/* our CLE is AD22 */ #define CONFIG_SYS_NAND_MASK_CLE (1 << 22) -#define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PC14 -#define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PC13 +#define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIO_PORTC, 14 +#define CONFIG_SYS_NAND_READY_PIN AT91_PIO_PORTC, 13#endif
Signature · 1 line
1.7.2.2
PATCH 5/11 at91: Fix pdc register names and add some defines
In reply to Alexander Stein--- arch/arm/include/asm/arch-at91/at91_pdc.h | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-)
arch/arm/include/asm/arch-at91/at91_pdc.h +7 -2
@@ -28,12 +28,17 @@ typedef struct at91_pdc {u32 rcr;/* 0x104 Receive Counter Register */ u32 tpr;/* 0x108 Transmit Pointer Register */ u32 tcr;/* 0x10C Transmit Counter Register */ -u32 pnpr;/* 0x110 Receive Next Pointer Register */ -u32 pncr;/* 0x114 Receive Next Counter Register */ +u32 rnpr;/* 0x110 Receive Next Pointer Register */ +u32 rncr;/* 0x114 Receive Next Counter Register */ u32 tnpr;/* 0x118 Transmit Next Pointer Register */ u32 tncr;/* 0x11C Transmit Next Counter Register */ u32 ptcr;/* 0x120 Transfer Control Register */ u32 ptsr; /* 0x124 Transfer Status Register */ } at91_pdc_t; +#define AT91_PDC_PTCR_RXTEN 0x00000001 +#define AT91_PDC_PTCR_RXTDIS 0x00000002 +#define AT91_PDC_PTCR_TXTEN 0x00000100 +#define AT91_PDC_PTCR_TXTDIS 0x00000200 +#endif
Signature · 1 line
1.7.2.2
PATCH 6/11 at91: Add defines for spi SoC access
In reply to Alexander Stein--- arch/arm/include/asm/arch-at91/at91_spi.h | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-)
arch/arm/include/asm/arch-at91/at91_spi.h +14 -0
@@ -33,6 +33,20 @@ typedef struct at91_spi {at91_pdc_t pdc; } at91_spi_t; +#define AT91_SPI_CR_SPIEN 0x00000001 +#define AT91_SPI_CR_SWRST 0x00000080 + +#define AT91_SPI_MR_MSTR 0x00000001 +#define AT91_SPI_MR_MODFDIS 0x00000004 +#define AT91_SPI_MR_PCS 0x000f0000 + +#define AT91_SPI_SR_RXBUFF 0x00000040 +#define AT91_SPI_SR_SPIENS 0x00010000 + +#define AT91_SPI_CSR_NCPHA 0x00000001 +#define AT91_SPI_CSR_DLYBS 0x00ff0000 +#define AT91_SPI_CSR_DLYBCT 0xff000000 +#ifdef CONFIG_AT91_LEGACY #define AT91_SPI_CR 0x00/* Control Register */
Signature · 1 line
1.7.2.2
PATCH 6/11 at91: Add defines for spi SoC access
Dear Alexander Stein,
arch/arm/include/asm/arch-at91/at91_spi.h typedef struct at91_spi { · line 34
Quoted 12 lines
Signed-off-by Alexander Stein <[email protected]>--- arch/arm/include/asm/arch-at91/at91_spi.h | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-)arch/arm/include/asm/arch-at91/at91_spi.h +0
-0@@ -33,6 +33,20 @@ typedef struct at91_spi {at91_pdc_t pdc; } at91_spi_t;
If we touch header and driver anyway, we could get rid of the depreciated typedefs, to get conform to the coding style.
See discussion about that 1-2 days ago :)
Quoted 6 lines
arch/arm/include/asm/arch-at91/at91_spi.h +5
-0+#define AT91_SPI_CR_SPIEN 0x00000001 +#define AT91_SPI_CR_SWRST 0x00000080 + +#define AT91_SPI_MR_MSTR 0x00000001 +#define AT91_SPI_MR_MODFDIS 0x00000004
arch/arm/include/asm/arch-at91/at91_spi.h typedef struct at91_spi { · line 50
Quoted 10 lines
arch/arm/include/asm/arch-at91/at91_spi.h +9
-0+#define AT91_SPI_MR_PCS 0x000f0000 + +#define AT91_SPI_SR_RXBUFF 0x00000040 +#define AT91_SPI_SR_SPIENS 0x00010000 + +#define AT91_SPI_CSR_NCPHA 0x00000001 +#define AT91_SPI_CSR_DLYBS 0x00ff0000 +#define AT91_SPI_CSR_DLYBCT 0xff000000 +#ifdef CONFIG_AT91_LEGACY
After that patch, do we still need LEGACY?
Best Regards,
Reinhard
PATCH 6/11 at91: Add defines for spi SoC access
Quoted 15 lines · On Monday 01 November 2010, 09:43:57 Reinhard Meyer wrote:
Dear Alexander Stein,
Quoted 13 lines
Signed-off-by Alexander Stein <[email protected]>---
arch/arm/include/asm/arch-at91/at91_spi.h | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-)(quoted diff) +0
-0
b/arch/arm/include/asm/arch-at91/at91_spi.hindex c520e89..75d4324 100644arch/arm/include/asm/arch-at91/at91_spi.h +0
-0@@ -33,6 +33,20 @@ typedef struct at91_spi {
Quoted 8 lines
arch/arm/include/asm/arch-at91/at91_spi.h typedef struct at91_spi {
Quoted 3 lines
arch/arm/include/asm/arch-at91/at91_spi.h +0
-0at91_pdc_t pdc; } at91_spi_t;If we touch header and driver anyway, we could get rid of the depreciated typedefs, to get conform to the coding style.
See discussion about that 1-2 days ago :)
Ok, will do a repost after some time.
Quoted 15 lines
Quoted 15 lines
arch/arm/include/asm/arch-at91/at91_spi.h +14
-0+#define AT91_SPI_CR_SPIEN 0x00000001 +#define AT91_SPI_CR_SWRST 0x00000080 + +#define AT91_SPI_MR_MSTR 0x00000001 +#define AT91_SPI_MR_MODFDIS 0x00000004 +#define AT91_SPI_MR_PCS 0x000f0000 + +#define AT91_SPI_SR_RXBUFF 0x00000040 +#define AT91_SPI_SR_SPIENS 0x00010000 + +#define AT91_SPI_CSR_NCPHA 0x00000001 +#define AT91_SPI_CSR_DLYBS 0x00ff0000 +#define AT91_SPI_CSR_DLYBCT 0xff000000 +
Quoted 3 lines
arch/arm/include/asm/arch-at91/at91_spi.h typedef struct at91_spi { · line 50
Quoted 1 line
arch/arm/include/asm/arch-at91/at91_spi.h +0
-0#ifdef CONFIG_AT91_LEGACY After that patch, do we still need LEGACY?
I'm unsure about that yet. Anyway I would prefer to remove CONFIG_AT91_LEGACY globally at all occurrences.
Best regards,
Alexander
PATCH 6/11 at91: Add defines for spi SoC access
In reply to Reinhard MeyerDear Reinhard Meyer,
Quoted 3 lines · In message <[email protected]> you wrote:
If we touch header and driver anyway, we could get rid of the depreciated typedefs, to get conform to the coding style.
I recommend NOT doing this, at least not as part of this patch series.
If a clean-up is intended, it should be done in a strictly separate set of patches (either before or after the current series).
Best regards,
Wolfgang Denk
Signature · 4 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de This is an unauthorized cybernetic announcement.
PATCH 6/11 at91: Add defines for spi SoC access
Dear Wolfgang Denk,
Quoted 11 lines
Dear Reinhard Meyer,
Quoted 3 lines · In message<[email protected]> you wrote:
If we touch header and driver anyway, we could get rid of the depreciated typedefs, to get conform to the coding style.
I recommend NOT doing this, at least not as part of this patch series.
If a clean-up is intended, it should be done in a strictly separate set of patches (either before or after the current series).
In this particular case the driver is not yet using the (existing) struct at91_spi at all....
WAIT....!!!
There is the COMMON driver atmel_spi.c with atmel_spi.h in drivers/spi.
There need not be and should not be an at91_spi.h; or do I miss something here?
Best Regards,
Reinhard
PATCH 6/11 at91: Add defines for spi SoC access
Dear Reinhard,
Quoted 10 lines · On Monday 01 November 2010, 13:31:38 Reinhard Meyer wrote:
In this particular case the driver is not yet using the (existing) struct
at91_spiat all....WAIT....!!!
There is the COMMON driver
atmel_spi.cwithatmel_spi.hindrivers/spi.There need not be and should not be an
at91_spi.h; or do I miss something here?
Well, the cause for adding those defines is atmel_dataflash_spi.c not atmel_spi.c. See also PATCH 8/11
Best regards,
Alexander
PATCH 6/11 at91: Add defines for spi SoC access
In reply to Reinhard MeyerQuoted 10 lines · On Mon, 01 Nov 2010 13:31:38 +0100 Reinhard Meyer <[email protected]>…
In this particular case the driver is not yet using the (existing) struct
at91_spiat all....WAIT....!!!
There is the COMMON driver
atmel_spi.cwithatmel_spi.hindrivers/spi.There need not be and should not be an
at91_spi.h; or do I miss something here?
On this topic, see the thread at
http://lists.denx.de/pipermail/u-boot/2010-June/072208.html
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
PATCH 7/11 at91: Add spi base addresses
In reply to Alexander Stein--- arch/arm/include/asm/arch-at91/at91cap9.h | 2 ++ arch/arm/include/asm/arch-at91/at91sam9260.h | 2 ++ arch/arm/include/asm/arch-at91/at91sam9261.h | 2 ++ arch/arm/include/asm/arch-at91/at91sam9263.h | 2 ++ arch/arm/include/asm/arch-at91/at91sam9g45.h | 2 ++ arch/arm/include/asm/arch-at91/at91sam9rl.h | 1 + 6 files changed, 11 insertions(+), 0 deletions(-)
arch/arm/include/asm/arch-at91/at91cap9.h +2 -0
@@ -56,6 +56,8 @@#define AT91_USART0_BASE 0xfff8c000#define AT91_USART1_BASE 0xfff90000#define AT91_USART2_BASE 0xfff94000 +#define AT91_SPI0_BASE 0xfffa4000 +#define AT91_SPI1_BASE 0xfffa8000#define AT91_DBGU_BASE 0xffffee00#define AT91_PIO_BASE 0xfffff200#define AT91_PMC_BASE 0xfffffc00
arch/arm/include/asm/arch-at91/at91sam9260.h +2 -0
@@ -53,6 +53,8 @@#define AT91_USART1_BASE 0xfffb4000#define AT91_USART2_BASE 0xfffb8000#define AT91_EMAC_BASE 0xfffc4000 +#define AT91_SPI0_BASE 0xfffc8000 +#define AT91_SPI1_BASE 0xfffcc000#define AT91_USART3_BASE 0xfffd0000#define AT91_USART4_BASE 0xfffd4000#define AT91_USART5_BASE 0xfffd8000
arch/arm/include/asm/arch-at91/at91sam9261.h +2 -0
@@ -46,6 +46,8 @@#define AT91_USART0_BASE 0xfffb0000#define AT91_USART1_BASE 0xfffb4000#define AT91_USART2_BASE 0xfffb8000 +#define AT91_SPI0_BASE 0xfffc8000 +#define AT91_SPI1_BASE 0xfffcc000#define AT91_SDRAMC_BASE 0xffffea00#define AT91_SMC_BASE 0xffffec00#define AT91_MATRIX_BASE 0xffffee00
arch/arm/include/asm/arch-at91/at91sam9263.h +2 -0
@@ -50,6 +50,8 @@#define AT91_US0_BASE 0xfff8c000#define AT91_US1_BASE 0xfff90000#define AT91_US2_BASE 0xfff94000 +#define AT91_SPI0_BASE 0xfffa4000 +#define AT91_SPI1_BASE 0xfffa8000#define AT91_EMAC_BASE 0xfffbc000#define AT91_ECC0_BASE 0xffffe000#define AT91_SDRAMC0_BASE 0xffffe200
arch/arm/include/asm/arch-at91/at91sam9g45.h +2 -0
@@ -55,6 +55,8 @@#define AT91_USART1_BASE 0xfff90000#define AT91_USART2_BASE 0xfff94000#define AT91_USART3_BASE 0xfff98000 +#define AT91_SPI0_BASE 0xfffa4000 +#define AT91_SPI1_BASE 0xfffa8000#define AT91_EMAC_BASE 0xfffbc000#define AT91_SMC_BASE 0xffffe800#define AT91_MATRIX_BASE 0xffffea00
arch/arm/include/asm/arch-at91/at91sam9rl.h +1 -0
@@ -48,6 +48,7 @@#define AT91_US1_BASE 0xfffb4000#define AT91_US2_BASE 0xfffb8000#define AT91_US3_BASE 0xfffbc000 +#define AT91_SPI_BASE 0xfffcc000#define AT91_SDRAMC_BASE 0xffffea00#define AT91_SMC_BASE 0xffffec00#define AT91_MATRIX_BASE 0xffffee00
Signature · 1 line
1.7.2.2
PATCH 8/11 atmel_dataflash: Update to SoC access
In reply to Alexander Stein--- arch/arm/include/asm/arch-at91/hardware.h | 10 ++-- drivers/spi/atmel_dataflash_spi.c | 109 +++++++++++++++-------------- 2 files changed, 60 insertions(+), 59 deletions(-)
arch/arm/include/asm/arch-at91/hardware.h +5 -5
@@ -22,22 +22,22 @@#elif defined(CONFIG_AT91SAM9260 ) || defined(CONFIG_AT91SAM9G20 )#include <asm/arch/at91sam9260.h> #define AT91_BASE_MCI AT91SAM9260_BASE_MCI -#define AT91_BASE_SPI AT91SAM9260_BASE_SPI0 +#define AT91_BASE_SPI AT91_SPI0_BASE#define AT91_ID_UHP AT91SAM9260_ID_UHP#define AT91_PMC_UHP AT91SAM926x_PMC_UHP#elif defined(CONFIG_AT91SAM9261 ) || defined(CONFIG_AT91SAM9G10 )#include <asm/arch/at91sam9261.h> -#define AT91_BASE_SPI AT91SAM9261_BASE_SPI0 +#define AT91_BASE_SPI AT91_SPI0_BASE#define AT91_ID_UHP AT91SAM9261_ID_UHP#define AT91_PMC_UHP AT91SAM926x_PMC_UHP#elif defined(CONFIG_AT91SAM9263 )#include <asm/arch/at91sam9263.h> -#define AT91_BASE_SPI AT91SAM9263_BASE_SPI0 +#define AT91_BASE_SPI AT91_SPI0_BASE#define AT91_ID_UHP AT91SAM9263_ID_UHP#define AT91_PMC_UHP AT91SAM926x_PMC_UHP#elif defined(CONFIG_AT91SAM9RL )#include <asm/arch/at91sam9rl.h> -#define AT91_BASE_SPI AT91SAM9RL_BASE_SPI +#define AT91_BASE_SPI AT91_SPI_BASE#define AT91_ID_UHP AT91SAM9RL_ID_UHP#elif defined(CONFIG_AT91SAM9G45 ) || defined(CONFIG_AT91SAM9M10G45 )#include <asm/arch/at91sam9g45.h>
@@ -47,7 +47,7 @@#define AT91_PMC_UHP AT91SAM926x_PMC_UHP#elif defined(CONFIG_AT91CAP9 )#include <asm/arch/at91cap9.h> -#define AT91_BASE_SPI AT91CAP9_BASE_SPI0 +#define AT91_BASE_SPI AT91_SPI0_BASE#define AT91_ID_UHP AT91CAP9_ID_UHP#define AT91_PMC_UHP AT91CAP9_PMC_UHP#elif defined(CONFIG_AT91X40 )
drivers/spi/atmel_dataflash_spi.c +55 -54
195 lines not on this page · raw message
Signature · 1 line
1.7.2.2
PATCH 9/11 at91sam9261ek: make compilable again
In reply to Alexander Stein--- board/atmel/at91sam9261ek/at91sam9261ek.c | 6 +++--- include/configs/at91sam9261ek.h | 15 +++++++++++---- 2 files changed, 14 insertions(+), 7 deletions(-)
board/atmel/at91sam9261ek/at91sam9261ek.c +3 -3
@@ -246,7 +246,7 @@ int board_init(void) gd->bd->bi_arch_number =MACH_TYPE_AT91SAM9261EK ;#endif /* adress of boot parameters */ - gd->bd->bi_boot_params =PHYS_SDRAM +0x100 ; + gd->bd->bi_boot_params =CONFIG_SYS_SDRAM_BASE +0x100 ;at91_serial_hw_init ();#ifdef CONFIG_CMD_NAND
@@ -273,8 +273,8 @@ int board_eth_init(bd_t *bis)int dram_init (void ) { - gd->bd->bi_dram[0 ].start =PHYS_SDRAM ; - gd->bd->bi_dram[0 ].size =PHYS_SDRAM_SIZE ; + gd->bd->bi_dram[0 ].start =CONFIG_SYS_SDRAM_BASE ; + gd->bd->bi_dram[0 ].size =CONFIG_SYS_SDRAM_SIZE ;return 0 ; }
include/configs/at91sam9261ek.h +11 -4
@@ -27,6 +27,8 @@#ifndef __CONFIG_H#define __CONFIG_H +#include <asm/sizes.h> +#define CONFIG_AT91_LEGACY /* ARM asynchronous clock */
@@ -39,6 +41,7 @@#else #define CONFIG_AT91SAM9261 1/* It's an Atmel AT91SAM9261 SoC*/ #endif +#define CONFIG_AT91FAMILY #define CONFIG_ARCH_CPU_INIT #undef CONFIG_USE_IRQ/* we don't need IRQ/FIQ stuff */
@@ -108,8 +111,8 @@/* SDRAM */ #define CONFIG_NR_DRAM_BANKS 1 -#define PHYS_SDRAM 0x20000000 -#define PHYS_SDRAM_SIZE 0x04000000/* 64 megs */ +#define CONFIG_SYS_SDRAM_BASE 0x20000000 +#define CONFIG_SYS_SDRAM_SIZE SZ_64M/* 64 megs */ /* DataFlash */ #define CONFIG_ATMEL_DATAFLASH_SPI
@@ -168,7 +171,7 @@#define CONFIG_SYS_LOAD_ADDR 0x22000000/* load address */ -#define CONFIG_SYS_MEMTEST_START PHYS_SDRAM +#define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE#define CONFIG_SYS_MEMTEST_END 0x23e00000#ifdef CONFIG_SYS_USE_DATAFLASH_CS0
@@ -230,8 +233,12 @@* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN ROUND(3 * CONFIG_ENV_SIZE + 128*1024, 0x1000) +/* size in bytes reserved for initial data */ + +#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + SZ_4K \ + - GENERATED_GBL_DATA_SIZE) -#define CONFIG_STACKSIZE (32*1024)/* regular stack */ +#define CONFIG_STACKSIZE (SZ_32K)/* regular stack */ #ifdef CONFIG_USE_IRQ #error CONFIG_USE_IRQ not supported
Signature · 1 line
1.7.2.2
PATCH 10/11 at91sam9263ek: make compilable again
In reply to Alexander Stein--- board/atmel/at91sam9263ek/at91sam9263ek.c | 6 +++--- include/configs/at91sam9263ek.h | 15 +++++++++++---- 2 files changed, 14 insertions(+), 7 deletions(-)
board/atmel/at91sam9263ek/at91sam9263ek.c +3 -3
@@ -252,7 +252,7 @@ int board_init(void)/* arch number of AT91SAM9263EK-Board */ gd->bd->bi_arch_number =MACH_TYPE_AT91SAM9263EK ;/* adress of boot parameters */ - gd->bd->bi_boot_params =PHYS_SDRAM +0x100 ; + gd->bd->bi_boot_params =CONFIG_SYS_SDRAM_BASE +0x100 ;at91_serial_hw_init ();#ifdef CONFIG_CMD_NAND
@@ -276,8 +276,8 @@ int board_init(void)int dram_init (void ) { - gd->bd->bi_dram[0 ].start =PHYS_SDRAM ; - gd->bd->bi_dram[0 ].size =PHYS_SDRAM_SIZE ; + gd->bd->bi_dram[0 ].start =CONFIG_SYS_SDRAM_BASE ; + gd->bd->bi_dram[0 ].size =CONFIG_SYS_SDRAM_SIZE ;return 0 ; }
include/configs/at91sam9263ek.h +11 -4
@@ -27,6 +27,8 @@#ifndef __CONFIG_H#define __CONFIG_H +#include <asm/sizes.h> +/* ARM asynchronous clock */ #define CONFIG_SYS_AT91_MAIN_CLOCK 16367660/* 16.367 MHz crystal */ #define CONFIG_SYS_HZ 1000
@@ -34,6 +36,7 @@#define CONFIG_ARM926EJS 1/* This is an ARM926EJS Core */ #define CONFIG_AT91SAM9263 1/* It's an Atmel AT91SAM9263 SoC*/ #define CONFIG_AT91SAM9263EK 1/* on an AT91SAM9263EK Board */ +#define CONFIG_AT91FAMILY #define CONFIG_ARCH_CPU_INIT #undef CONFIG_USE_IRQ/* we don't need IRQ/FIQ stuff */
@@ -101,8 +104,8 @@/* SDRAM */ #define CONFIG_NR_DRAM_BANKS 1 -#define PHYS_SDRAM 0x20000000 -#define PHYS_SDRAM_SIZE 0x04000000/* 64 megs */ +#define CONFIG_SYS_SDRAM_BASE 0x20000000 +#define CONFIG_SYS_SDRAM_SIZE SZ_64M/* 64 megs */ /* DataFlash */ #define CONFIG_ATMEL_DATAFLASH_SPI
@@ -291,7 +294,7 @@#define CONFIG_SYS_LOAD_ADDR 0x22000000/* load address */ -#define CONFIG_SYS_MEMTEST_START PHYS_SDRAM +#define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE#define CONFIG_SYS_MEMTEST_END 0x23e00000#ifdef CONFIG_SYS_USE_DATAFLASH
@@ -340,8 +343,12 @@* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN ROUND(3 * CONFIG_ENV_SIZE + 128*1024, 0x1000) +/* size in bytes reserved for initial data */ + +#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + SZ_4K \ + - GENERATED_GBL_DATA_SIZE) -#define CONFIG_STACKSIZE (32*1024)/* regular stack */ +#define CONFIG_STACKSIZE (SZ_32K)/* regular stack */ #ifdef CONFIG_USE_IRQ #error CONFIG_USE_IRQ not supported
Signature · 1 line
1.7.2.2
PATCH 10/11 at91sam9263ek: make compilable again
Dear Alexander Stein,
Quoted 11 lines · In message <1288600195-6960-11-git-send-email-alexander.stein@systec-electronic…
Signed-off-by Alexander Stein <[email protected]>--- board/atmel/at91sam9263ek/at91sam9263ek.c | 6 +++--- include/configs/at91sam9263ek.h | 15 +++++++++++---- 2 files changed, 14 insertions(+), 7 deletions(-)board/atmel/at91sam9263ek/at91sam9263ek.c +0
-0
board/atmel/at91sam9263ek/at91sam9263ek.c int board_init(void) · line 255
Quoted 5 lines
board/atmel/at91sam9263ek/at91sam9263ek.c +1
-1@@ -252,7 +252,7 @@ int board_init(void)/* arch number of AT91SAM9263EK-Board */ gd->bd->bi_arch_number =MACH_TYPE_AT91SAM9263EK ;/* adress of boot parameters */ - gd->bd->bi_boot_params =PHYS_SDRAM +0x100 ; + gd->bd->bi_boot_params =CONFIG_SYS_SDRAM_BASE +0x100 ;
PLease refactor these patches. The rename PHYS_SDRAM => CONFIG_SYS_SDRAM_BASE was done in an earlier patch, so this and similar changes in other patches should be part of that rename patch.
The rename patch should contain _all_ such renames, like any patch should contain all modifications that belong to it logically.
Best regards,
Wolfgang Denk
Signature · 7 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de G's Third Law: In spite of all evidence to the contra- ry, the entire universe is composed of only two basic substances: magic and bullshit. H's Dictum: There is no magic ...
PATCH 11/11 at91cap9adk: make compilable again
In reply to Alexander Stein--- board/atmel/at91cap9adk/at91cap9adk.c | 6 +++--- include/configs/at91cap9adk.h | 15 +++++++++++---- 2 files changed, 14 insertions(+), 7 deletions(-)
board/atmel/at91cap9adk/at91cap9adk.c +3 -3
@@ -306,7 +306,7 @@ int board_init(void)/* arch number of AT91CAP9ADK-Board */ gd->bd->bi_arch_number =MACH_TYPE_AT91CAP9ADK ;/* adress of boot parameters */ - gd->bd->bi_boot_params =PHYS_SDRAM +0x100 ; + gd->bd->bi_boot_params =CONFIG_SYS_SDRAM_BASE +0x100 ;at91_serial_hw_init ();at91cap9_slowclock_hw_init ();
@@ -331,8 +331,8 @@ int board_init(void)int dram_init (void ) { - gd->bd->bi_dram[0 ].start =PHYS_SDRAM ; - gd->bd->bi_dram[0 ].size =PHYS_SDRAM_SIZE ; + gd->bd->bi_dram[0 ].start =CONFIG_SYS_SDRAM_BASE ; + gd->bd->bi_dram[0 ].size =CONFIG_SYS_SDRAM_SIZE ;return 0 ; }
include/configs/at91cap9adk.h +11 -4
@@ -27,6 +27,8 @@#ifndef __CONFIG_H#define __CONFIG_H +#include <asm/sizes.h> +#define CONFIG_AT91_LEGACY /* ARM asynchronous clock */
@@ -36,6 +38,7 @@#define CONFIG_ARM926EJS 1/* This is an ARM926EJS Core */ #define CONFIG_AT91CAP9 1/* It's an Atmel AT91CAP9 SoC */ #define CONFIG_AT91CAP9ADK 1/* on an AT91CAP9ADK Board */ +#define CONFIG_AT91FAMILY #define CONFIG_ARCH_CPU_INIT #undef CONFIG_USE_IRQ/* we don't need IRQ/FIQ stuff */
@@ -100,8 +103,8 @@/* SDRAM: Careful: this supposes an AT91CAP-MEM33 expansion card */ #define CONFIG_NR_DRAM_BANKS 1 -#define PHYS_SDRAM 0x70000000 -#define PHYS_SDRAM_SIZE 0x04000000/* 64 megs */ +#define CONFIG_SYS_SDRAM_BASE 0x70000000 +#define CONFIG_SYS_SDRAM_SIZE SZ_64M/* 64 megs */ /* DataFlash */ #define CONFIG_ATMEL_DATAFLASH_SPI
@@ -155,7 +158,7 @@#define CONFIG_SYS_LOAD_ADDR 0x72000000/* load address */ -#define CONFIG_SYS_MEMTEST_START PHYS_SDRAM +#define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE#define CONFIG_SYS_MEMTEST_END 0x73e00000#define CONFIG_SYS_USE_DATAFLASH 1
@@ -208,8 +211,12 @@* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN ROUND(CONFIG_ENV_SIZE + 128*1024, 0x1000) +/* size in bytes reserved for initial data */ + +#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + SZ_4K \ + - GENERATED_GBL_DATA_SIZE) -#define CONFIG_STACKSIZE (32*1024)/* regular stack */ +#define CONFIG_STACKSIZE (SZ_32K)/* regular stack */ #ifdef CONFIG_USE_IRQ #error CONFIG_USE_IRQ not supported
Signature · 1 line
1.7.2.2
Dear Alexander Stein,
Quoted 3 lines
This patch series changes some at91 boards to SoC access and adds some defines to make the boards compilable again.
Please note: All changes are untested!
Ok, I will look over them, and apply them in a test branch here, if they don't break my board I think they can be mainlined, BUT you would need to be the maintainer of those boards.
But if we receive no positive test reports in some time, those boards ultimately have to be deleted.
I can only test on an at91sam9xe-ek.
Best Regards,
Reinhard
Dear Reinhard Meyer,
Quoted 7 lines · On Monday 01 November 2010, 09:40:52 Reinhard Meyer wrote:
Quoted 3 lines
This patch series changes some at91 boards to SoC access and adds some defines to make the boards compilable again.
Please note: All changes are untested!Ok, I will look over them, and apply them in a test branch here, if they don't break my board I think they can be mainlined, BUT you would need to be the maintainer of those boards.
Well, I have only occasional access to at91sam9g20ek and at91sam9263ek atm. All other boards were just done by adjusting the same things. I'm unsure how well I could maintain those boards.
Quoted 4 lines
But if we receive no positive test reports in some time, those boards ultimately have to be deleted.
I can only test on an at91sam9xe-ek.
Ok, i see.
Best regards,
Alexander
Dear Alexander Stein,
Quoted 2 lines · In message <[email protected]> you wrote:
Well, I have only occasional access to at91sam9g20ek and at91sam9263ek atm.
If U-Boot has been tested on these boards, you can list yourself as maintainer. If any later changes should require testing and you find yourself in a position that you cannot do that any more (for whatever reason), we can still orphan or even remove these boards.
Quoted 2 lines
All other boards were just done by adjusting the same things. I'm unsure how well I could maintain those boards.
Agreed.
Quoted 4 lines
Quoted 4 lines
But if we receive no positive test reports in some time, those boards ultimately have to be deleted.
I can only test on an at91sam9xe-ek.
Well, I suggest we add respective notes to the MAINTAINERS file: in addition to the "orphaned" group of boards, we could add an "orphaned / untested / remove-list" group entry.
Best regards,
Wolfgang Denk
Signature · 4 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de "At least they're __________EXPERIENCED incompetents"
Dear Alexander Stein,
Am 01.11.2010 um 09:50 schrieb Alexander Stein:
Quoted 7 lines
Dear Reinhard Meyer,
Quoted 4 lines · On Monday 01 November 2010, 09:40:52 Reinhard Meyer wrote:
Quoted 3 lines
This patch series changes some at91 boards to SoC access and adds some defines to make the boards compilable again.
Please note: All changes are untested!
Quoted 5 lines
Quoted 3 lines
Ok, I will look over them, and apply them in a test branch here, if they don't break my board I think they can be mainlined, BUT you would need to be the maintainer of those boards.
Well, I have only occasional access to at91sam9g20ek and at91sam9263ek atm.
if you sign up for those boards as maintainer please also provide patches to remove the configure stuff in Makefile, add them to boards.cfg and adopt MAKEALL.
Quoted 2 lines
All other boards were just done by adjusting the same things. I'm unsure how well I could maintain those boards.
I could test the at91sam9260ek stuff ... but the at91rm9200ek stuff takes all my rare spare time currently ;(
regards
Andreas Bie?mann
Hi
2010/11/1 Reinhard Meyer <[email protected]>:
Quoted 8 lines
Dear Alexander Stein,
Quoted 3 lines
This patch series changes some at91 boards to SoC access and adds some defines to make the boards compilable again.
Please note: All changes are untested!Ok, I will look over them, and apply them in a test branch here, if they don't break my board I think they can be mainlined, BUT you would need to be the maintainer of those boards.
If there is still no maintainer for the at91sam9261ek board, I am volunteering...
Kind regards,
Remy