From e2f2dce006439e3c7a35737b15ed7da03ba0bc2a Mon Sep 17 00:00:00 2001 From: John Klug Date: Fri, 12 May 2017 18:26:28 -0500 Subject: Merging morty with master (Daisy). --- recipes-bsp/u-boot/u-boot.inc | 3 -- recipes-bsp/u-boot/u-boot.inc.orig | 89 ++++++++++++++++++++++++++++++++++++ recipes-bsp/u-boot/u-boot_2012.10.bb | 42 ----------------- recipes-bsp/u-boot/u-boot_2016.03.bb | 3 ++ 4 files changed, 92 insertions(+), 45 deletions(-) create mode 100644 recipes-bsp/u-boot/u-boot.inc.orig delete mode 100644 recipes-bsp/u-boot/u-boot_2012.10.bb (limited to 'recipes-bsp/u-boot') diff --git a/recipes-bsp/u-boot/u-boot.inc b/recipes-bsp/u-boot/u-boot.inc index 6db11f8..d004d85 100644 --- a/recipes-bsp/u-boot/u-boot.inc +++ b/recipes-bsp/u-boot/u-boot.inc @@ -64,9 +64,6 @@ UBOOT_ENV ?= "" UBOOT_ENV_BINARY ?= "${UBOOT_ENV}.${UBOOT_ENV_SUFFIX}" UBOOT_ENV_IMAGE ?= "${UBOOT_ENV}-${MACHINE}-${PV}-${PR}.${UBOOT_ENV_SUFFIX}" UBOOT_ENV_SYMLINK ?= "${UBOOT_ENV}-${MACHINE}.${UBOOT_ENV_SUFFIX}" - -FILES_${PN}-dev += "${includedir}/u-boot/* ${includedir}/u-boot/configs/* ${includedir}/u-boot/asm/*" - FILES_${PN}-dev += "${includedir}/u-boot/* ${includedir}/u-boot/configs/* ${includedir}/u-boot/asm/*" do_compile () { diff --git a/recipes-bsp/u-boot/u-boot.inc.orig b/recipes-bsp/u-boot/u-boot.inc.orig new file mode 100644 index 0000000..38a8a79 --- /dev/null +++ b/recipes-bsp/u-boot/u-boot.inc.orig @@ -0,0 +1,89 @@ +DESCRIPTION = "U-Boot - the Universal Boot Loader" +HOMEPAGE = "http://www.denx.de/wiki/U-Boot/WebHome" +SECTION = "bootloaders" +PROVIDES = "virtual/bootloader" + +inherit uboot-config deploy + +PACKAGE_ARCH = "${MACHINE_ARCH}" +EXTRA_OEMAKE = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}"' + +# Allow setting an additional version string that will be picked up by the +# u-boot build system and appended to the u-boot version. If the .scmversion +# file already exists it will not be overwritten. +UBOOT_LOCALVERSION ?= "" + +# 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}" +UBOOT_MAKE_TARGET ?= "all" + +# 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}" + +do_compile () { + if [ "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', 'ld-is-gold', '', d)}" = "ld-is-gold" ] ; then + sed -i 's/$(CROSS_COMPILE)ld$/$(CROSS_COMPILE)ld.bfd/g' config.mk + fi + + unset LDFLAGS + unset CFLAGS + unset CPPFLAGS + + if [ ! -e ${B}/.scmversion -a ! -e ${S}/.scmversion ] + then + echo ${UBOOT_LOCALVERSION} > ${B}/.scmversion + echo ${UBOOT_LOCALVERSION} > ${S}/.scmversion + fi + + oe_runmake ${UBOOT_MACHINE} + oe_runmake ${UBOOT_MAKE_TARGET} +} + +do_install () { + 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 + + if [ "x${SPL_BINARY}" != "x" ] + then + install ${S}/${SPL_BINARY} ${D}/boot/${SPL_IMAGE} + ln -sf ${SPL_IMAGE} ${D}/boot/${SPL_BINARY} + fi +} + +FILES_${PN} = "/boot ${sysconfdir}" +FILESPATH =. "${FILE_DIRNAME}/u-boot-git/${MACHINE}:" + +do_deploy () { + install -d ${DEPLOYDIR} + install ${S}/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE} + + 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 + 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 +} + +addtask deploy before do_build after do_compile diff --git a/recipes-bsp/u-boot/u-boot_2012.10.bb b/recipes-bsp/u-boot/u-boot_2012.10.bb deleted file mode 100644 index 51cd565..0000000 --- a/recipes-bsp/u-boot/u-boot_2012.10.bb +++ /dev/null @@ -1,42 +0,0 @@ -PR = "r7" -require u-boot.inc - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb" - -DEFAULT_PREFERENCE = "-1" - -# U-Boot 2012.10 for AT91 -# tag: linux4sam_4.0 -SRCREV="8978bdafbad84c0c9878c9ff331930ca6edf9a76" - -SRC_URI = "git://github.com/linux4sam/u-boot-at91.git;branch=u-boot-2012.10-at91 \ - file://u-boot-2012.10-sam9x5-eth-mii-fix.patch \ - file://u-boot-env-crc-dbg.patch \ - " - -# add patch to speed up boot if ethernet autonegotiation fails -SRC_URI += "file://u-boot-2010.06-macb-autoneg-timeout.patch" -# add password protection patch -SRC_URI += "file://u-boot-2012.10-pwd.patch" - -SRC_URI_append_mtcdt = " file://u-boot-2012.10-mtcdt.patch" -SRC_URI_append_mtcap = " file://u-boot-2012.10-mtcdt.patch" - -TARGET_LDFLAGS = "" - -S = "${WORKDIR}/git" - -inherit base - -do_configure_prepend() { - mv -f tools/setlocalversion tools/setlocalversion.old - echo -e "#!/bin/sh\necho '-${MACHINE}-${PR}'" > tools/setlocalversion - chmod a+rx tools/setlocalversion -} - -do_compile () { - oe_runmake ${UBOOT_MACHINE} - oe_runmake all -} - diff --git a/recipes-bsp/u-boot/u-boot_2016.03.bb b/recipes-bsp/u-boot/u-boot_2016.03.bb index 1f58b50..77fce05 100644 --- a/recipes-bsp/u-boot/u-boot_2016.03.bb +++ b/recipes-bsp/u-boot/u-boot_2016.03.bb @@ -8,8 +8,11 @@ DEPENDS += "dtc-native" SRCREV = "df61a74e6845ec9bdcdd48d2aff5e9c2c6debeaa" PV = "v2016.03+git${SRCPV}" +<<<<<<< HEAD FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-2016.03:" SRC_URI += "file://mtcdt.patch" SRC_URI += "file://spl.patch" SRC_URI += "file://i2c.patch" +======= +>>>>>>> Initial commit of Yocto 2.1 changes -- cgit v1.2.3