ppc/85xx: Disable all async interrupt sources when we boot

[u-boot] / lib_sh / board.c

diff --git a/lib_sh/board.c b/lib_sh/board.c
index 183110fe30b42b15d89c71a41bc5376b121d4206..5d61f0d74fe1b7f1f425468d6158c7bc97a16448 100644 (file)
--- a/lib_sh/board.c
+++ b/lib_sh/board.c
@@ -21,7 +21,7 @@
 #include <common.h>
 #include <command.h>
 #include <malloc.h>
-#include <devices.h>
+#include <stdio_dev.h>
 #include <timestamp.h>
 #include <version.h>
 #include <watchdog.h>
@@ -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();
@@ -150,7 +123,7 @@ init_fnc_t *init_sequence[] =
        sh_flash_init,  /* Flash memory(NOR) init*/
        INIT_FUNC_NAND_INIT/* Flash memory (NAND) init */
        INIT_FUNC_PCI_INIT      /* PCI init */
-       devices_init,
+       stdio_init,
        console_init_r,
        interrupt_init,
 #ifdef BOARD_LATE_INIT