From 5c3273bbcc59a5f41810a3c977d6eba7933ebd2e Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Mon, 21 Jun 2021 16:14:32 +0930 Subject: u-boot-aspeed: Add environment for booting from mmc This adds the u-boot environment to the u-boot binary. On the 2600 with mmc we currently rely on the default environment being populated in the image. This has the downside that if something corrupts the environment, the system won't know how to boot itself. This wasn't a problem for NOR based systems as the built in command knew how to boot the system (unless you were using a 'special' setup such as Witherspoon's UBI setup). The ast2600_openbmc_mmc.txt is copied from meta-aspeed/recipes-bsp/u-boot/files/u-boot-env-ast2600.txt. Adriana has indicated she will update openbmc to use the .txt from the u-boot tree to generate the filesystem image (or we could stop doing that, and simply use the default?). The environment processing step requires xxd on the build system. Joel Stanley (2): Makefile: Conditionally add defaultenv_h to envtools target ast2600: Add environment for booting from mmc Change-Id: I0381ac168285bade75115b7b415e18dd7fc8694e Signed-off-by: Joel Stanley --- meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc') diff --git a/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc b/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc index 9da3e5a44..ab4b5200c 100644 --- a/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc +++ b/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc @@ -1,6 +1,6 @@ HOMEPAGE = "https://github.com/AspeedTech-BMC/u-boot" SECTION = "bootloaders" -DEPENDS += "flex-native bison-native" +DEPENDS += "flex-native bison-native xxd-native" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" @@ -8,7 +8,7 @@ PE = "1" # We use the revision in order to avoid having to fetch it from the # repo during parse -SRCREV = "e1417368fdc3ba45ffde51a4b13290114a643be4" +SRCREV = "cfc04136e001e208a1eab83c9fe0aa78a3fd6d7f" SRC_URI = "git://git@github.com/openbmc/u-boot.git;nobranch=1;protocol=https" -- cgit v1.2.3