From f33afc53b42683c7a3c8d6d834bb792b92e01bfc Mon Sep 17 00:00:00 2001 From: Alex Gonzalez Date: Mon, 5 Oct 2015 16:04:04 +0200 Subject: [PATCH] meta-digi-arm: update uboot to v2015.04 and make default for CC6 https://jira.digi.com/browse/DEL-1829 Signed-off-by: Alex Gonzalez Signed-off-by: Javier Viguera --- meta-digi-arm/conf/machine/include/digi-defaults.inc | 4 ++-- .../ccimx6/boot.txt | 0 ...ey-rev_2013.04.inc => u-boot-dey-rev_2015.04.inc} | 4 ++-- .../{u-boot-dey_2013.04.bb => u-boot-dey_2015.04.bb} | 12 ++++-------- 4 files changed, 8 insertions(+), 12 deletions(-) rename meta-digi-arm/recipes-bsp/u-boot/{u-boot-dey-2013.04 => u-boot-dey-2015.04}/ccimx6/boot.txt (100%) rename meta-digi-arm/recipes-bsp/u-boot/{u-boot-dey-rev_2013.04.inc => u-boot-dey-rev_2015.04.inc} (86%) rename meta-digi-arm/recipes-bsp/u-boot/{u-boot-dey_2013.04.bb => u-boot-dey_2015.04.bb} (63%) diff --git a/meta-digi-arm/conf/machine/include/digi-defaults.inc b/meta-digi-arm/conf/machine/include/digi-defaults.inc index 887907161..772b12dda 100644 --- a/meta-digi-arm/conf/machine/include/digi-defaults.inc +++ b/meta-digi-arm/conf/machine/include/digi-defaults.inc @@ -12,7 +12,7 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" # ------------------------------------------------- # ccimx5 2.6.35.14 2009.08 # ccardimx28 3.10 2013.01 -# ccimx6 3.10,3.14 2013.04 +# ccimx6 3.10,3.14 2015.04 # # Digi BSP default versions PREFERRED_VERSION_linux-dey ?= "3.10" @@ -20,7 +20,7 @@ PREFERRED_VERSION_linux-dey_ccimx5 ?= "2.6.35.14" PREFERRED_VERSION_linux-dey_ccimx6 ?= "3.14" PREFERRED_VERSION_u-boot-dey ?= "2013.01" PREFERRED_VERSION_u-boot-dey_ccimx5 ?= "2009.08" -PREFERRED_VERSION_u-boot-dey_ccimx6 ?= "2013.04" +PREFERRED_VERSION_u-boot-dey_ccimx6 ?= "2015.04" # Help variables used in recipes HAVE_WIFI = "${@base_contains('MACHINE_FEATURES', 'wifi', '1', '', d)}" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2013.04/ccimx6/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6/boot.txt similarity index 100% rename from meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2013.04/ccimx6/boot.txt rename to meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6/boot.txt diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.04.inc b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2015.04.inc similarity index 86% rename from meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.04.inc rename to meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2015.04.inc index b5a644a22..ce769c592 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.04.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2015.04.inc @@ -1,7 +1,7 @@ -# Copyright (C) 2013 Digi International +# Copyright (C) 2015 Digi International # Internal repo branch -SRCBRANCH = "v2013.04/master" +SRCBRANCH = "v2015.04/master" SRCREV_external = "" SRCREV_internal = "${AUTOREV}" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2013.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb similarity index 63% rename from meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2013.04.bb rename to meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb index c17af59d5..a3822eb95 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2013.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb @@ -1,24 +1,20 @@ -# Copyright (C) 2012 Digi International +# Copyright (C) 2012-2015 Digi International DESCRIPTION = "Bootloader for Digi platforms" require recipes-bsp/u-boot/u-boot.inc include u-boot-dey-rev_${PV}.inc +inherit fsl-u-boot-localversion + PROVIDES += "u-boot" LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb" +LIC_FILES_CHKSUM = "file://Licenses/README;md5=c7383a594871c03da76b3707929d2919" SRC_URI += "file://boot.txt" -S = "${WORKDIR}/git" - DEPENDS += "u-boot-mkimage-native" -do_compile_prepend() { - ${S}/tools/setlocalversion --save-scmversion ${S} -} - do_deploy_append() { mkimage -T script -n bootscript -C none -d ${WORKDIR}/boot.txt ${DEPLOYDIR}/boot.scr }