diff options
| -rw-r--r-- | arch/sandbox/cpu/start.c | 7 | ||||
| -rw-r--r-- | common/board_f.c | 18 |
2 files changed, 7 insertions, 18 deletions
diff --git a/arch/sandbox/cpu/start.c b/arch/sandbox/cpu/start.c index 6e4ec017cc..dc58fef90c 100644 --- a/arch/sandbox/cpu/start.c +++ b/arch/sandbox/cpu/start.c @@ -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); diff --git a/common/board_f.c b/common/board_f.c index c4eb3ae65e..0b2a325cef 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -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, |