u-boot: Fix config-Always-use-GNU-ld patch to work with dash

[glsdk/meta-ti-glsdk.git] / recipes-bsp / u-boot / u-boot.inc

diff --git a/recipes-bsp/u-boot/u-boot.inc b/recipes-bsp/u-boot/u-boot.inc
index f9dab47e2e3c0ac2a68e16731063ecb6ed975c73..720f995524c47dd4b66d1f29fbd692b1c1dbb887 100644 (file)
--- a/recipes-bsp/u-boot/u-boot.inc
+++ b/recipes-bsp/u-boot/u-boot.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "U-Boot - the Universal Boot Loader"
 HOMEPAGE = "http://www.denx.de/wiki/U-Boot/WebHome"
 SECTION = "bootloaders"
-PRIORITY = "optional"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4c6cde5df68eff615d36789dc18edd3b"
 
@@ -29,7 +28,6 @@ do_compile () {
        unset CFLAGS
        unset CPPFLAGS
        oe_runmake ${UBOOT_MAKE_TARGET}
-       oe_runmake tools env
 }
 
 do_install () {
@@ -38,21 +36,15 @@ 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}"
+INSANE_SKIP_${PN} = "1"
 
 inherit deploy
 
@@ -63,5 +55,14 @@ do_deploy () {
        install ${S}/${UBOOT_BINARY} ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE}
 
        cd ${DEPLOY_DIR_IMAGE}
-       rm -f ${UBOOT_SYMLINK}
+       rm -f ${UBOOT_BINARY} ${UBOOT_SYMLINK}
+       ln -sf ${UBOOT_IMAGE} ${UBOOT_SYMLINK}
+       ln -sf ${UBOOT_IMAGE} ${UBOOT_BINARY}
+
+       if [ -e ${S}/MLO ] ; then
+               install ${S}/MLO ${DEPLOY_DIR_IMAGE}/MLO-${MACHINE}-${PV}
+               rm -f ${DEPLOY_DIR_IMAGE}/MLO-${MACHINE} ${DEPLOY_DIR_IMAGE}/MLO
+               ln -sf MLO-${MACHINE}-${PV} ${DEPLOY_DIR_IMAGE}/MLO-${MACHINE}
+               ln -sf MLO-${MACHINE}-${PV} ${DEPLOY_DIR_IMAGE}/MLO
+       fi
 }