diff options
| author | Simon Glass <sjg@chromium.org> | 2017-03-28 10:27:28 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-04-05 13:55:07 -0400 |
| commit | 689697785e04aefd08b6efdc4e47a737819da173 (patch) | |
| tree | fe4090eda1086a2e569f9be167c3d112bec026d0 | |
| parent | d891ab95c2086503f1bfca4c34af35cb64dfab1f (diff) | |
board_f: sandbox: Move sandbox_early_getopt_check() into misc_init_f()
We don't need a special hook for sandbox as one of the later ones will do
just as well. We can print error messages about bad options after we
print the banner. In fact, it seems better.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Stefan Roese <sr@denx.de>
| -rw-r--r-- | arch/sandbox/cpu/start.c | 5 | ||||
| -rw-r--r-- | common/board_f.c | 3 | ||||
| -rw-r--r-- | include/configs/sandbox.h | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/arch/sandbox/cpu/start.c b/arch/sandbox/cpu/start.c index dc58fef90c..f605d4d61e 100644 --- a/arch/sandbox/cpu/start.c +++ b/arch/sandbox/cpu/start.c @@ -66,6 +66,11 @@ int sandbox_early_getopt_check(void) os_exit(0); } +int misc_init_f(void) +{ + return sandbox_early_getopt_check(); +} + static int sandbox_cmdline_cb_help(struct sandbox_state *state, const char *arg) { /* just flag to sandbox_early_getopt_check to show usage */ diff --git a/common/board_f.c b/common/board_f.c index 6995f741a6..f1c97fc2a3 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -840,9 +840,6 @@ static const init_fnc_t init_sequence_f[] = { init_baud_rate, /* initialze baudrate settings */ serial_init, /* serial communications setup */ console_init_f, /* stage 1 init of console */ -#ifdef CONFIG_SANDBOX - sandbox_early_getopt_check, -#endif display_options, /* say that we are here */ display_text_info, /* show debugging info if required */ #if defined(CONFIG_MPC8260) diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index 6b3cd18046..7de8765dc8 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -199,4 +199,6 @@ #define CONFIG_SYS_SYSTEMACE_WIDTH 16 #define CONFIG_SYS_SYSTEMACE_BASE 0 +#define CONFIG_MISC_INIT_F + #endif |