diff options
| author | Gabe Black <gabeblack@chromium.org> | 2011-12-05 12:09:26 +0000 |
|---|---|---|
| committer | Graeme Russ <graeme.russ@gmail.com> | 2011-12-19 13:26:16 +1100 |
| commit | 69370d144a9e8133461f1662131fbf97ad121165 (patch) | |
| tree | bf42baa8da26427c6cf23a8b92ff954dd0715f0a /arch/x86/lib/bootm.c | |
| parent | f08fa7a2018495c6f2a5eaba5f6d8fdcbc67e6c6 (diff) | |
x86: Refactor the zboot innards so they can be reused with a vboot image
If vboot successfully verifies a kernel, it will leave it in place and
basically ready to boot. The zeropage table which is part of the x86 boot
protocol is at the end of the kernel, though, instead of the beginning, and
because the image is already in place there's no need to copy it around.
This change refactors the code which implements the zboot command so that
the configuration of the zeropage table and loading the pieces of the
kernel into memory are done separately. Also, because the command line goes
before the zeropage table in vboot which is somewhat incompatible with the
normal protocol, where to put the command line is a now a parameter instead
of being hard coded.
Signed-off-by: Gabe Black <gabeblack@chromium.org>
Diffstat (limited to 'arch/x86/lib/bootm.c')
| -rw-r--r-- | arch/x86/lib/bootm.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/arch/x86/lib/bootm.c b/arch/x86/lib/bootm.c index ba3875b1bc..83caf6bdbd 100644 --- a/arch/x86/lib/bootm.c +++ b/arch/x86/lib/bootm.c @@ -28,17 +28,20 @@ #include <command.h> #include <image.h> #include <u-boot/zlib.h> +#include <asm/bootparam.h> #include <asm/byteorder.h> #include <asm/zimage.h> +#define COMMAND_LINE_OFFSET 0x9000 + /*cmd_boot.c*/ int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *images) { - void *base_ptr = NULL; - ulong os_data, os_len; - image_header_t *hdr; - void *load_address; + struct boot_params *base_ptr = NULL; + ulong os_data, os_len; + image_header_t *hdr; + void *load_address; #if defined(CONFIG_FIT) const void *data; @@ -75,15 +78,19 @@ int do_bootm_linux(int flag, int argc, char * const argv[], } #ifdef CONFIG_CMD_ZBOOT - base_ptr = load_zimage((void *)os_data, os_len, - images->rd_start, images->rd_end - images->rd_start, - 0, &load_address); + base_ptr = load_zimage((void *)os_data, os_len, &load_address); #endif if (NULL == base_ptr) { printf("## Kernel loading failed ...\n"); goto error; + } + if (setup_zimage(base_ptr, (char *)base_ptr + COMMAND_LINE_OFFSET, + 0, images->rd_start, + images->rd_end - images->rd_start)) { + printf("## Setting up boot parameters failed ...\n"); + goto error; } #ifdef DEBUG |