From 5b6a8e987f9039aca63d97bc42421b78acab8a3d Mon Sep 17 00:00:00 2001 From: "Franklin S. Cooper Jr" Date: Fri, 7 Sep 2012 18:42:56 -0500 Subject: u-boot: Use fw_env.config if available. * Add support for board specific fw_env.config file if available. Signed-off-by: Franklin S. Cooper Jr Signed-off-by: Saul Wold --- meta/recipes-bsp/u-boot/u-boot.inc | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'meta/recipes-bsp/u-boot/u-boot.inc') diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc index a8642f0b06..ae53b9019c 100644 --- a/meta/recipes-bsp/u-boot/u-boot.inc +++ b/meta/recipes-bsp/u-boot/u-boot.inc @@ -49,6 +49,11 @@ do_install () { install ${S}/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE} ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY} + if [ -e ${WORKDIR}/fw_env.config ] ; then + install -d ${D}${sysconfdir} + install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config + fi + if [ "x${SPL_BINARY}" != "x" ] then install ${S}/${SPL_BINARY} ${D}/boot/${SPL_IMAGE} @@ -56,16 +61,17 @@ do_install () { fi } -FILES_${PN} = "/boot" +FILES_${PN} = "/boot ${sysconfdir}" FILESPATH =. "${FILE_DIRNAME}/u-boot-git/${MACHINE}:" do_deploy () { install -d ${DEPLOYDIR} - install ${S}/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE} + install ${S}/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE} - cd ${DEPLOYDIR} - rm -f ${UBOOT_SYMLINK} - ln -sf ${UBOOT_IMAGE} ${UBOOT_SYMLINK} + cd ${DEPLOYDIR} + rm -f ${UBOOT_BINARY} ${UBOOT_SYMLINK} + ln -sf ${UBOOT_IMAGE} ${UBOOT_SYMLINK} + ln -sf ${UBOOT_IMAGE} ${UBOOT_BINARY} if [ "x${SPL_BINARY}" != "x" ] then -- cgit 1.2.3-korg