summaryrefslogtreecommitdiffstats
path: root/include/configs/ast-common.h
diff options
context:
space:
mode:
authorRick Altherr <raltherr@google.com>2017-01-11 18:13:28 -0800
committerJoel Stanley <joel@jms.id.au>2017-01-17 11:30:53 +1100
commitbe5e3b5b680746718f45ec5ad45e2debc61407b5 (patch)
tree12e173381c46a6951d00aaa7d0380358676e25d5 /include/configs/ast-common.h
parentedf82c94c14c9a2f98a01f6a7e939faf1a5cdfd8 (diff)
downloadblackbird-obmc-uboot-be5e3b5b680746718f45ec5ad45e2debc61407b5.tar.gz
blackbird-obmc-uboot-be5e3b5b680746718f45ec5ad45e2debc61407b5.zip
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 <raltherr@google.com> Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'include/configs/ast-common.h')
-rw-r--r--include/configs/ast-common.h6
1 files changed, 5 insertions, 1 deletions
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 \
OpenPOWER on IntegriCloud