projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-arm
[platform/kernel/u-boot.git]
/
common
/
board_f.c
diff --git
a/common/board_f.c
b/common/board_f.c
index
d918e4b
..
aa70c3e
100644
(file)
--- a/
common/board_f.c
+++ b/
common/board_f.c
@@
-347,9
+347,10
@@
done:
#ifdef CONFIG_SANDBOX
static int setup_ram_buf(void)
{
#ifdef CONFIG_SANDBOX
static int setup_ram_buf(void)
{
- gd->arch.ram_buf = os_malloc(CONFIG_SYS_SDRAM_SIZE);
- assert(gd->arch.ram_buf);
- gd->ram_size = CONFIG_SYS_SDRAM_SIZE;
+ struct sandbox_state *state = state_get_current();
+
+ gd->arch.ram_buf = state->ram_buf;
+ gd->ram_size = state->ram_size;
return 0;
}
return 0;
}
@@
-772,7
+773,7
@@
static int setup_reloc(void)
}
/* ARM calls relocate_code from its crt0.S */
}
/* ARM calls relocate_code from its crt0.S */
-#if !defined(CONFIG_ARM)
+#if !defined(CONFIG_ARM)
&& !defined(CONFIG_SANDBOX)
static int jump_to_copy(void)
{
static int jump_to_copy(void)
{
@@
-792,8
+793,6
@@
static int jump_to_copy(void)
* (CPU cache)
*/
board_init_f_r_trampoline(gd->start_addr_sp);
* (CPU cache)
*/
board_init_f_r_trampoline(gd->start_addr_sp);
-#elif defined(CONFIG_SANDBOX)
- board_init_r(gd->new_gd, 0);
#else
relocate_code(gd->start_addr_sp, gd->new_gd, gd->relocaddr);
#endif
#else
relocate_code(gd->start_addr_sp, gd->new_gd, gd->relocaddr);
#endif
@@
-990,7
+989,7
@@
static init_fnc_t init_sequence_f[] = {
INIT_FUNC_WATCHDOG_RESET
reloc_fdt,
setup_reloc,
INIT_FUNC_WATCHDOG_RESET
reloc_fdt,
setup_reloc,
-#if
ndef CONFIG_ARM
+#if
!defined(CONFIG_ARM) && !defined(CONFIG_SANDBOX)
jump_to_copy,
#endif
NULL,
jump_to_copy,
#endif
NULL,
@@
-1016,11
+1015,12
@@
void board_init_f(ulong boot_flags)
#endif
gd->flags = boot_flags;
#endif
gd->flags = boot_flags;
+ gd->have_console = 0;
if (initcall_run_list(init_sequence_f))
hang();
if (initcall_run_list(init_sequence_f))
hang();
-#if
ndef CONFIG_ARM
+#if
!defined(CONFIG_ARM) && !defined(CONFIG_SANDBOX)
/* NOTREACHED - jump_to_copy() does not return */
hang();
#endif
/* NOTREACHED - jump_to_copy() does not return */
hang();
#endif