leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sandbox' of git://git.denx.de/u-boot-x86

Browse Source
This commit is contained in:
Tom Rini
2015-02-16 08:37:22 -05:00
parent eca99c0256 e50ab22984
commit 9577639185
7 changed files with 43 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
arch/sandbox/config.mk
View File

@@ -5,10 +5,16 @@ PLATFORM_CPPFLAGS += -D__SANDBOX__ -U_FORTIFY_SOURCE
PLATFORM_CPPFLAGS += -DCONFIG_ARCH_MAP_SYSMEM -DCONFIG_SYS_GENERIC_BOARD
PLATFORM_LIBS += -lrt
# Define this to avoid linking with SDL, which requires SDL libraries
# This can solve 'sdl-config: Command not found' errors
ifneq ($(NO_SDL),)
PLATFORM_CPPFLAGS += -DSANDBOX_NO_SDL
else
ifdef CONFIG_SANDBOX_SDL
PLATFORM_LIBS += $(shell sdl-config --libs)
PLATFORM_CPPFLAGS += $(shell sdl-config --cflags)
endif
endif
# Support generic board on sandbox
__HAVE_ARCH_GENERIC_BOARD := y
@@ -18,9 +24,3 @@ cmd_u-boot__ = $(CC) -o $@ -T u-boot.lds \
$(PLATFORM_LIBS) -Wl,-Map -Wl,u-boot.map
CONFIG_ARCH_DEVICE_TREE := sandbox
# Define this to avoid linking with SDL, which requires SDL libraries
# This can solve 'sdl-config: Command not found' errors
ifneq ($(NO_SDL),)
PLATFORM_CPPFLAGS += -DSANDBOX_NO_SDL
endif

6
arch/sandbox/cpu/start.c
View File

@@ -78,11 +78,13 @@ int sandbox_main_loop_init(void)
/* Execute command if required */
if (state->cmd) {
int retval;
cli_init();
run_command_list(state->cmd, -1, 0);
retval = run_command_list(state->cmd, -1, 0);
if (!state->interactive)
os_exit(state->exit_type);
os_exit(retval);
}
return 0;

5
arch/sandbox/cpu/state.c
View File

@@ -13,11 +13,6 @@
static struct sandbox_state main_state;
static struct sandbox_state *state; /* Pointer to current state record */
void state_record_exit(enum exit_type_id exit_type)
{
state->exit_type = exit_type;
}
static int state_ensure_space(int extra_size)
{
void *blob = state->state_fdt;

15
arch/sandbox/include/asm/state.h
View File

@@ -10,13 +10,6 @@
#include <stdbool.h>
#include <linux/stringify.h>
/* How we exited U-Boot */
enum exit_type_id {
STATE_EXIT_NORMAL,
STATE_EXIT_COLD_REBOOT,
STATE_EXIT_POWER_OFF,
};
/**
* Selects the behavior of the serial terminal.
*
@@ -50,7 +43,6 @@ struct sandbox_state {
const char *cmd; /* Command to execute */
bool interactive; /* Enable cmdline after execute */
const char *fdt_fname; /* Filename of FDT binary */
enum exit_type_id exit_type; /* How we exited U-Boot */
const char *parse_err; /* Error to report from parsing */
int argc; /* Program arguments */
char **argv; /* Command line arguments */
@@ -138,13 +130,6 @@ struct sandbox_state_io {
.compat = _compat, \
}
/**
* Record the exit type to be reported by the test program.
*
* @param exit_type Exit type to record
*/
void state_record_exit(enum exit_type_id exit_type);
/**
* Gets a pointer to the current state.
*