Return-Path: Received: from mail-yh0-f48.google.com (mail-yh0-f48.google.com [209.85.213.48]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id 18B18E005B1 for ; Mon, 9 Dec 2013 10:32:32 -0800 (PST) Received: by mail-yh0-f48.google.com with SMTP id f73so2991971yha.35 for ; Mon, 09 Dec 2013 10:32:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=CeGlb/gerWgQbUCZvbqID2XJZRIqpdF4P8JNJKxKFv0=; b=kUcNz0yTlsdcuwQBzuxGgR2A69uaPj3y3u2GQFqLNnVvYhqyf51EyUMDGrC6MQ+oxs g0bl2vRddjJ26l+1rdRQdKIkPhha06ircPiyd9RqfjUrM3OnUqnl1a9y0ovkMGjApmyr ViTnXJqPoD+tRu8JSOEkisefJGcSzwfNX9kFitbARIsZdDvRyO3ZMwAqxsKSTUNz21ql 9mcMrdv1lPU889uF8Nd4v75+SH9Zpz6l0kHX/8qIAWZq25WDioqpF+P6FNlwLeyeMf0Y Xh3yS83ivDp2Sk63mh+tj+tiSCf6DhcchI4lV7+wXukjeIzmrg3HjN76Kl26rAEnUQlP gkMA== X-Received: by 10.236.4.72 with SMTP id 48mr86994583yhi.43.1386613951746; Mon, 09 Dec 2013 10:32:31 -0800 (PST) Received: from localhost.localdomain ([75.76.228.60]) by mx.google.com with ESMTPSA id e39sm17743393yhq.15.2013.12.09.10.32.30 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 09 Dec 2013 10:32:30 -0800 (PST) From: John Weber To: meta-freescale@yoctoproject.org Date: Mon, 9 Dec 2013 12:31:58 -0600 Message-Id: <1386613918-32093-1-git-send-email-rjohnweber@gmail.com> X-Mailer: git-send-email 1.7.9.5 Subject: [meta-fsl-arm][PATCH] u-boot-fslc: Add branch to SRC_URI and separate recipe files X-BeenThere: meta-freescale@yoctoproject.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Usage and development list for the meta-fsl-* layers List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Dec 2013 18:32:33 -0000 From: Dan McGregor 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 Signed-off-by: John Weber --- 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 recipes-bsp/u-boot/u-boot-fslc.inc diff --git a/recipes-bsp/u-boot/u-boot-fslc.inc b/recipes-bsp/u-boot/u-boot-fslc.inc new file mode 100644 index 0000000..8457bc5 --- /dev/null +++ b/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" + +GITBRANCH ??= "master" + +SRC_URI = "git://github.com/Freescale/u-boot-imx.git;tag=${BITBRANCH}" + +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/recipes-bsp/u-boot/u-boot-fslc_2013.10.bb b/recipes-bsp/u-boot/u-boot-fslc_2013.10.bb index 73d4371..d074997 100644 --- a/recipes-bsp/u-boot/u-boot-fslc_2013.10.bb +++ b/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" +GITBRANCH = "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" -- 1.7.9.5