diff options
| author | H. Nikolaus Schaller <hns@goldelico.com> | 2010-11-03 21:57:05 +0100 |
|---|---|---|
| committer | H. Nikolaus Schaller <hns@goldelico.com> | 2010-11-03 21:57:05 +0100 |
| commit | 72df8fcb44ffe40f0a1d8226977f6ec3d9019948 (patch) | |
| tree | fbc97e38a14b78807ce418b07cee6dc71d11da68 /arch/sh/lib/board.c | |
| parent | e5aa319fe00b28dd9c915e03adbaf7ed9bb5c323 (diff) | |
| parent | 0c0892be0d93a5a892b93739c5eb3bf692fed4ff (diff) | |
| download | bootable_bootloader_goldelico_gta04-72df8fcb44ffe40f0a1d8226977f6ec3d9019948.zip bootable_bootloader_goldelico_gta04-72df8fcb44ffe40f0a1d8226977f6ec3d9019948.tar.gz bootable_bootloader_goldelico_gta04-72df8fcb44ffe40f0a1d8226977f6ec3d9019948.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot into gta04e
Diffstat (limited to 'arch/sh/lib/board.c')
| -rw-r--r-- | arch/sh/lib/board.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/lib/board.c b/arch/sh/lib/board.c index a302fc2..fe53ab4 100644 --- a/arch/sh/lib/board.c +++ b/arch/sh/lib/board.c @@ -89,7 +89,7 @@ static int sh_pci_init(void) static int sh_mem_env_init(void) { - mem_malloc_init(CONFIG_SYS_TEXT_BASE - CONFIG_SYS_GBL_DATA_SIZE - + mem_malloc_init(CONFIG_SYS_TEXT_BASE - GENERATED_GBL_DATA_SIZE - CONFIG_SYS_MALLOC_LEN, CONFIG_SYS_MALLOC_LEN - 16); env_relocate(); jumptable_init(); @@ -144,7 +144,7 @@ void sh_generic_init(void) bd_t *bd; init_fnc_t **init_fnc_ptr; - memset(gd, 0, CONFIG_SYS_GBL_DATA_SIZE); + memset(gd, 0, GENERATED_GBL_DATA_SIZE); gd->flags |= GD_FLG_RELOC; /* tell others: relocation done */ |