From c2b7a4bf56095bf517debd2e56f9fa59a0f25435 Mon Sep 17 00:00:00 2001 From: Ting Liu Date: Fri, 10 Jul 2015 17:45:09 +0800 Subject: u-boot-ls1: merge u-boot-ls1.inc into recipe There is no benefit to having a separate .inc file when we only support one version of u-boot-ls1. Signed-off-by: Ting Liu Signed-off-by: Otavio Salvador --- recipes-bsp/u-boot/u-boot-ls1.inc | 17 ----------------- recipes-bsp/u-boot/u-boot-ls1_2014.07.bb | 20 ++++++++++++++++++-- 2 files changed, 18 insertions(+), 19 deletions(-) delete mode 100644 recipes-bsp/u-boot/u-boot-ls1.inc diff --git a/recipes-bsp/u-boot/u-boot-ls1.inc b/recipes-bsp/u-boot/u-boot-ls1.inc deleted file mode 100644 index ccd37c6..0000000 --- a/recipes-bsp/u-boot/u-boot-ls1.inc +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "U-Boot which includes the support for QorIQ Layerscape1 series boards" -LICENSE = "GPLv2 & BSD-3-Clause & BSD-2-Clause & LGPL-2.0 & LGPL-2.1" -LIC_FILES_CHKSUM = " \ - file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://Licenses/bsd-2-clause.txt;md5=6a31f076f5773aabd8ff86191ad6fdd5 \ - file://Licenses/bsd-3-clause.txt;md5=4a1190eac56a9db675d58ebe86eaf50c \ - file://Licenses/lgpl-2.0.txt;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ - file://Licenses/lgpl-2.1.txt;md5=4fbd65380cdd255951079008b364516c \ -" - -SRCBRANCH = "sdk-v1.7.x" -SRC_URI = "git://git.freescale.com/ppc/sdk/u-boot.git;branch=${SRCBRANCH}" -SRCREV = "659b6a23a8b1f3026200bc6352dbacef53f4dcb1" - -LOCALVERSION ?= "-${SRCBRANCH}" - -S = "${WORKDIR}/git" diff --git a/recipes-bsp/u-boot/u-boot-ls1_2014.07.bb b/recipes-bsp/u-boot/u-boot-ls1_2014.07.bb index 010d2cc..ad1dd4b 100644 --- a/recipes-bsp/u-boot/u-boot-ls1_2014.07.bb +++ b/recipes-bsp/u-boot/u-boot-ls1_2014.07.bb @@ -1,9 +1,25 @@ require recipes-bsp/u-boot/u-boot.inc -require u-boot-ls1.inc -inherit fsl-u-boot-localversion + +DESCRIPTION = "U-Boot which includes the support for QorIQ Layerscape1 series boards" +LICENSE = "GPLv2 & BSD-3-Clause & BSD-2-Clause & LGPL-2.0 & LGPL-2.1" +LIC_FILES_CHKSUM = " \ + file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://Licenses/bsd-2-clause.txt;md5=6a31f076f5773aabd8ff86191ad6fdd5 \ + file://Licenses/bsd-3-clause.txt;md5=4a1190eac56a9db675d58ebe86eaf50c \ + file://Licenses/lgpl-2.0.txt;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ + file://Licenses/lgpl-2.1.txt;md5=4fbd65380cdd255951079008b364516c \ +" + +SRCBRANCH = "sdk-v1.7.x" +SRC_URI = "git://git.freescale.com/ppc/sdk/u-boot.git;branch=${SRCBRANCH}" +SRCREV = "659b6a23a8b1f3026200bc6352dbacef53f4dcb1" LOCALVERSION ?= "-${SRCBRANCH}" +S = "${WORKDIR}/git" + +inherit fsl-u-boot-localversion + DEPENDS += "change-file-endianess-native" PROVIDES += "u-boot" -- cgit v1.2.3-54-g00ecf