diff options
| author | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2015-04-13 22:54:20 +0200 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2015-04-19 14:45:57 -0600 |
| commit | dd2d29a1e1edb37fbaf2905ec6c1db50f6e661c0 (patch) | |
| tree | 51c9f390847f379c13e7b6c5ca794aac08903ec7 | |
| parent | 85300a9a9dfb364ab1a5f94e6d3f9e558a193be1 (diff) | |
| download | talos-obmc-uboot-dd2d29a1e1edb37fbaf2905ec6c1db50f6e661c0.tar.gz talos-obmc-uboot-dd2d29a1e1edb37fbaf2905ec6c1db50f6e661c0.zip | |
sandbox: Split bootm code out into lib/bootm
Follow the convention of other architectures and move the platform
specific linux bootm code into sandbox/lib/bootm.c.
Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Acked-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | arch/sandbox/cpu/cpu.c | 12 | ||||
| -rw-r--r-- | arch/sandbox/lib/Makefile | 1 | ||||
| -rw-r--r-- | arch/sandbox/lib/bootm.c | 21 |
3 files changed, 22 insertions, 12 deletions
diff --git a/arch/sandbox/cpu/cpu.c b/arch/sandbox/cpu/cpu.c index 007ae86034..f0dafedc25 100644 --- a/arch/sandbox/cpu/cpu.c +++ b/arch/sandbox/cpu/cpu.c @@ -49,18 +49,6 @@ unsigned long __attribute__((no_instrument_function)) timer_get_us(void) return os_get_nsec() / 1000; } -int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images) -{ - if (flag & (BOOTM_STATE_OS_GO | BOOTM_STATE_OS_FAKE_GO)) { - bootstage_mark(BOOTSTAGE_ID_RUN_OS); - printf("## Transferring control to Linux (at address %08lx)...\n", - images->ep); - reset_cpu(0); - } - - return 0; -} - int cleanup_before_linux(void) { return 0; diff --git a/arch/sandbox/lib/Makefile b/arch/sandbox/lib/Makefile index 75b135cfc0..96761e27f7 100644 --- a/arch/sandbox/lib/Makefile +++ b/arch/sandbox/lib/Makefile @@ -9,3 +9,4 @@ obj-y += interrupts.o obj-$(CONFIG_PCI) += pci_io.o +obj-$(CONFIG_CMD_BOOTM) += bootm.o diff --git a/arch/sandbox/lib/bootm.c b/arch/sandbox/lib/bootm.c new file mode 100644 index 0000000000..8ddf4ef30d --- /dev/null +++ b/arch/sandbox/lib/bootm.c @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2011 The Chromium OS Authors. + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <common.h> +#include <asm/io.h> + +DECLARE_GLOBAL_DATA_PTR; + +int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images) +{ + if (flag & (BOOTM_STATE_OS_GO | BOOTM_STATE_OS_FAKE_GO)) { + bootstage_mark(BOOTSTAGE_ID_RUN_OS); + printf("## Transferring control to Linux (at address %08lx)...\n", + images->ep); + reset_cpu(0); + } + + return 0; +} |
