u-boot.inc diff

4,6d3
< LICENSE = "GPLv2+"
< LIC_FILES_CHKSUM = "file://COPYING;md5=4c6cde5df68eff615d36789dc18edd3b"
<
9c6
< DEPENDS = "mtd-utils"
---
> inherit deploy
11d7
< PACKAGE_ARCH = "${MACHINE_ARCH}"
14c10,20
< EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
---
> # GCC 4.5.1 builds unusable binaries using -Os, remove it from OPTFLAGS
> EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} OPTFLAGS='-O2' CC='${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}'"
>
> python () {
> 	if not d.getVar("UBOOT_MACHINE", True):
> 		PN = d.getVar("PN", True)
> 		FILE = os.path.basename(d.getVar("FILE", True))
> 		bb.debug(1, "To build %s, see %s for instructions on \
> 			     setting up your machine config" % (PN, FILE))
> 		raise bb.parse.SkipPackage("because UBOOT_MACHINE is not set")
> }
16,19c22,27
< UBOOT_MACHINE ?= "${MACHINE}_config"
< UBOOT_BINARY ?= "u-boot.bin"
< UBOOT_IMAGE ?= "u-boot-${MACHINE}-${PV}-${PR}.bin"
< UBOOT_SYMLINK ?= "u-boot-${MACHINE}.bin"
---
> # Some versions of u-boot use .bin and others use .img.  By default use .bin
> # but enable individual recipes to change this value.
> UBOOT_SUFFIX ?= "bin"
> UBOOT_IMAGE ?= "u-boot-${MACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
> UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}"
> UBOOT_SYMLINK ?= "u-boot-${MACHINE}.${UBOOT_SUFFIX}"
22,24c30,36
< do_configure () {
< 	oe_runmake ${UBOOT_MACHINE}
< }
---
> # Some versions of u-boot build an SPL (Second Program Loader) image that
> # should be packaged along with the u-boot binary as well as placed in the
> # deploy directory.  For those versions they can set the following variables
> # to allow packaging the SPL.
> SPL_BINARY ?= ""
> SPL_IMAGE ?= "${SPL_BINARY}-${MACHINE}-${PV}-${PR}"
> SPL_SYMLINK ?= "${SPL_BINARY}-${MACHINE}"
29a42
> 	oe_runmake ${UBOOT_MACHINE}
34,42c47,55
< 	install -d ${D}/boot
< 	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
<
---
>     install -d ${D}/boot
>     install ${S}/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE}
>     ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY}
>
>     if [ "x${SPL_BINARY}" != "x" ]
>     then
>         install ${S}/${SPL_BINARY} ${D}/boot/${SPL_IMAGE}
>         ln -sf ${SPL_IMAGE} ${D}/boot/${SPL_BINARY}
>     fi
45,51c58
< FILES_${PN} = "/boot ${sysconfdir}"
< # no gnu_hash in uboot.bin, by design, so skip QA
< INSANE_SKIP_${PN} = "1"
<
< inherit deploy
<
< addtask deploy before do_package after do_compile
---
> FILES_${PN} = "/boot"
54,55c61,62
< 	install -d ${DEPLOY_DIR_IMAGE}
< 	install ${S}/${UBOOT_BINARY} ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE}
---
>     install -d ${DEPLOYDIR}
> 	install ${S}/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE}
57,58c64,65
< 	cd ${DEPLOY_DIR_IMAGE}
< 	rm -f ${UBOOT_BINARY} ${UBOOT_SYMLINK}
---
> 	cd ${DEPLOYDIR}
> 	rm -f ${UBOOT_SYMLINK}
60d66
< 	ln -sf ${UBOOT_IMAGE} ${UBOOT_BINARY}
62,67c68,74
< 	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
---
>     if [ "x${SPL_BINARY}" != "x" ]
>     then
>         install ${S}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_IMAGE}
>         rm -f ${DEPLOYDIR}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_SYMLINK}
>         ln -sf ${SPL_IMAGE} ${DEPLOYDIR}/${SPL_BINARY}
>         ln -sf ${SPL_IMAGE} ${DEPLOYDIR}/${SPL_SYMLINK}
>     fi
68a76,77
>
> addtask deploy before do_build after do_compile