[PATCH u-boot][PATCH v4 2/3] bootm: relocate ramdisk if CONFIG_SYS_BOOT_RAMDISK_HIGH set

[Joel Stanley]

On Thu, Dec 8, 2016 at 4:54 AM, Cédric Le Goater <clg at kaod.org> wrote:
> On 12/07/2016 07:06 PM, Rick Altherr wrote:
>> In 35fc84f, bootm was refactored so plain 'bootm' and
>> 'bootm <subcommand>' shared a common implementation.
>> The 'bootm ramdisk' command implementation is now part of the common
>> implementation but not invoke by plain 'bootm' since the original
>> implementation never did ramdisk relocation.  Instead, ramdisk
>> relocation happened in image_setup_linux() which is typically called
>> during the OS portion of 'bootm'.
>>
>> On ARM, parameters to the Linux kernel can either be passed by FDT or
>> ATAGS. When using FDT, image_setup_linux() is called which also triggers
>> ramdisk relocation.  When using ATAGS, image_setup_linux() is _not_
>> called because it mostly does FDT setup.
>>
>> Instead of calling image_setup_linux() in both FDT and ATAGS cases,
>> include BOOTM_STATE_RAMDISK in the requested states during a plain
>> 'bootm' if CONFIG_SYS_BOOT_RAMDISK_HIGH is set and remove the ramdisk
>> relocation from image_setup_linux().  This causes ramdisk relocation to
>> happen on any system where CONFIG_SYS_BOOT_RAMDISK_HIGH regardless of
>> the OS being booted. Also remove IMAGE_ENABLE_RAMDISK_HIGH as it was
>> only used by the now-removed code from image_setup_linux().
>>
>> Signed-off-by: Rick Altherr <raltherr at google.com>
>> Reviewed-by: Simon Glass <sjg at chromium.org>
>
> looks good.
>
> Reviewed-by: Cédric Le Goater <clg at kaod.org>

Reviewed-by: Joel Stanley <joel at jms.id.au>

Rick, can you please submit this one upstream too?

Please keep all of our reviewed-by tags but drop the version when you do so.

Cheers,

Joel