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

x86: zboot: Drop intermediate zboot_setup() function

Browse Source 
Move error checking into the caller so that do_zboot_setup() can call
zboot_setup() directly.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2023-12-03 17:29:32 -07:00
committed by Tom Rini
parent db0c6f47c3
commit cb19931ee5
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cmd/x86/zboot.c
View File

@@ -74,11 +74,10 @@ static int do_zboot_load(struct cmd_tbl *cmdtp, int flag, int argc,
return 0;
}
static int _zboot_setup(void)
static int do_zboot_setup(struct cmd_tbl *cmdtp, int flag, int argc,
char *const argv[])
{
struct boot_params *base_ptr = state.base_ptr;
if (!base_ptr) {
if (!state.base_ptr) {
printf("base is not set: use 'zboot load' first\n");
return CMD_RET_FAILURE;
}
@@ -87,13 +86,10 @@ static int _zboot_setup(void)
return CMD_RET_FAILURE;
}
return 0;
}
if (zboot_setup())
return CMD_RET_FAILURE;
static int do_zboot_setup(struct cmd_tbl *cmdtp, int flag, int argc,
char *const argv[])
{
return _zboot_setup();
return 0;
}
static void zboot_info(void)