mirror of
https://source.denx.de/u-boot/u-boot.git
synced 2026-06-13 15:03:58 +03:00
x86: zboot: Separate logic functions from commands
Move zboot_start() and zboot_info() in with the other logic functions. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
@@ -10,26 +10,6 @@
|
||||
#include <vsprintf.h>
|
||||
#include <asm/zimage.h>
|
||||
|
||||
static int zboot_start(ulong bzimage_addr, ulong bzimage_size,
|
||||
ulong initrd_addr, ulong initrd_size, ulong base_addr,
|
||||
const char *cmdline)
|
||||
{
|
||||
memset(&state, '\0', sizeof(state));
|
||||
|
||||
state.bzimage_size = bzimage_size;
|
||||
state.initrd_addr = initrd_addr;
|
||||
state.initrd_size = initrd_size;
|
||||
if (base_addr) {
|
||||
state.base_ptr = map_sysmem(base_addr, 0);
|
||||
state.load_address = bzimage_addr;
|
||||
} else {
|
||||
state.bzimage_addr = bzimage_addr;
|
||||
}
|
||||
state.cmdline = cmdline;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int do_zboot_start(struct cmd_tbl *cmdtp, int flag, int argc,
|
||||
char *const argv[])
|
||||
{
|
||||
@@ -47,8 +27,10 @@ static int do_zboot_start(struct cmd_tbl *cmdtp, int flag, int argc,
|
||||
base_addr = argc > 5 ? hextoul(argv[5], NULL) : 0;
|
||||
cmdline = argc > 6 ? env_get(argv[6]) : NULL;
|
||||
|
||||
return zboot_start(bzimage_addr, bzimage_size, initrd_addr, initrd_size,
|
||||
base_addr, cmdline);
|
||||
zboot_start(bzimage_addr, bzimage_size, initrd_addr, initrd_size,
|
||||
base_addr, cmdline);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int do_zboot_load(struct cmd_tbl *cmdtp, int flag, int argc,
|
||||
@@ -81,12 +63,6 @@ static int do_zboot_setup(struct cmd_tbl *cmdtp, int flag, int argc,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void zboot_info(void)
|
||||
{
|
||||
printf("Kernel loaded at %08lx, setup_base=%p\n",
|
||||
state.load_address, state.base_ptr);
|
||||
}
|
||||
|
||||
static int do_zboot_info(struct cmd_tbl *cmdtp, int flag, int argc,
|
||||
char *const argv[])
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user