projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ppc/85xx: Move code around to prep for NAND_SPL
[oweals/u-boot.git]
/
lib_i386
/
board.c
diff --git
a/lib_i386/board.c
b/lib_i386/board.c
index e18dfa5bc4483dbf4092d7806b4a75ed5b992400..0262b5e2cb8d77a220d6503b17126c06ac51b94f 100644
(file)
--- a/
lib_i386/board.c
+++ b/
lib_i386/board.c
@@
-31,7
+31,7
@@
#include <common.h>
#include <watchdog.h>
#include <command.h>
#include <common.h>
#include <watchdog.h>
#include <command.h>
-#include <
devices
.h>
+#include <
stdio_dev
.h>
#include <timestamp.h>
#include <version.h>
#include <malloc.h>
#include <timestamp.h>
#include <version.h>
#include <malloc.h>
@@
-73,14
+73,6
@@
ulong i386boot_bios_size = (ulong)&_i386boot_bios_size; /* size of BIOS
const char version_string[] =
U_BOOT_VERSION" (" U_BOOT_DATE " - " U_BOOT_TIME ")";
const char version_string[] =
U_BOOT_VERSION" (" U_BOOT_DATE " - " U_BOOT_TIME ")";
-
-/*
- * Begin and End of memory area for malloc(), and current "brk"
- */
-static ulong mem_malloc_start = 0;
-static ulong mem_malloc_end = 0;
-static ulong mem_malloc_brk = 0;
-
static int mem_malloc_init(void)
{
/* start malloc area right after the stack */
static int mem_malloc_init(void)
{
/* start malloc area right after the stack */
@@
-96,19
+88,6
@@
static int mem_malloc_init(void)
return 0;
}
return 0;
}
-void *sbrk (ptrdiff_t increment)
-{
- ulong old = mem_malloc_brk;
- ulong new = old + increment;
-
- if ((new < mem_malloc_start) || (new > mem_malloc_end)) {
- return (NULL);
- }
- mem_malloc_brk = new;
-
- return ((void *) old);
-}
-
/************************************************************************
* Init Utilities *
************************************************************************
/************************************************************************
* Init Utilities *
************************************************************************
@@
-299,7
+278,7
@@
void start_i386boot (void)
show_boot_progress(0x27);
show_boot_progress(0x27);
-
devices
_init ();
+
stdio
_init ();
jumptable_init ();
jumptable_init ();