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

Rick Altherr raltherr at google.com
Thu Jan 12 13:13:28 AEDT 2017


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"
 #define CONFIG_ENV_OVERWRITE
 
 #define ASPEED_ENV_SETTINGS \
-- 
2.11.0.390.gc69c2f50cf-goog



More information about the openbmc mailing list