From 4c88fbb166584a428ec2d583e7861b4bae1b092a Mon Sep 17 00:00:00 2001 From: Dan McGregor Date: Tue, 10 Dec 2013 08:45:34 -0600 Subject: [PATCH] u-boot-fslc: Add branch to SRC_URI and separate recipe files Separate the recipe into two files in the same fashion as the kernel recipes. A u-boot-fslc.inc file contains the common settings for the recipe, and a .bb file contains the settings specific to the version of u-boot to be built (e.g. SRCREV, branch name). In addition, new versions of bitbake require that a branch be specified and that the SRCREV be in the specified branch. Set the branch in the SRC_URI. Branch code based on patch from Dan McGregor Change-Id: I89d017fa4cc3e7addbea89d49605f78e3d84e246 Signed-off-by: John Weber Signed-off-by: Otavio Salvador --- .../recipes-bsp/u-boot/u-boot-fslc.inc | 29 +++++++++++++++++++ .../recipes-bsp/u-boot/u-boot-fslc_2013.10.bb | 24 ++------------- 2 files changed, 32 insertions(+), 21 deletions(-) create mode 100644 meta-fsl-arm/recipes-bsp/u-boot/u-boot-fslc.inc diff --git a/meta-fsl-arm/recipes-bsp/u-boot/u-boot-fslc.inc b/meta-fsl-arm/recipes-bsp/u-boot/u-boot-fslc.inc new file mode 100644 index 00000000..485c252e --- /dev/null +++ b/meta-fsl-arm/recipes-bsp/u-boot/u-boot-fslc.inc @@ -0,0 +1,29 @@ +# Copyright (C) 2012, 2013 O.S. Systems Software LTDA. +# Released under the MIT license (see COPYING.MIT for the terms) + +require recipes-bsp/u-boot/u-boot.inc + +DESCRIPTION = "U-boot bootloader for Freescale ARM platforms" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://Licenses/README;md5=025bf9f768cbcb1a165dbe1a110babfb" +COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6|vf60)" + +DEPENDS_mxs += "elftosb-native openssl-native" + +PROVIDES += "u-boot" + +SRCBRANCH ??= "master" + +SRC_URI = "git://github.com/Freescale/u-boot-imx.git;branch=${SRCBRANCH}" + +S = "${WORKDIR}/git" + +# FIXME: Allow linking of 'tools' binaries with native libraries +# used for generating the boot logo and other tools used +# during the build process. +EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CPPFLAGS}" \ + HOSTLDFLAGS="-L${STAGING_BASE_LIBDIR_NATIVE} -L${STAGING_LIBDIR_NATIVE}" \ + HOSTSTRIP=true' + +PACKAGE_ARCH = "${MACHINE_ARCH}" + diff --git a/meta-fsl-arm/recipes-bsp/u-boot/u-boot-fslc_2013.10.bb b/meta-fsl-arm/recipes-bsp/u-boot/u-boot-fslc_2013.10.bb index 73d43713..ea42c74b 100644 --- a/meta-fsl-arm/recipes-bsp/u-boot/u-boot-fslc_2013.10.bb +++ b/meta-fsl-arm/recipes-bsp/u-boot/u-boot-fslc_2013.10.bb @@ -1,25 +1,7 @@ -require recipes-bsp/u-boot/u-boot.inc - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://Licenses/README;md5=025bf9f768cbcb1a165dbe1a110babfb" -COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6|vf60)" - -DEPENDS_mxs += "elftosb-native openssl-native" - -PROVIDES += "u-boot" +include u-boot-fslc.inc PV = "v2013.10" -SRCREV = "079e214888279518ce061c71238a74a0c3db2c28" -SRC_URI = "git://github.com/Freescale/u-boot-imx.git" +SRCBRANCH = "patches-2013.10" -S = "${WORKDIR}/git" - -# FIXME: Allow linking of 'tools' binaries with native libraries -# used for generating the boot logo and other tools used -# during the build process. -EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CPPFLAGS}" \ - HOSTLDFLAGS="-L${STAGING_BASE_LIBDIR_NATIVE} -L${STAGING_LIBDIR_NATIVE}" \ - HOSTSTRIP=true' - -PACKAGE_ARCH = "${MACHINE_ARCH}" +SRCREV = "079e214888279518ce061c71238a74a0c3db2c28" -- 2.40.1