diff options
| author | Adriana Kobylak <anoo@us.ibm.com> | 2017-08-19 09:32:18 -0500 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2017-08-21 23:19:54 +0000 |
| commit | 57ef7224ca9ff6cadbdf3c8577c71263055c6717 (patch) | |
| tree | c08dc86d2eb476f1fa15316f6cac88bc2b09daab /meta-phosphor/common/recipes-bsp/u-boot/u-boot.inc | |
| parent | 65007350889b5bb559b81a39891b05b1f3ec5086 (diff) | |
| download | talos-openbmc-57ef7224ca9ff6cadbdf3c8577c71263055c6717.tar.gz talos-openbmc-57ef7224ca9ff6cadbdf3c8577c71263055c6717.zip | |
u-boot: Reorder and update patches and bootenv fixes
Yocto does not apply patches by name, but instead it applies them
in the order that files are added to the SRC_URI variable.
Therefore move the common patch file to the top in the u-boot.inc file,
followed by the optional patches that are enabled via machine feature.
Update the patches so that they apply on that order.
Fix the loadaddr env variable to convert from an int.
Escape bootargs variables to keep the variable names and not have
them replaced during build time.
Change-Id: I28d469c643d66e4b11225f37c3331e471676aec5
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
Diffstat (limited to 'meta-phosphor/common/recipes-bsp/u-boot/u-boot.inc')
| -rw-r--r-- | meta-phosphor/common/recipes-bsp/u-boot/u-boot.inc | 4 |
1 files changed, 2 insertions, 2 deletions
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 5ccbea58c..1089ec40c 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,8 @@ SRCREV = "a5e0a21ed4b62ab4d8ff09f70b751db0f46ddaac" UBRANCH = "v2016.07-aspeed-openbmc" SRC_URI = "git://git@github.com/openbmc/u-boot.git;branch=${UBRANCH};protocol=https" +SRC_URI += "file://0001-configs-ast-Add-redundnant-env.patch" + SRC_URI += "${@bb.utils.contains('MACHINE_FEATURES', 'obmc-ubi-fs', \ 'file://0001-config-ast-common-hack-bootopts.patch \ file://0002-Add-MTD-support-to-Aspeed-Flash-driver.patch \ @@ -11,5 +13,3 @@ SRC_URI += "${@bb.utils.contains('MACHINE_FEATURES', 'obmc-ubi-fs', \ file://0004-config-ast-common-ubi-bootops.patch', '', d)}" PV = "v2016.07+git${SRCPV}" - -SRC_URI += "file://0001-configs-ast-Add-redundnant-env.patch" |
