commit 0f19eb51ba32e3dabf4d0b1cb8fa28562c39e853
author Patrick Williams <patrick@stwcx.xyz> Thu Jul 27 13:32:33 2017 -0500
committer Adriana Kobylak <anoo@us.ibm.com> Fri Aug 18 11:48:40 2017 -0500
tree 56e0c34c77355ea0a451bea50f5357d2d8bc9a24
parent 032fc8dadbb46d1cfc46b41bca86b2597b6a0b09

u-boot: modify boot options if obmc-ubi-fs enabled

Change-Id: I9b91ce8c540df347537544bbe5e8b5396aa2d3dc
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>

common/recipes-bsp/u-boot/u-boot.inc

diff --git a/common/recipes-bsp/u-boot/u-boot.inc b/common/recipes-bsp/u-boot/u-boot.inc
index 492e3f7..03b7a61 100644
--- a/common/recipes-bsp/u-boot/u-boot.inc
+++ b/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"