u-boot: modify boot options if obmc-ubi-fs enabled
Change-Id: I9b91ce8c540df347537544bbe5e8b5396aa2d3dc
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/meta-phosphor/common/recipes-bsp/u-boot/files/0001-config-ast-common-hack-bootopts.patch b/meta-phosphor/common/recipes-bsp/u-boot/files/0001-config-ast-common-hack-bootopts.patch
new file mode 100644
index 0000000..d168769
--- /dev/null
+++ b/meta-phosphor/common/recipes-bsp/u-boot/files/0001-config-ast-common-hack-bootopts.patch
@@ -0,0 +1,43 @@
+From 6bfd346da6639a83e17e271e95ce33d1d095334a Mon Sep 17 00:00:00 2001
+From: Patrick Williams <patrick@stwcx.xyz>
+Date: Fri, 21 Jul 2017 16:30:01 -0500
+Subject: [PATCH] config/ast-common: hack bootopts
+
+Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
+---
+ include/configs/ast-common.h | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/include/configs/ast-common.h b/include/configs/ast-common.h
+index 110c780070..6f2a50b854 100644
+--- a/include/configs/ast-common.h
++++ b/include/configs/ast-common.h
+@@ -84,7 +84,10 @@
+ #define CONFIG_SYS_MAXARGS 16
+ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
+
++#if 0
+ #define CONFIG_BOOTARGS "console=ttyS4,115200n8 root=/dev/ram rw"
++#endif
++#define CONFIG_BOOTARGS "console=ttyS4,115200n8 root=/dev/mtdblock4 ro"
+
+ #define CONFIG_AST_SPI_NOR /* AST SPI NOR Flash */
+ #define CONFIG_FMC_CS 1
+@@ -96,11 +99,14 @@
+ #define CONFIG_ENV_OFFSET 0x60000 /* environment starts here */
+ #define CONFIG_ENV_SIZE 0x20000 /* Total Size of Environment Sector */
+
++#if 0
+ #define CONFIG_BOOTCOMMAND \
+ "fdt addr 20080000; " \
+ "if fdt get value ramdisk_conf /configurations/conf@1 ramdisk; then " \
+ " bootm 20080000; else bootm 20080000 20300000; " \
+ "fi"
++#endif
++#define CONFIG_BOOTCOMMAND "fdt addr 20080000; bootm 20080000"
+ #define CONFIG_ENV_OVERWRITE
+
+ #define ASPEED_ENV_SETTINGS \
+--
+2.13.0
+
diff --git a/meta-phosphor/common/recipes-bsp/u-boot/u-boot.inc b/meta-phosphor/common/recipes-bsp/u-boot/u-boot.inc
index 492e3f7..03b7a61 100644
--- a/meta-phosphor/common/recipes-bsp/u-boot/u-boot.inc
+++ b/meta-phosphor/common/recipes-bsp/u-boot/u-boot.inc
@@ -4,6 +4,9 @@
UBRANCH = "v2016.07-aspeed-openbmc"
SRC_URI = "git://git@github.com/openbmc/u-boot.git;branch=${UBRANCH};protocol=https"
+SRC_URI += "${@bb.utils.contains('MACHINE_FEATURES', 'obmc-ubi-fs', \
+ 'file://0001-config-ast-common-hack-bootopts.patch', '', d)}"
+
PV = "v2016.07+git${SRCPV}"
SRC_URI += "file://0001-configs-ast-Add-redundnant-env.patch"