minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-10 12:39:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

sandbox: Add improved RAM simulation

Browse Source 
Using mmap to allocate memory from the OS for RAM simulation we can use
u-boot own malloc implementation.

Tested-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Matthias Weisser <weisserm@arcor.de>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Matthias Weisser 2011-11-05 11:40:34 +01:00 committed by Mike Frysinger
parent c90a4dd79c
commit 21899b1085
4 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/sandbox/cpu/os.c
View File

@ -25,6 +25,7 @@
#include <unistd.h> #include <unistd.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/mman.h>
#include <os.h> #include <os.h>
@ -87,3 +88,9 @@ void os_tty_raw(int fd)
atexit(os_fd_restore); atexit(os_fd_restore);
} }
void *os_malloc(size_t length)
{
return mmap(NULL, length, PROT_READ | PROT_WRITE,
MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
}

17
arch/sandbox/lib/board.c
View File

@ -45,8 +45,12 @@
#include <version.h> #include <version.h>
#include <serial.h> #include <serial.h>
#include <os.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
static gd_t gd_mem;
/************************************************************************ /************************************************************************
* Init Utilities * * Init Utilities *
************************************************************************ ************************************************************************
@ -147,7 +151,7 @@ void board_init_f(ulong bootflag)
uchar *mem; uchar *mem;
unsigned long addr_sp, addr, size; unsigned long addr_sp, addr, size;
gd = malloc(sizeof(gd_t)); gd = &gd_mem;
assert(gd); assert(gd);
memset((void *)gd, 0, sizeof(gd_t)); memset((void *)gd, 0, sizeof(gd_t));
@ -158,7 +162,8 @@ void board_init_f(ulong bootflag)
} }
size = CONFIG_SYS_SDRAM_SIZE; size = CONFIG_SYS_SDRAM_SIZE;
mem = malloc(size); mem = os_malloc(CONFIG_SYS_SDRAM_SIZE);
assert(mem); assert(mem);
gd->ram_buf = mem; gd->ram_buf = mem;
addr = (ulong)(mem + size); addr = (ulong)(mem + size);
@ -214,11 +219,9 @@ void board_init_r(gd_t *id, ulong dest_addr)
post_output_backlog(); post_output_backlog();
#endif #endif
#if 0 /* Sandbox uses system malloc for now */ /* The Malloc area is at the top of simulated DRAM */
/* The Malloc area is immediately below the monitor copy in DRAM */ mem_malloc_init((ulong)gd->ram_buf + gd->ram_size - TOTAL_MALLOC_LEN,
malloc_start = dest_addr - TOTAL_MALLOC_LEN; TOTAL_MALLOC_LEN);
mem_malloc_init(malloc_start, TOTAL_MALLOC_LEN);
#endif
/* initialize environment */ /* initialize environment */
env_relocate(); env_relocate();

3
common/Makefile
View File

@ -29,9 +29,6 @@ LIB = $(obj)libcommon.o
ifndef CONFIG_SPL_BUILD ifndef CONFIG_SPL_BUILD
COBJS-y += main.o COBJS-y += main.o
COBJS-y += command.o COBJS-y += command.o
ifndef CONFIG_SANDBOX
COBJS-y += dlmalloc.o
endif
COBJS-y += exports.o COBJS-y += exports.o
COBJS-$(CONFIG_SYS_HUSH_PARSER) += hush.o COBJS-$(CONFIG_SYS_HUSH_PARSER) += hush.o
COBJS-y += image.o COBJS-y += image.o

8
include/os.h
View File

@ -76,3 +76,11 @@ void os_exit(int exit_code);
* Put tty into raw mode to mimic serial console better * Put tty into raw mode to mimic serial console better
*/ */
void os_tty_raw(int fd); void os_tty_raw(int fd);
/**
* Acquires some memory from the underlying os.
*
* \param length Number of bytes to be allocated
* \return Pointer to length bytes or NULL on error
*/
void *os_malloc(size_t length);