| Message ID | 1317204557-11130-1-git-send-email-sbabic@denx.de |
|---|---|
| State | Changes Requested |
| Delegated to: | Stefano Babic |
| Headers | show |
On Wednesday, September 28, 2011 12:09:17 PM Stefano Babic wrote: > Adapt vision2 to the current u-boot version. Drop > own macros to set global data and use the common ones. > > Signed-off-by: Stefano Babic <sbabic@denx.de> > --- > include/configs/vision2.h | 17 +++++++++-------- > 1 files changed, 9 insertions(+), 8 deletions(-) > > diff --git a/include/configs/vision2.h b/include/configs/vision2.h > index 16ed975..c07cee4 100644 > --- a/include/configs/vision2.h > +++ b/include/configs/vision2.h > @@ -192,14 +192,15 @@ > #define PHYS_SDRAM_1_SIZE (256 * 1024 * 1024) > #define PHYS_SDRAM_2 CSD1_BASE_ADDR > #define PHYS_SDRAM_2_SIZE (256 * 1024 * 1024) > -#define CONFIG_SYS_SDRAM_BASE 0x90000000 > -#define CONFIG_SYS_INIT_RAM_ADDR 0x1FFE8000 > - > -#define CONFIG_SYS_INIT_RAM_SIZE (64 * 1024) > -#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_SIZE - \ > - GENERATED_GBL_DATA_SIZE) > -#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_INIT_RAM_ADDR + \ > - CONFIG_SYS_GBL_DATA_OFFSET) > +#define CONFIG_SYS_SDRAM_BASE (PHYS_SDRAM_1) > +#define CONFIG_SYS_INIT_RAM_ADDR (IRAM_BASE_ADDR) > +#define CONFIG_SYS_INIT_RAM_SIZE (IRAM_SIZE) Arent the parentheses redundant here? Cheers > + > +#define CONFIG_SYS_INIT_SP_OFFSET \ > + (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE) > +#define CONFIG_SYS_INIT_SP_ADDR \ > + (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) > + > #define CONFIG_BOARD_EARLY_INIT_F > > /* 166 MHz DDR RAM */
On 09/29/2011 03:34 AM, Marek Vasut wrote: > On Wednesday, September 28, 2011 12:09:17 PM Stefano Babic wrote: >> Adapt vision2 to the current u-boot version. Drop >> own macros to set global data and use the common ones. >> >> Signed-off-by: Stefano Babic <sbabic@denx.de> >> --- >> include/configs/vision2.h | 17 +++++++++-------- >> 1 files changed, 9 insertions(+), 8 deletions(-) >> >> diff --git a/include/configs/vision2.h b/include/configs/vision2.h >> index 16ed975..c07cee4 100644 >> --- a/include/configs/vision2.h >> +++ b/include/configs/vision2.h >> @@ -192,14 +192,15 @@ >> #define PHYS_SDRAM_1_SIZE (256 * 1024 * 1024) >> #define PHYS_SDRAM_2 CSD1_BASE_ADDR >> #define PHYS_SDRAM_2_SIZE (256 * 1024 * 1024) >> -#define CONFIG_SYS_SDRAM_BASE 0x90000000 >> -#define CONFIG_SYS_INIT_RAM_ADDR 0x1FFE8000 >> - >> -#define CONFIG_SYS_INIT_RAM_SIZE (64 * 1024) >> -#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_SIZE - \ >> - GENERATED_GBL_DATA_SIZE) >> -#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_INIT_RAM_ADDR + \ >> - CONFIG_SYS_GBL_DATA_OFFSET) >> +#define CONFIG_SYS_SDRAM_BASE (PHYS_SDRAM_1) >> +#define CONFIG_SYS_INIT_RAM_ADDR (IRAM_BASE_ADDR) >> +#define CONFIG_SYS_INIT_RAM_SIZE (IRAM_SIZE) > > Arent the parentheses redundant here? I will drop in V2. Best regards, Stefano Babic
diff --git a/include/configs/vision2.h b/include/configs/vision2.h index 16ed975..c07cee4 100644 --- a/include/configs/vision2.h +++ b/include/configs/vision2.h @@ -192,14 +192,15 @@ #define PHYS_SDRAM_1_SIZE (256 * 1024 * 1024) #define PHYS_SDRAM_2 CSD1_BASE_ADDR #define PHYS_SDRAM_2_SIZE (256 * 1024 * 1024) -#define CONFIG_SYS_SDRAM_BASE 0x90000000 -#define CONFIG_SYS_INIT_RAM_ADDR 0x1FFE8000 - -#define CONFIG_SYS_INIT_RAM_SIZE (64 * 1024) -#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_SIZE - \ - GENERATED_GBL_DATA_SIZE) -#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_INIT_RAM_ADDR + \ - CONFIG_SYS_GBL_DATA_OFFSET) +#define CONFIG_SYS_SDRAM_BASE (PHYS_SDRAM_1) +#define CONFIG_SYS_INIT_RAM_ADDR (IRAM_BASE_ADDR) +#define CONFIG_SYS_INIT_RAM_SIZE (IRAM_SIZE) + +#define CONFIG_SYS_INIT_SP_OFFSET \ + (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE) +#define CONFIG_SYS_INIT_SP_ADDR \ + (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) + #define CONFIG_BOARD_EARLY_INIT_F /* 166 MHz DDR RAM */
Adapt vision2 to the current u-boot version. Drop own macros to set global data and use the common ones. Signed-off-by: Stefano Babic <sbabic@denx.de> --- include/configs/vision2.h | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-)