| Message ID | 1307428508-26058-3-git-send-email-eric@eukrea.com |
|---|---|
| State | Superseded |
| Delegated to: | Reinhard Meyer |
| Headers | show |
Dear Eric Bénard, > handle the case where AT91_SDRAM_BASE and AT91_PIO_BASE are not > defined > > Signed-off-by: Eric Bénard <eric@eukrea.com> > --- > arch/arm/cpu/arm926ejs/at91/lowlevel_init.S | 8 ++++++++ > 1 files changed, 8 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/cpu/arm926ejs/at91/lowlevel_init.S b/arch/arm/cpu/arm926ejs/at91/lowlevel_init.S > index 7f7ca5e..7cbbb54 100644 > --- a/arch/arm/cpu/arm926ejs/at91/lowlevel_init.S > +++ b/arch/arm/cpu/arm926ejs/at91/lowlevel_init.S > @@ -42,6 +42,14 @@ > #define CONFIG_SYS_MATRIX_EBICSA_VAL CONFIG_SYS_MATRIX_EBI0CSA_VAL > #endif > > +#ifndef AT91_SDRAM_BASE > +#define AT91_SDRAM_BASE ATMEL_BASE_CS1 > +#endif > + > +#ifndef AT91_PIO_BASE > +#define AT91_PIO_BASE ATMEL_BASE_PIOA > +#endif > + > _TEXT_BASE: > .word CONFIG_SYS_TEXT_BASE > How "temporary" is "temporary"? This fix could be done better, by using CONFIG_SYS_SDRAM_BASE right away, and using ATMEL_BASE_PIOA as well in that file. Please resubmit this fix, or explain why it cannot be done the way I suggested. Best Regards, Reinhard
Hi Reinhard, On 07/06/2011 10:04, Reinhard Meyer wrote: > How "temporary" is "temporary"? > > This fix could be done better, by using > CONFIG_SYS_SDRAM_BASE right away, and using ATMEL_BASE_PIOA > as well in that file. > > Please resubmit this fix, or explain why it cannot be done the > way I suggested. > may I suggest that the next time you rename some defines, you also fix all the places where these defines were used instead of pushing comits which break several parts of u-boot ? Eric
diff --git a/arch/arm/cpu/arm926ejs/at91/lowlevel_init.S b/arch/arm/cpu/arm926ejs/at91/lowlevel_init.S index 7f7ca5e..7cbbb54 100644 --- a/arch/arm/cpu/arm926ejs/at91/lowlevel_init.S +++ b/arch/arm/cpu/arm926ejs/at91/lowlevel_init.S @@ -42,6 +42,14 @@ #define CONFIG_SYS_MATRIX_EBICSA_VAL CONFIG_SYS_MATRIX_EBI0CSA_VAL #endif +#ifndef AT91_SDRAM_BASE +#define AT91_SDRAM_BASE ATMEL_BASE_CS1 +#endif + +#ifndef AT91_PIO_BASE +#define AT91_PIO_BASE ATMEL_BASE_PIOA +#endif + _TEXT_BASE: .word CONFIG_SYS_TEXT_BASE
handle the case where AT91_SDRAM_BASE and AT91_PIO_BASE are not defined Signed-off-by: Eric Bénard <eric@eukrea.com> --- arch/arm/cpu/arm926ejs/at91/lowlevel_init.S | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-)