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

Use the correct ramdisk address

Browse Source 
CONFIG_SYS_BOOT_RAMDISK_HIGH copies the initrd out of the FIT and into
correctly aligned RAM, but the addresses used for this are then discarded
by the x86 bootm code. Fix that.

Signed-off-by: Matthew Garrett <mgarrett@aurora.tech>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Matthew Garrett
2024-11-23 11:55:07 -08:00
committed by Simon Glass
parent 2e7bf25f6b
commit cad355ebe0
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
arch/x86/lib/bootm.c
View File

@@ -73,6 +73,7 @@ int arch_fixup_memory_node(void *blob)
/* Subcommand: PREP */
static int boot_prep_linux(struct bootm_headers *images)
{
ulong initrd_start, initrd_size;
char *cmd_line_dest = NULL;
struct legacy_img_hdr *hdr;
int is_zimage = 0;
@@ -135,10 +136,16 @@ static int boot_prep_linux(struct bootm_headers *images)
goto error;
}
if (IS_ENABLED(CONFIG_SYS_BOOT_RAMDISK_HIGH)) {
initrd_start = images->initrd_start;
initrd_size = images->initrd_end - images->initrd_start;
} else {
initrd_start = images->rd_start;
initrd_size = images->rd_end - images->rd_start;
}
printf("Setup at %#08lx\n", images->ep);
ret = setup_zimage((void *)images->ep, cmd_line_dest,
0, images->rd_start,
images->rd_end - images->rd_start, 0);
0, initrd_start, initrd_size, 0);
if (ret) {
printf("## Setting up boot parameters failed ...\n");