board_f: sandbox: Move setup_ram_buf() to private code

There is no need to have this call in the generic init sequence and no
other architecture has needed it in the time it has been there. Move it
into sandbox's private code.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Stefan Roese <sr@denx.de>
Reviewed-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Simon Glass 2017-03-28 10:27:16 -06:00 committed by Tom Rini
parent 70cc0c34b6
commit bb967240bb
2 changed files with 7 additions and 18 deletions

View File

@ -275,6 +275,12 @@ int board_run_command(const char *cmdline)
return 1;
}
static void setup_ram_buf(struct sandbox_state *state)
{
gd->arch.ram_buf = state->ram_buf;
gd->ram_size = state->ram_size;
}
int main(int argc, char *argv[])
{
struct sandbox_state *state;
@ -302,6 +308,7 @@ int main(int argc, char *argv[])
#ifdef CONFIG_SYS_MALLOC_F_LEN
gd->malloc_base = CONFIG_MALLOC_F_ADDR;
#endif
setup_ram_buf(state);
/* Do pre- and post-relocation init */
board_init_f(0);

View File

@ -58,9 +58,6 @@
#if defined(CONFIG_X86) || defined(CONFIG_ARC) || defined(CONFIG_XTENSA)
#include <asm/relocate.h>
#endif
#ifdef CONFIG_SANDBOX
#include <asm/state.h>
#endif
#include <dm/root.h>
#include <linux/compiler.h>
@ -294,18 +291,6 @@ __weak int mach_cpu_init(void)
return 0;
}
#ifdef CONFIG_SANDBOX
static int setup_ram_buf(void)
{
struct sandbox_state *state = state_get_current();
gd->arch.ram_buf = state->ram_buf;
gd->ram_size = state->ram_size;
return 0;
}
#endif
/* Get the top of usable RAM */
__weak ulong board_get_usable_ram_top(ulong total_size)
{
@ -823,9 +808,6 @@ __weak int arch_cpu_init_dm(void)
}
static const init_fnc_t init_sequence_f[] = {
#ifdef CONFIG_SANDBOX
setup_ram_buf,
#endif
setup_mon_len,
#ifdef CONFIG_OF_CONTROL
fdtdec_setup,