u-boot.inc: Move fw_env.config to main package

Now that u-boot-fw-utils is a separate recipe (in oe-core) we do not
want to try and build the tools here.  We also want to package the
fw_env.config file in the main package, if it exists.

Acked-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Tom Rini <trini@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>

1 files changed, 1 insertions, 8 deletions

diff --git a/recipes-bsp/u-boot/u-boot.inc b/recipes-bsp/u-boot/u-boot.inc
index 9669ade7..93035682 100644
--- a/recipes-bsp/u-boot/u-boot.inc
+++ b/recipes-bsp/u-boot/u-boot.inc
@@ -28,7 +28,6 @@ do_compile () {
         unset CFLAGS
         unset CPPFLAGS
         oe_runmake ${UBOOT_MAKE_TARGET}
-        oe_runmake tools env
 }
 
 do_install () {
@@ -37,22 +36,16 @@ do_install () {
         ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY}
 
         if [ -e ${WORKDIR}/fw_env.config ] ; then
-            install -d ${D}${base_sbindir}
                 install -d ${D}${sysconfdir}
                 install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config
-#               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
         fi
 
 }
 
-FILES_${PN} = "/boot"
+FILES_${PN} = "/boot ${sysconfdir}"
 # no gnu_hash in uboot.bin, by design, so skip QA
 INSANE_SKIP_${PN} = True
 
-PACKAGES += "${PN}-fw-utils"
-FILES_${PN}-fw-utils = "${sysconfdir} ${base_sbindir}"
-
 inherit deploy
 
 addtask deploy before do_package after do_compile