arm926ejs, suen3: fix relocation issues
PATCH 1/1 arm926ejs, suen3: fix relocation issues
- use internal 2k security SRAM as RAM for early stack.
- do early inits in board_init_f()
--- board/keymile/km_arm/km_arm.c | 24 +++++++++++++++--------- include/configs/km_arm.h | 6 ++++-- 2 files changed, 19 insertions(+), 11 deletions(-)
board/keymile/km_arm/km_arm.c +15 -9
@@ -143,7 +143,7 @@ int misc_init_r(void)return 0 ; } -int board_init (void ) +int board_early_init_f (void ) {u32 tmp;
@@ -160,14 +160,6 @@ int board_init(void)writel (tmp & (~FLASH_GPIO_PIN ) ,KW_GPIO0_BASE +4 );printf ("KM: setting NAND mode\n" ); -/* -* arch number of board -*/ - gd->bd->bi_arch_number =MACH_TYPE_SUEN3 ; - -/* address of boot parameters */ - gd->bd->bi_boot_params =kw_sdram_bar (0 ) +0x100 ; -#if defined(CONFIG_SOFT_I2C )/* init the GPIO for I2C Bitbang driver */ kw_gpio_set_valid (SUEN3_SDA_PIN ,1 );
@@ -179,6 +171,20 @@ int board_init(void)kw_gpio_set_valid (SUEN3_ENV_WP ,38 );kw_gpio_direction_output (SUEN3_ENV_WP ,1 );#endif + +return 0 ; +} + +int board_init (void ) +{ +/* +* arch number of board +*/ + gd->bd->bi_arch_number =MACH_TYPE_SUEN3 ; + +/* address of boot parameters */ + gd->bd->bi_boot_params =kw_sdram_bar (0 ) +0x100 ; +return 0 ; }
include/configs/km_arm.h +4 -2
@@ -182,6 +182,8 @@ int get_scl (void);/* additions for new relocation code, must be added to all boards */ #define CONFIG_SYS_SDRAM_BASE 0x00000000 -#define CONFIG_SYS_INIT_SP_ADDR (0x00000000 + 0x1000 - /* Fix this */ \ -CONFIG_SYS_GBL_DATA_SIZE ) +/* Kirkwood has 2k of Security SRAM, use it for SP */ +#define CONFIG_SYS_INIT_SP_ADDR 0xC8012000 +/* Do early setups now in board_init_f() */ +#define CONFIG_BOARD_EARLY_INIT_F 1#endif /* _CONFIG_KM_ARM_H */
Signature · 1 line
1.7.2.3
PATCH 1/1 arm926ejs, suen3: fix relocation issues
Quoted 9 lines
-----Original Message-----
From: Heiko Schocher [mailto:hs at denx.de]
Sent: Monday, October 18, 2010 11:43 AM
To: u-boot at lists.denx.de
Cc: Heiko Schocher; Prafulla Wadaskar
Subject: [PATCH] arm926ejs, suen3: fix relocation issues
...snip...
Quoted 5 lines
include/configs/km_arm.h +0
-0
include/configs/km_arm.h int get_scl (void); · line 189
Quoted 10 lines
include/configs/km_arm.h +4
-2@@ -182,6 +182,8 @@ int get_scl (void);/* additions for new relocation code, must be added to all boards */ #define CONFIG_SYS_SDRAM_BASE 0x00000000 -#define CONFIG_SYS_INIT_SP_ADDR (0x00000000 + 0x1000 - /* Fix this */ \ - CONFIG_SYS_GBL_DATA_SIZE) +/* Kirkwood has 2k of Security SRAM, use it for SP */ +#define CONFIG_SYS_INIT_SP_ADDR 0xC8012000 +/* Do early setups now in board_init_f() */ +#define CONFIG_BOARD_EARLY_INIT_F 1
Do you really need to 1 here ?
Also can you pls confirm that you are getting early console message as pointed by Eric Cooper
http://lists.denx.de/pipermail/u-boot/2010-October/079545.html
Regards..
Prafulla . .
PATCH 1/1 arm926ejs, suen3: fix relocation issues
Helo Prafulla,
Quoted 15 lines · Prafulla Wadaskar
Quoted 7 lines
-----Original Message-----
From: Heiko Schocher [mailto:hs at denx.de]
Sent: Monday, October 18, 2010 11:43 AM
To: u-boot at lists.denx.de
Cc: Heiko Schocher; Prafulla Wadaskar
Subject: [PATCH] arm926ejs, suen3: fix relocation issues...snip...
Quoted 6 lines
include/configs/km_arm.h +0
-0@@ -182,6 +182,8 @@ int get_scl (void);
Quoted 11 lines
include/configs/km_arm.h int get_scl (void); · line 188
Quoted 9 lines
include/configs/km_arm.h +4
-2/* additions for new relocation code, must be added to all boards */ #define CONFIG_SYS_SDRAM_BASE 0x00000000 -#define CONFIG_SYS_INIT_SP_ADDR (0x00000000 + 0x1000 - /* Fix this */ \ - CONFIG_SYS_GBL_DATA_SIZE) +/* Kirkwood has 2k of Security SRAM, use it for SP */ +#define CONFIG_SYS_INIT_SP_ADDR 0xC8012000 +/* Do early setups now in board_init_f() */ +#define CONFIG_BOARD_EARLY_INIT_F 1Do you really need to 1 here ?
No, I fix this in v2.
Quoted 2 lines
Also can you pls confirm that you are getting early console message as pointed by Eric Cooper
http://lists.denx.de/pipermail/u-boot/2010-October/079545.html
Hmm.. don;t know if we can compare this, because the suen3 starts from spi flash ... and I see this messages on the suen3 ... Maybe, Eric (added to cc: ) should also try to do early things (like kirkwood_mpp_conf()) in board_early_init_f() as I on the suen3?
bye,
Heiko
Signature · 2 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
PATCH 1/1 arm926ejs, suen3: fix relocation issues
Quoted 2 lines
Maybe, Eric (added to cc: ) should also try to do early things (like
kirkwood_mpp_conf()) inboard_early_init_f()as I on the suen3?
I will try this and let you know. But the most helpful data point for me would be whether display_banner etc. currently works on a SheevaPlug, which is almost identical to the DockStar.
Signature · 1 line
Eric Cooper e c c @ c m u . e d u
PATCH 1/1 arm926ejs, suen3: fix relocation issues
Quoted 9 lines
-----Original Message-----
From: Eric Cooper [mailto:ecc at cmu.edu]
Sent: Tuesday, October 19, 2010 4:14 PM
To: Heiko Schocher
Cc: Prafulla Wadaskar; u-boot at lists.denx.de
Subject: Re: [PATCH] arm926ejs, suen3: fix relocation issues
Quoted 6 lines
Quoted 2 lines
Maybe, Eric (added to cc: ) should also try to do early things (like
kirkwood_mpp_conf()) inboard_early_init_f()as I on the suen3?I will try this and let you know. But the most helpful data point for me would be whether
display_banneretc. currently works on a SheevaPlug, which is almost identical to the DockStar.
Hi Eric
I checked on Sheevaplug, but sheevaplug has usb-UART interface, that does not help to test this. Since by the time UART is up board is in booted state.
There is anther way to test this, erase native u-boot and check from boot from DRAM, I have not tested this yet.
But I think this must be problem on sheevaplug too ?
Regards..
Prafulla . .
Quoted 4 lines
Signature · 2 lines
-- Eric Cooper e c c @ c m u . e d u
PATCH 1/1 arm926ejs, suen3: fix relocation issues
In reply to Eric CooperQuoted 32 lines
-----Original Message-----
From: Prafulla Wadaskar
Sent: Tuesday, October 19, 2010 4:35 PM
To: 'Eric Cooper'; Heiko Schocher
Cc: u-boot at lists.denx.de
Subject: RE: [PATCH] arm926ejs, suen3: fix relocation issuesQuoted 8 lines
-----Original Message-----
From: Eric Cooper [mailto:ecc at cmu.edu]
Sent: Tuesday, October 19, 2010 4:14 PM
To: Heiko Schocher
Cc: Prafulla Wadaskar; u-boot at lists.denx.de
Subject: Re: [PATCH] arm926ejs, suen3: fix relocation issuesQuoted 1 line
Maybe, Eric (added to cc: ) should also try to do early
things (like
Quoted 3 lines
Quoted 1 line
kirkwood_mpp_conf()) inboard_early_init_f()as I on the suen3?I will try this and let you know. But the most helpful
data point for
Quoted 2 lines
me would be whether
display_banneretc. currently works on a SheevaPlug, which is almost identical to the DockStar.Hi Eric
I checked on Sheevaplug, but sheevaplug has usb-UART interface, that does not help to test this. Since by the time UART is up board is in booted state.
Quoted 4 lines
There is anther way to test this, erase native u-boot and check from boot from DRAM, I have not tested this yet.
But I think this must be problem on sheevaplug too ?
Crosschecked, This problem is on all the Kirkwood boards, I am posting fix up patch for all Marvell boards.
Regards..
Prafulla . .
PATCH v2 1/1 arm926ejs, suen3: fix relocation issues
In reply to Heiko Schocher- use internal 2k security SRAM as RAM for early stack.
- do early inits in board_init_f()
---
changes since v1:
- Add comment from Prafulla Wadaskar, no "1" needed if defining CONFIG_BOARD_EARLY_INIT_F
board/keymile/km_arm/km_arm.c | 24 +++++++++++++++--------- include/configs/km_arm.h | 6 ++++-- 2 files changed, 19 insertions(+), 11 deletions(-)
board/keymile/km_arm/km_arm.c +15 -9
@@ -143,7 +143,7 @@ int misc_init_r(void)return 0 ; } -int board_init (void ) +int board_early_init_f (void ) {u32 tmp;
@@ -160,14 +160,6 @@ int board_init(void)writel (tmp & (~FLASH_GPIO_PIN ) ,KW_GPIO0_BASE +4 );printf ("KM: setting NAND mode\n" ); -/* -* arch number of board -*/ - gd->bd->bi_arch_number =MACH_TYPE_SUEN3 ; - -/* address of boot parameters */ - gd->bd->bi_boot_params =kw_sdram_bar (0 ) +0x100 ; -#if defined(CONFIG_SOFT_I2C )/* init the GPIO for I2C Bitbang driver */ kw_gpio_set_valid (SUEN3_SDA_PIN ,1 );
@@ -179,6 +171,20 @@ int board_init(void)kw_gpio_set_valid (SUEN3_ENV_WP ,38 );kw_gpio_direction_output (SUEN3_ENV_WP ,1 );#endif + +return 0 ; +} + +int board_init (void ) +{ +/* +* arch number of board +*/ + gd->bd->bi_arch_number =MACH_TYPE_SUEN3 ; + +/* address of boot parameters */ + gd->bd->bi_boot_params =kw_sdram_bar (0 ) +0x100 ; +return 0 ; }
include/configs/km_arm.h +4 -2
@@ -182,6 +182,8 @@ int get_scl (void);/* additions for new relocation code, must be added to all boards */ #define CONFIG_SYS_SDRAM_BASE 0x00000000 -#define CONFIG_SYS_INIT_SP_ADDR (0x00000000 + 0x1000 - /* Fix this */ \ -CONFIG_SYS_GBL_DATA_SIZE ) +/* Kirkwood has 2k of Security SRAM, use it for SP */ +#define CONFIG_SYS_INIT_SP_ADDR 0xC8012000 +/* Do early setups now in board_init_f() */ +#define CONFIG_BOARD_EARLY_INIT_F #endif /* _CONFIG_KM_ARM_H */
Signature · 1 line
1.7.2.3
PATCH v2 1/1 arm926ejs, suen3: fix relocation issues
Quoted 15 lines
-----Original Message-----
From: Heiko Schocher [mailto:hs at denx.de]
Sent: Tuesday, October 19, 2010 1:39 PM
To: u-boot at lists.denx.de
Cc: Heiko Schocher; Prafulla Wadaskar
Subject: [PATCH v2] arm926ejs, suen3: fix relocation issues- use internal 2k security SRAM as RAM for early stack.
- do early inits inboard_init_f()Signed-off-by Heiko Schocher <[email protected]>Cc Prafulla Wadaskar <[email protected]>
Quoted 8 lines
---
changes since v1:
- Add comment from Prafulla Wadaskar, no "1" needed if definingCONFIG_BOARD_EARLY_INIT_Fboard/keymile/km_arm/km_arm.c | 24 +++++++++++++++--------- include/configs/km_arm.h | 6 ++++-- 2 files changed, 19 insertions(+), 11 deletions(-)
Ack
Regards..
Prafulla . .
PATCH v2 1/1 arm926ejs, suen3: fix relocation issues
In reply to Heiko SchocherQuoted 15 lines
-----Original Message-----
From: Heiko Schocher [mailto:hs at denx.de]
Sent: Tuesday, October 19, 2010 1:39 PM
To: u-boot at lists.denx.de
Cc: Heiko Schocher; Prafulla Wadaskar
Subject: [PATCH v2] arm926ejs, suen3: fix relocation issues- use internal 2k security SRAM as RAM for early stack.
- do early inits inboard_init_f()Signed-off-by Heiko Schocher <[email protected]>Cc Prafulla Wadaskar <[email protected]>
Quoted 9 lines
---
changes since v1:
- Add comment from Prafulla Wadaskar, no "1" needed if definingCONFIG_BOARD_EARLY_INIT_Fboard/keymile/km_arm/km_arm.c | 24 +++++++++++++++--------- include/configs/km_arm.h | 6 ++++-- 2 files changed, 19 insertions(+), 11 deletions(-)
Applied to u-boot-marvell.git master branch
Regards..
Prafulla . .