From 05a1dfb84e2aa0259d14ab6f3405ea76754d11de Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Mon, 31 May 2021 16:16:59 +0200 Subject: [PATCH] digi-u-boot: use default name for initial env file Otherwise, the name of the file will be "u-boot-dey-initial-env", causing errors when reading the default environment from userspace, since libubootenv expects "u-boot-initial-env" instead. https://onedigi.atlassian.net/browse/DEL-7566 Signed-off-by: Gabriel Valcazar --- meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc index c12658193..88430ac56 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc @@ -37,6 +37,9 @@ EXTRA_OEMAKE_append = " KCFLAGS=-fgnu89-inline" UBOOT_EXTRA_CONF ?= "" +# Use default initial env name so userspace tools work as expected +UBOOT_INITIAL_ENV = "u-boot-initial-env" + python __anonymous() { if (d.getVar("TRUSTFENCE_DEK_PATH", True) not in ["0", None]) and (d.getVar("TRUSTFENCE_SIGN", True) != "1"): bb.fatal("Only signed U-Boot images can be encrypted. Generate signed images (TRUSTFENCE_SIGN = \"1\") or remove encryption (TRUSTFENCE_DEK_PATH = \"0\")")