diff options
| author | Simon Glass <sjg@chromium.org> | 2013-04-26 02:53:43 +0000 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-05-01 11:17:21 -0400 |
| commit | a733b06b69d2cb058c4363952bc0793b1f514305 (patch) | |
| tree | fad133d79d212e9686b69bef9a0f6dc9b8e1196f /common/board_r.c | |
| parent | 781adb5710694601e8ceb01256becea142c5ba6c (diff) | |
| download | olio-uboot-2014.01-a733b06b69d2cb058c4363952bc0793b1f514305.tar.xz olio-uboot-2014.01-a733b06b69d2cb058c4363952bc0793b1f514305.zip | |
sandbox: Switch over to generic board
Add generic board support for sandbox. and remove the old board init code.
Select CONFIG_SYS_GENERIC_BOARD for sandbox now that this is supported.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'common/board_r.c')
| -rw-r--r-- | common/board_r.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/common/board_r.c b/common/board_r.c index 2b17fa6cf..f801e4110 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -136,7 +136,7 @@ static int initr_reloc_global_data(void) { #ifdef CONFIG_SYS_SYM_OFFSETS monitor_flash_len = _end_ofs; -#else +#elif !defined(CONFIG_SANDBOX) monitor_flash_len = (ulong)&__init_end - gd->dest_addr; #endif #if defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx) @@ -264,7 +264,8 @@ static int initr_malloc(void) /* The malloc area is immediately below the monitor copy in DRAM */ malloc_start = gd->dest_addr - TOTAL_MALLOC_LEN; - mem_malloc_init(malloc_start, TOTAL_MALLOC_LEN); + mem_malloc_init((ulong)map_sysmem(malloc_start, TOTAL_MALLOC_LEN), + TOTAL_MALLOC_LEN); return 0; } @@ -691,6 +692,9 @@ static int initr_modem(void) static int run_main_loop(void) { +#ifdef CONFIG_SANDBOX + sandbox_main_loop_init(); +#endif /* main_loop() can return to retry autoboot, if so just run it again */ for (;;) main_loop(); |