diff options
| author | Minkyu Kang <mk7.kang@samsung.com> | 2010-11-16 09:55:11 +0900 |
|---|---|---|
| committer | Minkyu Kang <mk7.kang@samsung.com> | 2010-11-16 09:55:11 +0900 |
| commit | 1032d97496f6d534bf0030a5779ff1cb38cc9ebf (patch) | |
| tree | 3713c814a7453024eceb097c67532072950e2f2e /arch/sh/lib/board.c | |
| parent | 37a3bda0c9c8a2ffbf7e2a9e121177a3385a0626 (diff) | |
| parent | 227b72515546fca535dbd3274f6d875d97f494fe (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
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 a302fc2e65..fe53ab4de9 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 */ |