X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=lib_sh%2Fboard.c;h=5d61f0d74fe1b7f1f425468d6158c7bc97a16448;hb=f8d7b56e003fe19f37d4e9e326df9e9024a052b0;hp=829455d8b12fa031b0801b64aa2b6443529877fe;hpb=52cb4d4fb3487313f5a72ea740f527a4aefaa365;p=u-boot diff --git a/lib_sh/board.c b/lib_sh/board.c index 829455d8b1..5d61f0d74f 100644 --- a/lib_sh/board.c +++ b/lib_sh/board.c @@ -38,34 +38,6 @@ const char version_string[] = U_BOOT_VERSION" ("U_BOOT_DATE" - "U_BOOT_TIME")"; unsigned long monitor_flash_len = CONFIG_SYS_MONITOR_LEN; -static unsigned long mem_malloc_start; -static unsigned long mem_malloc_end; -static unsigned long mem_malloc_brk; - -static void mem_malloc_init(void) -{ - - mem_malloc_start = (TEXT_BASE - CONFIG_SYS_GBL_DATA_SIZE - CONFIG_SYS_MALLOC_LEN); - mem_malloc_end = (mem_malloc_start + CONFIG_SYS_MALLOC_LEN - 16); - mem_malloc_brk = mem_malloc_start; - memset((void *) mem_malloc_start, 0, - (mem_malloc_end - mem_malloc_start)); -} - -void *sbrk(ptrdiff_t increment) -{ - unsigned long old = mem_malloc_brk; - unsigned long new = old + increment; - - if ((new < mem_malloc_start) || - (new > mem_malloc_end)) { - return NULL; - } - - mem_malloc_brk = new; - return (void *) old; -} - static int sh_flash_init(void) { DECLARE_GLOBAL_DATA_PTR; @@ -114,7 +86,8 @@ static int sh_pci_init(void) static int sh_mem_env_init(void) { - mem_malloc_init(); + mem_malloc_init(TEXT_BASE - CONFIG_SYS_GBL_DATA_SIZE - + CONFIG_SYS_MALLOC_LEN, CONFIG_SYS_MALLOC_LEN - 16); malloc_bin_reloc(); env_relocate(); jumptable_init();