Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <alex.gonzalez@digi.com>
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This commit is contained in:
Alex Gonzalez 2015-10-05 16:04:04 +02:00 committed by Javier Viguera
parent 745c3afdc0
commit f33afc53b4
4 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta-digi-arm/conf/machine/include/digi-defaults.inc
View File

@ -12,7 +12,7 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
# ------------------------------------------------- # -------------------------------------------------
# ccimx5 2.6.35.14 2009.08 # ccimx5 2.6.35.14 2009.08
# ccardimx28 3.10 2013.01 # ccardimx28 3.10 2013.01
# ccimx6 3.10,3.14 2013.04 # ccimx6 3.10,3.14 2015.04
# #
# Digi BSP default versions # Digi BSP default versions
PREFERRED_VERSION_linux-dey ?= "3.10" 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_linux-dey_ccimx6 ?= "3.14"
PREFERRED_VERSION_u-boot-dey ?= "2013.01" PREFERRED_VERSION_u-boot-dey ?= "2013.01"
PREFERRED_VERSION_u-boot-dey_ccimx5 ?= "2009.08" 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 # Help variables used in recipes
HAVE_WIFI = "${@base_contains('MACHINE_FEATURES', 'wifi', '1', '', d)}" HAVE_WIFI = "${@base_contains('MACHINE_FEATURES', 'wifi', '1', '', d)}"

0
meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2013.04/ccimx6/boot.txt → meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6/boot.txt
View File

4
meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.04.inc → meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2015.04.inc
View File

@ -1,7 +1,7 @@
# Copyright (C) 2013 Digi International # Copyright (C) 2015 Digi International
# Internal repo branch # Internal repo branch
SRCBRANCH = "v2013.04/master" SRCBRANCH = "v2015.04/master"
SRCREV_external = "" SRCREV_external = ""
SRCREV_internal = "${AUTOREV}" SRCREV_internal = "${AUTOREV}"

12
meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2013.04.bb → meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb
View File

@ -1,24 +1,20 @@
# Copyright (C) 2012 Digi International # Copyright (C) 2012-2015 Digi International
DESCRIPTION = "Bootloader for Digi platforms" DESCRIPTION = "Bootloader for Digi platforms"
require recipes-bsp/u-boot/u-boot.inc require recipes-bsp/u-boot/u-boot.inc
include u-boot-dey-rev_${PV}.inc include u-boot-dey-rev_${PV}.inc
inherit fsl-u-boot-localversion
PROVIDES += "u-boot" PROVIDES += "u-boot"
LICENSE = "GPLv2+" LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb" LIC_FILES_CHKSUM = "file://Licenses/README;md5=c7383a594871c03da76b3707929d2919"
SRC_URI += "file://boot.txt" SRC_URI += "file://boot.txt"
S = "${WORKDIR}/git"
DEPENDS += "u-boot-mkimage-native" DEPENDS += "u-boot-mkimage-native"
do_compile_prepend() {
${S}/tools/setlocalversion --save-scmversion ${S}
}
do_deploy_append() { do_deploy_append() {
mkimage -T script -n bootscript -C none -d ${WORKDIR}/boot.txt ${DEPLOYDIR}/boot.scr mkimage -T script -n bootscript -C none -d ${WORKDIR}/boot.txt ${DEPLOYDIR}/boot.scr
} }