mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2026-05-04 20:26:13 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

x86: Drop the unnecessary base_ptr argument to zboot_dump()

Browse Source 
This value is include the bootm_info, so drop the unnecessary parameter.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2025-03-05 17:25:02 -07:00 committed by Tom Rini
parent 1592ff27d5
commit c73da92304
4 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/x86/lib/zimage.c
View File

@ -554,12 +554,13 @@ static void show_loader(struct setup_header *hdr)
printf("\n");
}
void zimage_dump(struct bootm_info *bmi, struct boot_params *base_ptr,
bool show_cmdline)
void zimage_dump(struct bootm_info *bmi, bool show_cmdline)
{
struct boot_params *base_ptr;
struct setup_header *hdr;
int i;
base_ptr = bmi->base_ptr;
printf("Setup located at %p:\n\n", base_ptr);
print_num64("ACPI RSDP addr", base_ptr->acpi_rsdp_addr);

3
cmd/bootflow.c
View File

@ -385,7 +385,8 @@ static int do_bootflow_info(struct cmd_tbl *cmdtp, int flag, int argc,
bootm_init(&bmi);
/* we don't know this at present */
bootm_x86_set(&bmi, bzimage_addr, 0);
zimage_dump(&bmi, bflow->x86_setup, false);
bootm_x86_set(&bmi, base_ptr, bflow->x86_setup);
zimage_dump(&bmi, false);
return 0;
}

8
cmd/x86/zboot.c
View File

@ -103,15 +103,13 @@ static int do_zboot_go(struct cmd_tbl *cmdtp, int flag, int argc,
static int do_zboot_dump(struct cmd_tbl *cmdtp, int flag, int argc,
char *const argv[])
{
struct boot_params *base_ptr = bmi.base_ptr;
if (argc > 1)
base_ptr = (void *)hextoul(argv[1], NULL);
if (!base_ptr) {
bmi.base_ptr = (void *)hextoul(argv[1], NULL);
if (!bmi.base_ptr) {
printf("No zboot setup_base\n");
return CMD_RET_FAILURE;
}
zimage_dump(&bmi, base_ptr, true);
zimage_dump(&bmi, true);
return 0;
}

7
include/bootm.h
View File

@ -342,13 +342,10 @@ const char *zimage_get_kernel_version(struct boot_params *params,
*
* This shows all available information in a zimage that has been loaded.
*
* @bmi: Bootm information
* @base_ptr: Pointer to the boot parameters, typically at address
* DEFAULT_SETUP_BASE
* @bmi: Bootm information, with valid base_ptr
* @show_cmdline: true to show the full command line
*/
void zimage_dump(struct bootm_info *bmi, struct boot_params *base_ptr,
bool show_cmdline);
void zimage_dump(struct bootm_info *bmi, bool show_cmdline);
/*
* bootm_boot_start() - Boot an image at the given address