u-boot: ubi: Apply patches on Aspeed only
All the UBI patches will only work against the Aspeed u-boot tree.
Use the new Aspeed override to prevent attempting to install patches
when a different tree is in use.
Tested: Built image and verified in witherspoon qemu
Change-Id: Ia82ae958927a561670257f1c60d9d29a8b303728
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/meta-phosphor/common/recipes-bsp/u-boot/u-boot-aspeed.inc b/meta-phosphor/common/recipes-bsp/u-boot/u-boot-aspeed.inc
new file mode 100644
index 0000000..705213e
--- /dev/null
+++ b/meta-phosphor/common/recipes-bsp/u-boot/u-boot-aspeed.inc
@@ -0,0 +1,23 @@
+inherit image_version
+
+SRC_URI_append_aspeed = " file://0001-configs-ast-Add-redundnant-env.patch"
+
+SRC_URI_append_aspeed = " ${@bb.utils.contains('MACHINE_FEATURES', 'obmc-ubi-fs', \
+ 'file://0001-config-ast-common-hack-bootopts.patch \
+ file://0004-config-ast-common-ubi-bootops.patch \
+ file://0001-config-ast-common-Add-conditional-factory-reset-comm.patch', '', d)}"
+
+
+python do_configure_aspeed () {
+ if "obmc-ubi-fs" in d.getVar("MACHINE_FEATURES", True):
+ version_id=do_get_versionID(d)
+ d.setVar('VERSION_ID', version_id)
+ bb.build.exec_func("patch_uboot", d)
+}
+
+patch_uboot () {
+ sed -i "s/kernel-0/kernel-${VERSION_ID}/g" \
+ ${S}/patches/0004-config-ast-common-ubi-bootops.patch &> /dev/null
+ sed -i "s/kernel-0/kernel-${VERSION_ID}/g" \
+ ${S}/include/configs/ast-common.h &> /dev/null
+}