u-boot: Move UBOOT_INITIAL_ENV back to u-boot.inc
PATCH 1/1 u-boot: Move UBOOT_INITIAL_ENV back to u-boot.inc
From: Fabio Estevam <[email protected]>
Commit cc6c3e31526d ("u-boot: Move definitions to common locations") moved UBOOT_INITIAL_ENV to uboot-config.bbclass, but it should be kept at u-boot.inc because it encodes ${PN} in it, which should be set by the U-Boot recipe.
Currently, whatever inherits uboot-config bbclass will fill-in its own PN, which would change the content of UBOOT_INITIAL_ENV per-package.
Cc Klaus Heinrich Kiwi <[email protected]>
Cc Marek Vasut <[email protected]>
Fixes cc6c3e31526d ("u-boot: Move definitions to common locations")
Signed-off-by Fabio Estevam <[email protected]>
Backported from master: 0b0c4b37d318b86f100512476ffd861e0ce1f47e
Signed-off-by Fabio Estevam <[email protected]>
--- meta/classes/uboot-config.bbclass | 4 ---- meta/recipes-bsp/u-boot/u-boot.inc | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-)
meta/classes/uboot-config.bbclass +0 -4
@@ -59,10 +59,6 @@ UBOOT_ENV_BINARY ?= "${UBOOT_ENV}.${UBOOT_ENV_SUFFIX}" UBOOT_ENV_IMAGE ?= "${UBOOT_ENV}-${MACHINE}-${PV}-${PR}.${UBOOT_ENV_SUFFIX}" UBOOT_ENV_SYMLINK ?= "${UBOOT_ENV}-${MACHINE}.${UBOOT_ENV_SUFFIX}" -# Default name of u-boot initial env, but enable individual recipes to change -# this value. -UBOOT_INITIAL_ENV ?= "${PN}-initial-env" - # U-Boot EXTLINUX variables. U-Boot searches for /boot/extlinux/extlinux.conf # to find EXTLINUX conf file. UBOOT_EXTLINUX_INSTALL_DIR ?= "/boot/extlinux"
meta/recipes-bsp/u-boot/u-boot.inc +4 -0
@@ -24,6 +24,10 @@ PACKAGECONFIG[openssl] = ",,openssl-native" # file already exists it will not be overwritten. UBOOT_LOCALVERSION ?= "" +# Default name of u-boot initial env, but enable individual recipes to change +# this value. +UBOOT_INITIAL_ENV ?= "${PN}-initial-env" + require u-boot-configure.inc do_compile () {
Signature · 1 line
2.34.1