From be5e3b5b680746718f45ec5ad45e2debc61407b5 Mon Sep 17 00:00:00 2001 From: Rick Altherr Date: Wed, 11 Jan 2017 18:13:28 -0800 Subject: aspeed: use FIT-provided ramdisk if available If the kernel FIT specifies a ramdisk, use it. Otherwise, expect a ramdisk at 0x20300000. Signed-off-by: Rick Altherr Signed-off-by: Joel Stanley --- include/configs/ast-common.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'include/configs/ast-common.h') 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@1 ramdisk; then " \ + " bootm 20080000; else bootm 20080000 20300000; " \ + "fi" #define CONFIG_ENV_OVERWRITE #define ASPEED_ENV_SETTINGS \ -- cgit v1.2.1