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-ubi.inc b/meta-phosphor/common/recipes-bsp/u-boot/u-boot-aspeed.inc
similarity index 76%
rename from meta-phosphor/common/recipes-bsp/u-boot/u-boot-ubi.inc
rename to meta-phosphor/common/recipes-bsp/u-boot/u-boot-aspeed.inc
index ec5f861..705213e 100644
--- a/meta-phosphor/common/recipes-bsp/u-boot/u-boot-ubi.inc
+++ b/meta-phosphor/common/recipes-bsp/u-boot/u-boot-aspeed.inc
@@ -1,13 +1,14 @@
inherit image_version
-SRC_URI_append = " file://0001-configs-ast-Add-redundnant-env.patch"
+SRC_URI_append_aspeed = " file://0001-configs-ast-Add-redundnant-env.patch"
-SRC_URI_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'obmc-ubi-fs', \
+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 () {
+
+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)
diff --git a/meta-phosphor/common/recipes-bsp/u-boot/u-boot-phosphor.inc b/meta-phosphor/common/recipes-bsp/u-boot/u-boot-phosphor.inc
new file mode 100644
index 0000000..da7ca40
--- /dev/null
+++ b/meta-phosphor/common/recipes-bsp/u-boot/u-boot-phosphor.inc
@@ -0,0 +1,5 @@
+require u-boot-aspeed.inc
+
+python do_configure () {
+ pass
+}
diff --git a/meta-phosphor/common/recipes-bsp/u-boot/u-boot_2016.07.bb b/meta-phosphor/common/recipes-bsp/u-boot/u-boot_2016.07.bb
index 0360f23..81da3c7 100644
--- a/meta-phosphor/common/recipes-bsp/u-boot/u-boot_2016.07.bb
+++ b/meta-phosphor/common/recipes-bsp/u-boot/u-boot_2016.07.bb
@@ -1,5 +1,5 @@
require recipes-bsp/u-boot/u-boot.inc
require u-boot-common.inc
-require u-boot-ubi.inc
+require u-boot-phosphor.inc
DEPENDS += "dtc-native"