| Message ID | 1452249212-25183-3-git-send-email-jeffy.chen@rock-chips.com |
|---|---|
| State | Accepted |
| Commit | f7ee071a22df69e919c9829bbd800cb5e9c1703c |
| Delegated to: | Simon Glass |
| Headers | show |
On 8 January 2016 at 03:33, Jeffy Chen <jeffy.chen@rock-chips.com> wrote: > After boot_ramdisk_high(), ramdisk would be relocated to > initrd_start & initrd_end, so use them instead of rd_start & rd_end. > > Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> > > --- > > Changes in v2: > Add comments. > > arch/arm/lib/bootm.c | 12 +++++++++++- > 1 file changed, 11 insertions(+), 1 deletion(-) Acked-by: Simon Glass <sjg@chromium.org>
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index a477cae..0838d89 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -225,7 +225,17 @@ static void boot_prep_linux(bootm_headers_t *images) if (BOOTM_ENABLE_MEMORY_TAGS) setup_memory_tags(gd->bd); if (BOOTM_ENABLE_INITRD_TAG) { - if (images->rd_start && images->rd_end) { + /* + * In boot_ramdisk_high(), it may relocate ramdisk to + * a specified location. And set images->initrd_start & + * images->initrd_end to relocated ramdisk's start/end + * addresses. So use them instead of images->rd_start & + * images->rd_end when possible. + */ + if (images->initrd_start && images->initrd_end) { + setup_initrd_tag(gd->bd, images->initrd_start, + images->initrd_end); + } else if (images->rd_start && images->rd_end) { setup_initrd_tag(gd->bd, images->rd_start, images->rd_end); }
After boot_ramdisk_high(), ramdisk would be relocated to initrd_start & initrd_end, so use them instead of rd_start & rd_end. Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> --- Changes in v2: Add comments. arch/arm/lib/bootm.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)