u-boot: Drop bootcmd support for legacy images
This u-boot bump contains one patch:
Brad Bishop (1):
aspeed: Drop bootcmd support for legacy images
Rebase out of tree Witherspoon patches.
Change-Id: Ie8f4453a9d88823d7a97b9cd172089ead045024d
Signed-off-by: Joel Stanley <joel@jms.id.au>
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
index 705213e..983c33f 100644
--- a/meta-phosphor/common/recipes-bsp/u-boot/u-boot-aspeed.inc
+++ b/meta-phosphor/common/recipes-bsp/u-boot/u-boot-aspeed.inc
@@ -3,9 +3,9 @@
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)}"
+ 'file://0002-config-ast-common-hack-bootopts.patch \
+ file://0003-config-ast-common-Add-bootopts-to-support-ubi-and-mt.patch \
+ file://0004-config-ast-common-Add-conditional-factory-reset-comm.patch', '', d)}"
python do_configure_aspeed () {
@@ -17,7 +17,7 @@
patch_uboot () {
sed -i "s/kernel-0/kernel-${VERSION_ID}/g" \
- ${S}/patches/0004-config-ast-common-ubi-bootops.patch &> /dev/null
+ ${S}/patches/0003-config-ast-common-Add-bootopts-to-support-ubi-and-mt.patch &> /dev/null
sed -i "s/kernel-0/kernel-${VERSION_ID}/g" \
${S}/include/configs/ast-common.h &> /dev/null
}