summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Agner <stefan.agner@toradex.com>2014-10-20 18:08:42 +0200
committerStefan Agner <stefan.agner@toradex.com>2014-10-20 18:08:42 +0200
commitd6de0d496829b48a394722b18c1f8029586195cc (patch)
treee526bf16863b1668c92140772aa7c6580b0c1056
parent1691bacdac9d8d7096efb0a7ab319f4a59e7f688 (diff)
colibri-vf: u-boot: switch to 2014.10
Use rebased U-Boot release 2014.10. The README has a new md5sum and U-Boots new build system has default configurations ending with defconfig too.
-rw-r--r--conf/machine/colibri-vf.conf2
-rw-r--r--recipes-bsp/u-boot/u-boot-toradex-fsl-fw-utils_git.bb12
-rw-r--r--recipes-bsp/u-boot/u-boot-toradex-fsl_git.bb5
3 files changed, 14 insertions, 5 deletions
diff --git a/conf/machine/colibri-vf.conf b/conf/machine/colibri-vf.conf
index 9d4891d..d99f300 100644
--- a/conf/machine/colibri-vf.conf
+++ b/conf/machine/colibri-vf.conf
@@ -16,7 +16,7 @@ KERNEL_IMAGETYPE = "zImage"
PREFERRED_PROVIDER_u-boot = "u-boot-toradex-fsl"
PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex-fsl"
-UBOOT_MACHINE = "colibri_vf_config"
+UBOOT_MACHINE = "colibri_vf_defconfig"
UBOOT_SUFFIX = "imx"
UBOOT_MAKE_TARGET = ""
diff --git a/recipes-bsp/u-boot/u-boot-toradex-fsl-fw-utils_git.bb b/recipes-bsp/u-boot/u-boot-toradex-fsl-fw-utils_git.bb
index cd66f2e..5bef270 100644
--- a/recipes-bsp/u-boot/u-boot-toradex-fsl-fw-utils_git.bb
+++ b/recipes-bsp/u-boot/u-boot-toradex-fsl-fw-utils_git.bb
@@ -1,5 +1,6 @@
DESCRIPTION = "U-boot bootloader fw_printenv/setenv utils"
LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM_colibri-vf = "file://Licenses/README;md5=c7383a594871c03da76b3707929d2919"
LIC_FILES_CHKSUM = "file://Licenses/README;md5=025bf9f768cbcb1a165dbe1a110babfb"
SECTION = "bootloader"
PROVIDES = "u-boot-fw-utils"
@@ -11,9 +12,9 @@ DEFAULT_PREFERENCE_apalis-imx6 = "1"
FILESPATHPKG =. "git:"
S="${WORKDIR}/git"
-SRCREV_colibri-vf = "36b44c6fc7ddde29aec7f39ebcb5cc959d24b469"
+SRCREV_colibri-vf = "2eb36b88d4b5bce64bb3a196fa8b2be5b24bc165"
SRCREV_apalis-imx6 = "36b44c6fc7ddde29aec7f39ebcb5cc959d24b469"
-SRCBRANCH_colibri-vf = "2014.04-toradex"
+SRCBRANCH_colibri-vf = "2014.10-toradex-next"
SRCBRANCH_apalis-imx6 = "2014.04-toradex"
SRC_URI = "git://git.toradex.com/u-boot-toradex.git;protocol=git;branch=${SRCBRANCH} \
file://fw_env.config \
@@ -33,6 +34,13 @@ do_compile () {
oe_runmake env
}
+do_install_colibri-vf () {
+ install -d ${D}${base_sbindir} ${D}${sysconfdir}
+ install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_printenv
+ ln -s fw_printenv ${D}${base_sbindir}/fw_setenv
+ install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/
+}
+
do_install () {
install -d ${D}${base_sbindir} ${D}${sysconfdir}
install -m 755 ${S}/tools/env/fw_printenv_unstripped ${D}${base_sbindir}/fw_printenv
diff --git a/recipes-bsp/u-boot/u-boot-toradex-fsl_git.bb b/recipes-bsp/u-boot/u-boot-toradex-fsl_git.bb
index b833288..dc2c2b3 100644
--- a/recipes-bsp/u-boot/u-boot-toradex-fsl_git.bb
+++ b/recipes-bsp/u-boot/u-boot-toradex-fsl_git.bb
@@ -4,14 +4,15 @@ PROVIDES += "u-boot"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://Licenses/README;md5=025bf9f768cbcb1a165dbe1a110babfb"
+LIC_FILES_CHKSUM_colibri-vf = "file://Licenses/README;md5=c7383a594871c03da76b3707929d2919"
PV = "${PR}+gitr${SRCREV}"
PR = "r0"
S = "${WORKDIR}/git"
-SRCREV_colibri-vf = "36b44c6fc7ddde29aec7f39ebcb5cc959d24b469"
-SRCBRANCH_colibri-vf = "2014.04-toradex"
+SRCREV_colibri-vf = "2eb36b88d4b5bce64bb3a196fa8b2be5b24bc165"
+SRCBRANCH_colibri-vf = "2014.10-toradex-next"
SRCREV_mx6 = "36b44c6fc7ddde29aec7f39ebcb5cc959d24b469"
SRCBRANCH_mx6 = "2014.04-toradex"
SRC_URI = "git://git.toradex.com/u-boot-toradex.git;protocol=git;branch=${SRCBRANCH}"