phosphor: u-boot: Switch sides on failure to boot
This is an incomplete effort to prevent a hang in u-boot due to a
failed `boot` command. This will not take affect by updating via the
ubi.mtd.tar method, as it does not allow arbitrary updates to the u-boot
environment. Resolving that issue will take at least one more change and
force a double reboot to complete the upgrade, or writing the full flash
image and take the hit of the associated loss of system-specific
settings (such as network configuration).
Tested: Instrumented which chip the system was currently booted from,
configured u-boot with a broken kernelname environment variable,
attempted to boot, confirmed a system reset occurred and the
chip used by the reboot was different.
Change-Id: I825728caff6b5d4bb4d527bfe86488d5f5487f14
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
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 6ec91b4..5286c1b 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
@@ -6,6 +6,7 @@
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 \
+ file://0005-config-ast-common-Fall-back-to-secondary-flash-on-fa.patch \
"
do_patch[depends] += "os-release:do_populate_sysroot"