[U-Boot,2/2] aspeed: use FIT-provided ramdisk if available

Joel Stanley joel at jms.id.au
Tue Jan 17 11:33:26 AEDT 2017


On Thu, Jan 12, 2017 at 1:13 PM, Rick Altherr <raltherr at google.com> wrote:
> If the kernel FIT specifies a ramdisk, use it.  Otherwise, expect a
> ramdisk at 0x20300000.
>
> Signed-off-by: Rick Altherr <raltherr at google.com>
> ---
>
>  include/configs/ast-common.h | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/include/configs/ast-common.h b/include/configs/ast-common.h
> index b39ea33ce7..110c780070 100644
> --- a/include/configs/ast-common.h
> +++ b/include/configs/ast-common.h
> @@ -96,7 +96,11 @@
>  #define CONFIG_ENV_OFFSET              0x60000 /* environment starts here  */
>  #define CONFIG_ENV_SIZE                        0x20000 /* Total Size of Environment Sector */
>
> -#define CONFIG_BOOTCOMMAND     "bootm 20080000 20300000"
> +#define CONFIG_BOOTCOMMAND     \
> +       "fdt addr 20080000; " \
> +       "if fdt get value ramdisk_conf /configurations/conf at 1 ramdisk; then " \
> +       "    bootm 20080000; else bootm 20080000 20300000; " \
> +       "fi"

This feels a little clunky. Is this the method upstream suggests to
solve this problem?

Cheers,

Joel


More information about the openbmc mailing list