minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-19 00:44:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

arm926ejs, suen3: fix relocation issues

Browse Source 
- use internal 2k security SRAM as RAM for early stack.
- do early inits in board_init_f()

Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Prafulla Wadaskar <prafulla@marvell.com>
This commit is contained in:
Heiko Schocher 2010-10-20 19:33:26 +05:30 committed by prafulla_wadaskar
parent 3ed16071b0
commit 6b0ccc3b45
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
board/keymile/km_arm/km_arm.c
View File

@ -143,7 +143,7 @@ int misc_init_r(void)
return 0; return 0;
} }
int board_init(void) int board_early_init_f(void)
{ {
u32 tmp; u32 tmp;
@ -160,14 +160,6 @@ int board_init(void)
writel(tmp & (~FLASH_GPIO_PIN) , KW_GPIO0_BASE + 4); writel(tmp & (~FLASH_GPIO_PIN) , KW_GPIO0_BASE + 4);
printf("KM: setting NAND mode\n"); 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) #if defined(CONFIG_SOFT_I2C)
/* init the GPIO for I2C Bitbang driver */ /* init the GPIO for I2C Bitbang driver */
kw_gpio_set_valid(SUEN3_SDA_PIN, 1); 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_set_valid(SUEN3_ENV_WP, 38);
kw_gpio_direction_output(SUEN3_ENV_WP, 1); kw_gpio_direction_output(SUEN3_ENV_WP, 1);
#endif #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; return 0;
} }

6
include/configs/km_arm.h
View File

@ -182,6 +182,8 @@ int get_scl (void);
/* additions for new relocation code, must be added to all boards */ /* additions for new relocation code, must be added to all boards */
#define CONFIG_SYS_SDRAM_BASE 0x00000000 #define CONFIG_SYS_SDRAM_BASE 0x00000000
#define CONFIG_SYS_INIT_SP_ADDR (0x00000000 + 0x1000 - /* Fix this */ \ /* Kirkwood has 2k of Security SRAM, use it for SP */
CONFIG_SYS_GBL_DATA_SIZE) #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 */ #endif /* _CONFIG_KM_ARM_H */