As implemented currently, the fw-utils recipe does not allow for
a board- or distro-specific fw_env.config override, instead opting
to include the default (commented, example-filled) fw_env.config
from the u-boot source. This change introduces a variable that allows
for overriding this, while defaulting to the example config file from
the u-boot source.

Signed-off-by: Brad Mouring <brad.mour...@ni.com>
---
 meta/recipes-bsp/u-boot/u-boot-fw-utils_2017.05.bb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2017.05.bb 
b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2017.05.bb
index c2e8f0fb84..b06282ac03 100644
--- a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2017.05.bb
+++ b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2017.05.bb
@@ -7,6 +7,11 @@ INSANE_SKIP_${PN} = "already-stripped"
 EXTRA_OEMAKE_class-target = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${CC} 
${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" V=1'
 EXTRA_OEMAKE_class-cross = 'ARCH=${TARGET_ARCH} CC="${CC} ${CFLAGS} 
${LDFLAGS}" V=1'
 
+# U-Boot environment configuration file variables. This file is used
+# by the U-Boot environment utilities "fw_printenv" and "fw_setenv".
+# By default, use the default included in the U-Boot source
+UBOOT_FW_ENV_CONFIG ??= "${S}/tools/env/fw_env.config"
+
 inherit uboot-config
 
 do_compile () {
@@ -19,7 +24,7 @@ do_install () {
        install -d ${D}${sysconfdir}
        install -m 755 ${S}/tools/env/fw_printenv 
${D}${base_sbindir}/fw_printenv
        install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_setenv
-       install -m 0644 ${S}/tools/env/fw_env.config 
${D}${sysconfdir}/fw_env.config
+       install -m 0644 ${UBOOT_FW_ENV_CONFIG} ${D}${sysconfdir}/fw_env.config
 }
 
 do_install_class-cross () {
-- 
2.13.1

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Reply via email to