summaryrefslogtreecommitdiff
path: root/meta-aspeed/recipes-bsp
diff options
context:
space:
mode:
authorZev Weiss <zev@bewilderbeest.net>2022-06-28 13:30:42 +0300
committerJoel Stanley <joel@jms.id.au>2022-07-01 10:15:22 +0300
commit06be640dc87caf845170f209ff5305f9911eca1a (patch)
tree746d3ac1bf497f488da2fae506bcf652e7c5ce9e /meta-aspeed/recipes-bsp
parent0fbbae08bb85a3031ce83065f9ce4c3e6b49582e (diff)
downloadopenbmc-06be640dc87caf845170f209ff5305f9911eca1a.tar.xz
u-boot-aspeed-sdk: Make fw-utils config consistent with u-boot
Previously the FLASH_SIZE-based config tweaks had only been applied to u-boot itself, leaving fw-utils built with a different default environment that could end up replacing the original one with a non-working bootcmd setting. Signed-off-by: Zev Weiss <zev@bewilderbeest.net> Change-Id: I147a601d6a348f94b221459eabee4555dfed63c6
Diffstat (limited to 'meta-aspeed/recipes-bsp')
-rw-r--r--meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed-sdk_2019.04.bb2
-rw-r--r--meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc3
2 files changed, 3 insertions, 2 deletions
diff --git a/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed-sdk_2019.04.bb b/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed-sdk_2019.04.bb
index 37477fedbd..ae85f6b8ad 100644
--- a/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed-sdk_2019.04.bb
+++ b/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed-sdk_2019.04.bb
@@ -7,8 +7,6 @@ require recipes-bsp/u-boot/u-boot.inc
PROVIDES += "u-boot"
DEPENDS += "bc-native dtc-native"
-SRC_URI:append:uboot-flash-32768 = " file://u-boot_flash_32M.cfg"
-SRC_URI:append:uboot-flash-65536 = " file://u-boot_flash_64M.cfg"
SRC_URI:append:df-phosphor-mmc = " file://u-boot-env-ast2600.txt"
SRC_URI += " \
file://rsa_oem_dss_key.pem;sha256sum=64a379979200d39949d3e5b0038e3fdd5548600b2f7077a17e35422336075ad4 \
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 75539c2302..9a27297cca 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
@@ -13,6 +13,9 @@ PE = "1"
SRCREV = "6ca27db3f97b270e063b552e2c5e554d70f2fd66"
SRC_URI = "git://git@github.com/openbmc/u-boot.git;nobranch=1;protocol=https"
+SRC_URI:append:uboot-flash-32768 = " file://u-boot_flash_32M.cfg"
+SRC_URI:append:uboot-flash-65536 = " file://u-boot_flash_64M.cfg"
+
S = "${WORKDIR}/git"
B = "${WORKDIR}/build"
do_configure[cleandirs] = "${B}"