From 96fd99067f0ab5c1d23d6130d882138ebea08d49 Mon Sep 17 00:00:00 2001 From: Eric Benard Date: Mon, 6 Jun 2011 22:48:27 +0000 Subject: arm926ejs/at91/lowlevel_init.S: fix defines MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit atmel rework changed define names which broke this file Signed-off-by: Eric Bénard --- arch/arm/cpu/arm926ejs/at91/lowlevel_init.S | 24 ++++++++++++------------ arch/arm/include/asm/arch-at91/at91_pio.h | 14 +++++++------- arch/arm/include/asm/arch-at91/at91sam9260.h | 1 + arch/arm/include/asm/arch-at91/at91sam9261.h | 1 + arch/arm/include/asm/arch-at91/at91sam9263.h | 1 + 5 files changed, 22 insertions(+), 19 deletions(-) diff --git a/arch/arm/cpu/arm926ejs/at91/lowlevel_init.S b/arch/arm/cpu/arm926ejs/at91/lowlevel_init.S index 7f7ca5ef34..17ff0ddc25 100644 --- a/arch/arm/cpu/arm926ejs/at91/lowlevel_init.S +++ b/arch/arm/cpu/arm926ejs/at91/lowlevel_init.S @@ -230,37 +230,37 @@ SMRDATA1: .word CONFIG_SYS_SDRC_MDR_VAL .word AT91_ASM_SDRAMC_MR .word CONFIG_SYS_SDRC_MR_VAL2 - .word AT91_SDRAM_BASE + .word CONFIG_SYS_SDRAM_BASE .word CONFIG_SYS_SDRAM_VAL1 .word AT91_ASM_SDRAMC_MR .word CONFIG_SYS_SDRC_MR_VAL3 - .word AT91_SDRAM_BASE + .word CONFIG_SYS_SDRAM_BASE .word CONFIG_SYS_SDRAM_VAL2 - .word AT91_SDRAM_BASE + .word CONFIG_SYS_SDRAM_BASE .word CONFIG_SYS_SDRAM_VAL3 - .word AT91_SDRAM_BASE + .word CONFIG_SYS_SDRAM_BASE .word CONFIG_SYS_SDRAM_VAL4 - .word AT91_SDRAM_BASE + .word CONFIG_SYS_SDRAM_BASE .word CONFIG_SYS_SDRAM_VAL5 - .word AT91_SDRAM_BASE + .word CONFIG_SYS_SDRAM_BASE .word CONFIG_SYS_SDRAM_VAL6 - .word AT91_SDRAM_BASE + .word CONFIG_SYS_SDRAM_BASE .word CONFIG_SYS_SDRAM_VAL7 - .word AT91_SDRAM_BASE + .word CONFIG_SYS_SDRAM_BASE .word CONFIG_SYS_SDRAM_VAL8 - .word AT91_SDRAM_BASE + .word CONFIG_SYS_SDRAM_BASE .word CONFIG_SYS_SDRAM_VAL9 .word AT91_ASM_SDRAMC_MR .word CONFIG_SYS_SDRC_MR_VAL4 - .word AT91_SDRAM_BASE + .word CONFIG_SYS_SDRAM_BASE .word CONFIG_SYS_SDRAM_VAL10 .word AT91_ASM_SDRAMC_MR .word CONFIG_SYS_SDRC_MR_VAL5 - .word AT91_SDRAM_BASE + .word CONFIG_SYS_SDRAM_BASE .word CONFIG_SYS_SDRAM_VAL11 .word AT91_ASM_SDRAMC_TR .word CONFIG_SYS_SDRC_TR_VAL2 - .word AT91_SDRAM_BASE + .word CONFIG_SYS_SDRAM_BASE .word CONFIG_SYS_SDRAM_VAL12 /* User reset enable*/ .word AT91_ASM_RSTC_MR diff --git a/arch/arm/include/asm/arch-at91/at91_pio.h b/arch/arm/include/asm/arch-at91/at91_pio.h index 0b5bd69db8..416cabf87c 100644 --- a/arch/arm/include/asm/arch-at91/at91_pio.h +++ b/arch/arm/include/asm/arch-at91/at91_pio.h @@ -20,20 +20,20 @@ #define AT91_ASM_PIO_RANGE 0x200 #define AT91_ASM_PIOC_ASR \ - (AT91_PIO_BASE + AT91_PIO_PORTC * AT91_ASM_PIO_RANGE + 0x70) + (ATMEL_BASE_PIO + AT91_PIO_PORTC * AT91_ASM_PIO_RANGE + 0x70) #define AT91_ASM_PIOC_BSR \ - (AT91_PIO_BASE + AT91_PIO_PORTC * AT91_ASM_PIO_RANGE + 0x74) + (ATMEL_BASE_PIO + AT91_PIO_PORTC * AT91_ASM_PIO_RANGE + 0x74) #define AT91_ASM_PIOC_PDR \ - (AT91_PIO_BASE + AT91_PIO_PORTC * AT91_ASM_PIO_RANGE + 0x04) + (ATMEL_BASE_PIO + AT91_PIO_PORTC * AT91_ASM_PIO_RANGE + 0x04) #define AT91_ASM_PIOC_PUDR \ - (AT91_PIO_BASE + AT91_PIO_PORTC * AT91_ASM_PIO_RANGE + 0x60) + (ATMEL_BASE_PIO + AT91_PIO_PORTC * AT91_ASM_PIO_RANGE + 0x60) #define AT91_ASM_PIOD_PDR \ - (AT91_PIO_BASE + AT91_PIO_PORTD * AT91_ASM_PIO_RANGE + 0x04) + (ATMEL_BASE_PIO + AT91_PIO_PORTD * AT91_ASM_PIO_RANGE + 0x04) #define AT91_ASM_PIOD_PUDR \ - (AT91_PIO_BASE + AT91_PIO_PORTD * AT91_ASM_PIO_RANGE + 0x60) + (ATMEL_BASE_PIO + AT91_PIO_PORTD * AT91_ASM_PIO_RANGE + 0x60) #define AT91_ASM_PIOD_ASR \ - (AT91_PIO_BASE + AT91_PIO_PORTD * AT91_ASM_PIO_RANGE + 0x70) + (ATMEL_BASE_PIO + AT91_PIO_PORTD * AT91_ASM_PIO_RANGE + 0x70) #ifndef __ASSEMBLY__ diff --git a/arch/arm/include/asm/arch-at91/at91sam9260.h b/arch/arm/include/asm/arch-at91/at91sam9260.h index dd68485c62..08cb42d0b8 100644 --- a/arch/arm/include/asm/arch-at91/at91sam9260.h +++ b/arch/arm/include/asm/arch-at91/at91sam9260.h @@ -141,6 +141,7 @@ */ #define ATMEL_PIO_PORTS 3 /* these SoCs have 3 PIO */ #define ATMEL_PMC_UHP AT91SAM926x_PMC_UHP +#define ATMEL_BASE_PIO ATMEL_BASE_PIOA /* * SoC specific defines diff --git a/arch/arm/include/asm/arch-at91/at91sam9261.h b/arch/arm/include/asm/arch-at91/at91sam9261.h index f8048d5612..c85fd29b46 100644 --- a/arch/arm/include/asm/arch-at91/at91sam9261.h +++ b/arch/arm/include/asm/arch-at91/at91sam9261.h @@ -125,6 +125,7 @@ * Other misc defines */ #define ATMEL_PIO_PORTS 3 /* theese SoCs have 3 PIO */ +#define ATMEL_BASE_PIO ATMEL_BASE_PIOA /* * SoC specific defines diff --git a/arch/arm/include/asm/arch-at91/at91sam9263.h b/arch/arm/include/asm/arch-at91/at91sam9263.h index bfd408bb1d..2a1d6ee04c 100644 --- a/arch/arm/include/asm/arch-at91/at91sam9263.h +++ b/arch/arm/include/asm/arch-at91/at91sam9263.h @@ -128,6 +128,7 @@ * Other misc defines */ #define ATMEL_PIO_PORTS 5 /* this SoCs has 5 PIO */ +#define ATMEL_BASE_PIO ATMEL_BASE_PIOA /* * Cpu Name -- cgit v1.2.3