mx51evk: support new relocation scheme
Subsystems (2)
PATCH v2 1/1 mx51evk: support new relocation scheme
This patch is to fix build breakage and support new relocatoin scheme for mx51evk.
- Correct IRAM base address and add size definition
The IRAM starts from 0x1FFE0000 on final revsion i.mx51 than 0x1FFE8000 which is for older revision.
- Include imx-regs.h in mx51evk.h
Definitions like CSD0_BASE_ADDR and IRAM_BASE_ADDR can be referred to.
- Define CONFIG_SYS_INIT_RAM_ADDR and CONFIG_SYS_INIT_RAM_SIZE
This is something suggested by Wolfgang, and for automatic calculation of macros like CONFIG_SYS_GBL_DATA_SIZE (done) and CONFIG_SYS_INIT_SP_ADDR (later).
- Remove comment for CONFIG_SYS_GBL_DATA_SIZE which has been buried by Wolfgang's commit below
25ddd1fb: Replace CONFIG_SYS_GBL_DATA_SIZE by auto-generated value
---
Changes for v2:
- Combine two patches before into one, as the separation is not so logical.
- Define init stack at the end of init RAM to address comments from Stefano, Heiko and Wolfgang.
arch/arm/include/asm/arch-mx5/imx-regs.h | 3 ++- board/freescale/mx51evk/mx51evk.c | 6 +++--- include/configs/mx51evk.h | 9 +++++++-- 3 files changed, 12 insertions(+), 6 deletions(-)
arch/arm/include/asm/arch-mx5/imx-regs.h +2 -1
@@ -26,7 +26,8 @@/* * IRAM */ -#define IRAM_BASE_ADDR 0x1FFE8000/* internal ram */ +#define IRAM_BASE_ADDR 0x1FFE0000/* internal ram */ +#define IRAM_SIZE 0x00020000/* 128 KB */ /* * Graphics Memory of GPU */
board/freescale/mx51evk/mx51evk.c +3 -3
@@ -52,9 +52,9 @@ u32 get_board_rev(void)int dram_init (void ) { - gd->bd->bi_dram[0 ].start =PHYS_SDRAM_1 ; - gd->bd->bi_dram[0 ].size =get_ram_size ((long *)PHYS_SDRAM_1 , -PHYS_SDRAM_1_SIZE ); +/* dram_init must store complete ramsize in gd->ram_size */ + gd->ram_size =get_ram_size ((volatile void *)CONFIG_SYS_SDRAM_BASE , +PHYS_SDRAM_1_SIZE );return 0 ; }
include/configs/mx51evk.h +7 -2
@@ -24,11 +24,11 @@#ifndef __CONFIG_H#define __CONFIG_H +#include <asm/arch/imx-regs.h> /* High Level Configuration Options */ #define CONFIG_MX51 /* in a mx51 */ -#define CONFIG_SKIP_RELOCATE_UBOOT #define CONFIG_SYS_MX5_HCLK 24000000#define CONFIG_SYS_MX5_CLK32 32768
@@ -51,7 +51,6 @@* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * 1024 * 1024) -/* size in bytes reserved for initial data */ #define BOARD_LATE_INIT
@@ -174,6 +173,12 @@#define PHYS_SDRAM_1 CSD0_BASE_ADDR#define PHYS_SDRAM_1_SIZE (512 * 1024 * 1024) +#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_ADDR \ + (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_RAM_SIZE) +#define CONFIG_SYS_DDR_CLKSEL 0#define CONFIG_SYS_CLKTL_CBCDR 0x59E35100
Signature · 1 line
1.7.1
PATCH v2 1/1 mx51evk: support new relocation scheme
Quoted 19 lines · Shawn Guo
This patch is to fix build breakage and support new relocatoin scheme for mx51evk.
- Correct IRAM base address and add size definition
The IRAM starts from
0x1FFE0000on final revsion i.mx51 than0x1FFE8000which is for older revision.- Include
imx-regs.hinmx51evk.hDefinitions like
CSD0_BASE_ADDRandIRAM_BASE_ADDRcan be referred to.- Define
CONFIG_SYS_INIT_RAM_ADDRandCONFIG_SYS_INIT_RAM_SIZEThis is something suggested by Wolfgang, and for automatic calculation of macros like
CONFIG_SYS_GBL_DATA_SIZE(done) andCONFIG_SYS_INIT_SP_ADDR(later).
Quoted 6 lines
- Remove comment for
CONFIG_SYS_GBL_DATA_SIZEwhich has been buried by Wolfgang's commit below
25ddd1fb: ReplaceCONFIG_SYS_GBL_DATA_SIZEby auto-generated valueSigned-off-by Shawn Guo <[email protected]>
Applied to u-boot-imx, thanks.
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de =====================================================================
PATCH v2 1/1 mx51evk: support new relocation scheme
In reply to Shawn Guo2010/10/27 Shawn Guo <[email protected]>:
Quoted 2 lines
This patch is to fix build breakage and support new relocatoin scheme for mx51evk.
What's change is for the build breakage fix? Please state it clearly.
Quoted 112 lines
- Correct IRAM base address and add size definition
?The IRAM starts from
0x1FFE0000on final revsion i.mx51 than ?0x1FFE8000 which is for older revision.- Include
imx-regs.hinmx51evk.h?Definitions like
CSD0_BASE_ADDRandIRAM_BASE_ADDRcan be ?referred to.- Define
CONFIG_SYS_INIT_RAM_ADDRandCONFIG_SYS_INIT_RAM_SIZE?This is something suggested by Wolfgang, and for automatic ?calculation of macros like
CONFIG_SYS_GBL_DATA_SIZE(done) and ?CONFIG_SYS_INIT_SP_ADDR (later).- Remove comment for
CONFIG_SYS_GBL_DATA_SIZEwhich has been ?buried by Wolfgang's commit below?25ddd1fb: Replace
CONFIG_SYS_GBL_DATA_SIZEby auto-generated valueSigned-off-by Shawn Guo <[email protected]>---
Changes for v2:
?- Combine two patches before into one, as the separation is not ? so logical.
?- Define init stack at the end of init RAM to address comments ? from Stefano, Heiko and Wolfgang.?arch/arm/include/asm/arch-mx5/imx-regs.h | ? ?3 ++- ?board/freescale/mx51evk/mx51evk.c ? ? ? ?| ? ?6 +++--- ?include/configs/mx51evk.h ? ? ? ? ? ? ? ?| ? ?9 +++++++--?3 files changed, 12 insertions(+), 6 deletions(-)
arch/arm/include/asm/arch-mx5/imx-regs.h +0
-0@@ -26,7 +26,8 @@?/*
?* IRAM
?*/arch/arm/include/asm/arch-mx5/imx-regs.h +2
-1-#define IRAM_BASE_ADDR ? ? ? ? 0x1FFE8000 ? ? ?/* internal ram */ +#define IRAM_BASE_ADDR ? ? ? ? 0x1FFE0000 ? ? ?/* internal ram */ +#define IRAM_SIZE ? ? ? ? ? ? ?0x00020000 ? ? ?/* 128 KB */ ?/*
?* Graphics Memory of GPU
?*/board/freescale/mx51evk/mx51evk.c +3
-3@@ -52,9 +52,9 @@ u32 get_board_rev(void) ?int dram_init(void) ?{ - ? ? ? gd->bd->bi_dram[0].start = PHYS_SDRAM_1; - ? ? ? gd->bd->bi_dram[0].size = get_ram_size((long *)PHYS_SDRAM_1, - ? ? ? ? ? ? ? ? ? ? ? PHYS_SDRAM_1_SIZE); + ? ? ? /* dram_init must store complete ramsize in gd->ram_size */ + ? ? ? gd->ram_size = get_ram_size((volatile void *)CONFIG_SYS_SDRAM_BASE, + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? PHYS_SDRAM_1_SIZE); ? ? ? ?return 0; ?}include/configs/mx51evk.h +0
-0@@ -24,11 +24,11 @@?#ifndef
__CONFIG_H
?#define__CONFIG_H+#include <
asm/arch/imx-regs.h>?/* High Level Configuration Options */
?#define
CONFIG_MX51? ?/* in a mx51 */
-#defineCONFIG_SKIP_RELOCATE_UBOOT?#define
CONFIG_SYS_MX5_HCLK? ?24000000
?#defineCONFIG_SYS_MX5_CLK32? ? ? ? ? 32768include/configs/mx51evk.h +0
-0@@ -51,7 +51,6 @@?* Size of
malloc()pool
?*/
?#defineCONFIG_SYS_MALLOC_LEN? ? ? ? ?(CONFIG_ENV_SIZE + 2 * 1024 * 1024) -/* size in bytes reserved for initial data */?#define
BOARD_LATE_INITinclude/configs/mx51evk.h +0
-0@@ -174,6 +173,12 @@?#define
PHYS_SDRAM_1? ? ? ? ?CSD0_BASE_ADDR?#definePHYS_SDRAM_1_SIZE? ? ?(512 * 1024 * 1024)include/configs/mx51evk.h +6
-0+#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_ADDR ? ? ? ?\ + ? ? ? (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_RAM_SIZE) +?#define
CONFIG_SYS_DDR_CLKSEL?0
?#defineCONFIG_SYS_CLKTL_CBCDR0x59E35100--
1.7.1_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
PATCH v2 1/1 mx51evk: support new relocation scheme
Quoted 6 lines · Jason Liu
2010/10/27 Shawn Guo <[email protected]>:
Quoted 2 lines
This patch is to fix build breakage and support new relocatoin scheme for mx51evk.
What's change is for the build breakage fix? Please state it clearly.
The new relocation scheme requires the definition of CONFIG_SYS_INIT_SP_ADDR and CONFIG_SYS_SDRAM_BASE. It's the reason that build on master has been in failure for some time.
Signature · 2 lines
Regards, Shawn
PATCH v2 1/1 mx51evk: support new relocation scheme
2010/10/27 Shawn Guo <[email protected]>:
Quoted 10 lines · Jason Liu
Quoted 6 lines
2010/10/27 Shawn Guo <[email protected]>:
Quoted 2 lines
This patch is to fix build breakage and support new relocatoin scheme for mx51evk.
What's change is for the build breakage fix? Please state it clearly.
The new relocation scheme requires the definition of
CONFIG_SYS_INIT_SP_ADDRandCONFIG_SYS_SDRAM_BASE. It's the reason that build on master has been in failure for some time.
Okay, I noticed that Stefano has already sent out patch before to fix relocation and I have applied his patch on my local tree, so I don't find build break.
Quoted 5 lines
--
Regards,
Shawn
PATCH v2 1/1 mx51evk: support new relocation scheme
In reply to Shawn GuoDear Shawn Guo,
Quoted 10 lines · In message <[email protected]> you wrote:
This patch is to fix build breakage and support new relocatoin scheme for mx51evk.
- Correct IRAM base address and add size definition
The IRAM starts from
0x1FFE0000on final revsion i.mx51 than0x1FFE8000which is for older revision.- Include
imx-regs.hinmx51evk.h
Quoted 8 lines
Definitions like
CSD0_BASE_ADDRandIRAM_BASE_ADDRcan be referred to.- Define
CONFIG_SYS_INIT_RAM_ADDRandCONFIG_SYS_INIT_RAM_SIZEThis is something suggested by Wolfgang, and for automatic calculation of macros like
CONFIG_SYS_GBL_DATA_SIZE(done) andCONFIG_SYS_INIT_SP_ADDR(later).
Um... this is NOT what we discussed.
include/configs/mx51evk.h line 181
Quoted 6 lines
include/configs/mx51evk.h +6
-0+#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_ADDR \ + (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_RAM_SIZE) +
No. This is not what I want to se.
Memory allocation in the inital ram has the global data at the top.
Please use something like
#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)
Best regards,
Wolfgang Denk
Signature · 5 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 "Whoever undertakes to set himself up as a judge of Truth and Know- ledge is shipwrecked by the laughter of the gods." - Albert Einstein
PATCH v2 1/1 mx51evk: support new relocation scheme
Quoted 16 lines · Wolfgang Denk
Dear Shawn Guo,
Quoted 13 lines · In message <[email protected]> you wrote:
This patch is to fix build breakage and support new relocatoin scheme for mx51evk.
- Correct IRAM base address and add size definition
? The IRAM starts from
0x1FFE0000on final revsion i.mx51 than ?0x1FFE8000which is for older revision.- Include
imx-regs.hinmx51evk.h? Definitions like
CSD0_BASE_ADDRandIRAM_BASE_ADDRcan be ? referred to.
Quoted 8 lines
Quoted 5 lines
- Define
CONFIG_SYS_INIT_RAM_ADDRandCONFIG_SYS_INIT_RAM_SIZE? This is something suggested by Wolfgang, and for automatic ? calculation of macros like
CONFIG_SYS_GBL_DATA_SIZE(done) and ?CONFIG_SYS_INIT_SP_ADDR(later).Um... this is NOT what we discussed.
Are you saying that automatic calculation of CONFIG_SYS_INIT_SP_ADDR will not happen?
Quoted 10 lines
No. ?This is not what I want to se.
Memory allocation in the inital ram has the global data at the top.
Please use something like
#define
CONFIG_SYS_INIT_SP_OFFSET?(CONFIG_SYS_INIT_RAM_SIZE -GENERATED_GBL_DATA_SIZE) #defineCONFIG_SYS_INIT_SP_ADDR? ?(CONFIG_SYS_INIT_RAM_ADDR +CONFIG_SYS_INIT_SP_OFFSET)
If the automatic calculation of CONFIG_SYS_INIT_SP_ADDR will not happen, I can send another patch to fix it, since it's been applied by Stefano already.
Signature · 2 lines
Regards, Shawn
PATCH v2 1/1 mx51evk: support new relocation scheme
Quoted 33 lines · Shawn Guo
Quoted 16 lines · Wolfgang Denk
Dear Shawn Guo,
Quoted 13 lines · In message <[email protected]> you wrote:
This patch is to fix build breakage and support new relocatoin scheme for mx51evk.
- Correct IRAM base address and add size definition
The IRAM starts from
0x1FFE0000on final revsion i.mx51 than0x1FFE8000which is for older revision.- Include
imx-regs.hinmx51evk.hDefinitions like
CSD0_BASE_ADDRandIRAM_BASE_ADDRcan be referred to.Quoted 8 lines
Quoted 5 lines
- Define
CONFIG_SYS_INIT_RAM_ADDRandCONFIG_SYS_INIT_RAM_SIZEThis is something suggested by Wolfgang, and for automatic calculation of macros like
CONFIG_SYS_GBL_DATA_SIZE(done) andCONFIG_SYS_INIT_SP_ADDR(later).Um... this is NOT what we discussed.
Are you saying that automatic calculation of
CONFIG_SYS_INIT_SP_ADDRwill not happen?Quoted 5 lines
No. This is not what I want to se.
Memory allocation in the inital ram has the global data at the top.
Quoted 8 lines
Quoted 5 lines
Please use something like
#define
CONFIG_SYS_INIT_SP_OFFSET(CONFIG_SYS_INIT_RAM_SIZE-GENERATED_GBL_DATA_SIZE)
#defineCONFIG_SYS_INIT_SP_ADDR(CONFIG_SYS_INIT_RAM_ADDR+CONFIG_SYS_INIT_SP_OFFSET)If the automatic calculation of
CONFIG_SYS_INIT_SP_ADDRwill not happen, I can send another patch to fix it, since it's been applied by Stefano already.
Sorry for that. I was too fast and I have not read the patch with attention. I revert the patch after I see Wolfgang's comment. You can send V3 version of this patch and you can forget the "applied" message.
Stefano
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de =====================================================================
PATCH v2 1/1 mx51evk: support new relocation scheme
In reply to Shawn GuoDear Shawn Guo,
Quoted 9 lines · In message <[email protected]> you…
Quoted 6 lines
Please use something like
#define
CONFIG_SYS_INIT_SP_OFFSET(CONFIG_SYS_INIT_RAM_SIZE-GENERATED_GBL_DATA_SIZE) #defineCONFIG_SYS_INIT_SP_ADDR(CONFIG_SYS_INIT_RAM_ADDR+CONFIG_SYS_INIT_SP_OFFSET)If the automatic calculation of
CONFIG_SYS_INIT_SP_ADDRwill not happen, I can send another patch to fix it, since it's been applied by Stefano already.
Yes, it will.
But the stack pointer will not start at the end of the initial ram area, but below the global data area which lies at the end.
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 Always leave room to add an explanation if it doesn't work out.
PATCH v2 1/1 mx51evk: support new relocation scheme
Quoted 9 lines · Wolfgang Denk
Dear Shawn Guo,
Quoted 6 lines · In message <[email protected]> you…
Quoted 6 lines
Please use something like
#define
CONFIG_SYS_INIT_SP_OFFSET(CONFIG_SYS_INIT_RAM_SIZE-GENERATED_GBL_DATA_SIZE) #defineCONFIG_SYS_INIT_SP_ADDR?(CONFIG_SYS_INIT_RAM_ADDR +CONFIG_SYS_INIT_SP_OFFSET)
Quoted 9 lines
Quoted 3 lines
If the automatic calculation of
CONFIG_SYS_INIT_SP_ADDRwill not happen, I can send another patch to fix it, since it's been applied by Stefano already.Yes, it will.
But the stack pointer will not start at the end of the initial ram area, but below the global data area which lies at the end.
I thought the manual definition of CONFIG_SYS_INIT_SP_ADDR is the near term solution, since it will be replaced by automatic calculation. So I did not put much attention to reflect the layout you want to see.
Anyway, v3 is coming soon.
Signature · 2 lines
Regards, Shawn
PATCH v2 1/1 mx51evk: support new relocation scheme
Dear Shawn Guo,
Quoted 7 lines · In message <[email protected]> you…
Quoted 4 lines
But the stack pointer will not start at the end of the initial ram area, but below the global data area which lies at the end.
I thought the manual definition of
CONFIG_SYS_INIT_SP_ADDRis the near term solution, since it will be replaced by automatic calculation. So I did not put much attention to reflect the layout you want to see.
Well, we can only calculate this automatically if all boards us the same layout of the internal RAM area. That's why this is needed.
Best regards,
Wolfgang Denk
Signature · 5 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 The more we disagree, the more chance there is that at least one of us is right.
PATCH v2 1/1 mx51evk: support new relocation scheme
In reply to Wolfgang DenkQuoted 33 lines · Wolfgang Denk
Dear Shawn Guo,
Quoted 10 lines · In message <[email protected]> you wrote:
This patch is to fix build breakage and support new relocatoin scheme for mx51evk.
- Correct IRAM base address and add size definition
? The IRAM starts from
0x1FFE0000on final revsion i.mx51 than ?0x1FFE8000which is for older revision.- Include
imx-regs.hinmx51evk.hQuoted 8 lines
? Definitions like
CSD0_BASE_ADDRandIRAM_BASE_ADDRcan be ? referred to.- Define
CONFIG_SYS_INIT_RAM_ADDRandCONFIG_SYS_INIT_RAM_SIZE? This is something suggested by Wolfgang, and for automatic ? calculation of macros like
CONFIG_SYS_GBL_DATA_SIZE(done) and ?CONFIG_SYS_INIT_SP_ADDR(later).Um... this is NOT what we discussed.
Review
Quoted 6 lines
(quoted diff) +6
-0+#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_ADDR ? ? ?\ + ? ? (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_RAM_SIZE) +No. ?This is not what I want to se.
Quoted 7 lines
Memory allocation in the inital ram has the global data at the top.
Please use something like
#define
CONFIG_SYS_INIT_SP_OFFSET?(CONFIG_SYS_INIT_RAM_SIZE -GENERATED_GBL_DATA_SIZE) #defineCONFIG_SYS_INIT_SP_ADDR? ?(CONFIG_SYS_INIT_RAM_ADDR +CONFIG_SYS_INIT_SP_OFFSET)
It ends up with the following compiling error.
start.S:175: Error: garbage following instruction -- `ldr sp,=(((0x1FFE0000)+((0x00020000)-#96)))'
Can we just go the current way for the near term, and wait for the auto calculation to clean it up?
Signature · 2 lines
Regards, Shawn
PATCH v2 1/1 mx51evk: support new relocation scheme
Dear Shawn Guo,
Quoted 8 lines · In message <[email protected]> you…
It ends up with the following compiling error.
start.S:175: Error: garbage following instruction -- `ldr sp,=(((0x1FFE0000)+((0x00020000)-#96)))'
Can we just go the current way for the near term, and wait for the auto calculation to clean it up?
This has been fixed - see
http://article.gmane.org/gmane.comp.boot-loaders.u-boot/87669
Best regards,
Wolfgang Denk
Signature · 5 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 I'd like to meet the man who invented sex and see what he's working on now.
PATCH v3 1/1 mx51evk: support new relocation scheme
In reply to Shawn GuoFrom: Shawn Guo <[email protected]>
This patch is to fix build breakage and support new relocation scheme for mx51evk.
- Correct IRAM base address and add size definition
The IRAM starts from 0x1FFE0000 on final revsion i.mx51 than 0x1FFE8000 which is for older revision.
- Include imx-regs.h in mx51evk.h
Definitions like CSD0_BASE_ADDR and IRAM_BASE_ADDR can be referred to.
- Define CONFIG_SYS_INIT_RAM_ADDR and CONFIG_SYS_INIT_RAM_SIZE
They are used to define init RAM layout.
- Remove comment for CONFIG_SYS_GBL_DATA_SIZE which has been buried by Wolfgang's commit below
25ddd1fb: Replace CONFIG_SYS_GBL_DATA_SIZE by auto-generated value
---
Changes for v3:
- Correct init RAM layout to have global data at the top.
Changes for v2:
- Combine two patches before into one, as the separation is not so logical.
- Define init stack at the end of init RAM to address comments from Stefano, Heiko and Wolfgang.
arch/arm/include/asm/arch-mx5/imx-regs.h | 3 ++- board/freescale/mx51evk/mx51evk.c | 6 +++--- include/configs/mx51evk.h | 12 ++++++++++-- 3 files changed, 15 insertions(+), 6 deletions(-)
arch/arm/include/asm/arch-mx5/imx-regs.h +2 -1
@@ -26,7 +26,8 @@/* * IRAM */ -#define IRAM_BASE_ADDR 0x1FFE8000/* internal ram */ +#define IRAM_BASE_ADDR 0x1FFE0000/* internal ram */ +#define IRAM_SIZE 0x00020000/* 128 KB */ /* * Graphics Memory of GPU */
board/freescale/mx51evk/mx51evk.c +3 -3
@@ -52,9 +52,9 @@ u32 get_board_rev(void)int dram_init (void ) { - gd->bd->bi_dram[0 ].start =PHYS_SDRAM_1 ; - gd->bd->bi_dram[0 ].size =get_ram_size ((long *)PHYS_SDRAM_1 , -PHYS_SDRAM_1_SIZE ); +/* dram_init must store complete ramsize in gd->ram_size */ + gd->ram_size =get_ram_size ((volatile void *)CONFIG_SYS_SDRAM_BASE , +PHYS_SDRAM_1_SIZE );return 0 ; }
include/configs/mx51evk.h +10 -2
@@ -24,11 +24,11 @@#ifndef __CONFIG_H#define __CONFIG_H +#include <asm/arch/imx-regs.h> /* High Level Configuration Options */ #define CONFIG_MX51 /* in a mx51 */ -#define CONFIG_SKIP_RELOCATE_UBOOT #define CONFIG_SYS_MX5_HCLK 24000000#define CONFIG_SYS_MX5_CLK32 32768
@@ -51,7 +51,6 @@* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * 1024 * 1024) -/* size in bytes reserved for initial data */ #define BOARD_LATE_INIT
@@ -174,6 +173,15 @@#define PHYS_SDRAM_1 CSD0_BASE_ADDR#define PHYS_SDRAM_1_SIZE (512 * 1024 * 1024) +#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_SYS_DDR_CLKSEL 0#define CONFIG_SYS_CLKTL_CBCDR 0x59E35100
Signature · 1 line
1.7.1
PATCH v3 1/1 mx51evk: support new relocation scheme
Quoted 17 lines · Shawn.Guo at freescale.com
From: Shawn Guo <[email protected]>
This patch is to fix build breakage and support new relocation scheme for mx51evk.
- Correct IRAM base address and add size definition
The IRAM starts from
0x1FFE0000on final revsion i.mx51 than0x1FFE8000which is for older revision.- Include
imx-regs.hinmx51evk.hDefinitions like
CSD0_BASE_ADDRandIRAM_BASE_ADDRcan be referred to.- Define
CONFIG_SYS_INIT_RAM_ADDRandCONFIG_SYS_INIT_RAM_SIZE
Quoted 8 lines
They are used to define init RAM layout.
- Remove comment for
CONFIG_SYS_GBL_DATA_SIZEwhich has been buried by Wolfgang's commit below
25ddd1fb: ReplaceCONFIG_SYS_GBL_DATA_SIZEby auto-generated valueSigned-off-by Shawn Guo <[email protected]>
Applied to u-boot-imx, thanks.
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de =====================================================================