From 7efea12005acac3f9f84c529cd0b2e1adae6a61c Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Thu, 17 Nov 2016 18:55:22 +0100 Subject: u-boot: upgrade to 2016.11 based version 0001-fw_env.c-include-stdint.h-unconditionally.patch has been fixed upstream. Signed-off-by: Max Krummenacher Acked-by: Stefan Agner --- ...fw_env.c-include-stdint.h-unconditionally.patch | 37 ----------------- .../u-boot/u-boot-toradex-fsl-fw-utils_git.bb | 11 +++-- recipes-bsp/u-boot/u-boot-toradex_2016.11.bb | 48 ++++++++++++++++++++++ 3 files changed, 53 insertions(+), 43 deletions(-) delete mode 100644 recipes-bsp/u-boot/files/0001-fw_env.c-include-stdint.h-unconditionally.patch create mode 100644 recipes-bsp/u-boot/u-boot-toradex_2016.11.bb (limited to 'recipes-bsp/u-boot') diff --git a/recipes-bsp/u-boot/files/0001-fw_env.c-include-stdint.h-unconditionally.patch b/recipes-bsp/u-boot/files/0001-fw_env.c-include-stdint.h-unconditionally.patch deleted file mode 100644 index ae1524d..0000000 --- a/recipes-bsp/u-boot/files/0001-fw_env.c-include-stdint.h-unconditionally.patch +++ /dev/null @@ -1,37 +0,0 @@ -From a7a2fd28dc4180f1cbadf6038b67337ae6fdee34 Mon Sep 17 00:00:00 2001 -From: Max Krummenacher -Date: Thu, 26 May 2016 14:01:35 +0200 -Subject: [PATCH] fw_env.c: include stdint.h unconditionally - -later builds fail with -| tools/env/fw_env.c:52:2: error: unknown type name 'uint8_t' -| uint8_t mtd_type; /* type of the MTD device */ - -Signed-off-by: Max Krummenacher ---- - tools/env/fw_env.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c -index 1173eea..edc5090 100644 ---- a/tools/env/fw_env.c -+++ b/tools/env/fw_env.c -@@ -15,6 +15,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -22,7 +23,6 @@ - #include - - #ifdef MTD_OLD --# include - # include - #else - # define __user /* nothing */ --- -2.6.6 - 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 753c720..554e75c 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,6 +1,6 @@ SUMMARY = "U-boot bootloader fw_printenv/setenv utils" LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://Licenses/README;md5=c7383a594871c03da76b3707929d2919" +LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6" SECTION = "bootloader" PROVIDES = "u-boot-fw-utils" DEPENDS = "mtd-utils" @@ -13,22 +13,21 @@ DEFAULT_PREFERENCE_colibri-vf = "1" FILESPATHPKG =. "git:" S="${WORKDIR}/git" -SRCREV = "7e24d38e215f7c37bebd7c2b8b9b911386a13490" -SRCBRANCH = "2015.04-toradex-next" +SRCREV = "0cca0bafe5a9690c68a0ec971a520b61a09714b5" +SRCBRANCH = "2016.11-toradex-next" SRC_URI = "git://git.toradex.com/u-boot-toradex.git;protocol=git;branch=${SRCBRANCH} \ file://fw_env.config \ - file://0001-fw_env.c-include-stdint.h-unconditionally.patch \ " SRC_URI_append_mx6 = " file://fw_unlock_mmc.sh \ " -PV = "v2015.04-v2.6.2b1+git${SRCPV}" +PV = "v2016.11-v2.6.2b1+git${SRCPV}" S = "${WORKDIR}/git" EXTRA_OEMAKE = 'CC="${CC}" STRIP="${STRIP}"' -INSANE_SKIP_${PN} = "already-stripped" +INSANE_SKIP_${PN} = "already-stripped ldflags" inherit uboot-config diff --git a/recipes-bsp/u-boot/u-boot-toradex_2016.11.bb b/recipes-bsp/u-boot/u-boot-toradex_2016.11.bb new file mode 100644 index 0000000..d2a979d --- /dev/null +++ b/recipes-bsp/u-boot/u-boot-toradex_2016.11.bb @@ -0,0 +1,48 @@ +include recipes-bsp/u-boot/u-boot-toradex.inc + +PV = "v2016.11-v2.6.2b1+git${SRCPV}" + +LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6" + +SRCREV = "0cca0bafe5a9690c68a0ec971a520b61a09714b5" +SRCBRANCH = "2016.11-toradex-next" +COMPATIBLE_MACHINE = "(mx6|mx7|vf)" + + +# Hack around building two U-Boot configurations, one with, one without SPL +# if using UBOOT_CONFIG to build more than one configuration, the current code in +# u-boot.inc assumes all are either with or without SPL. +do_deploy_prepend_mx6() { + for config in ${UBOOT_MACHINE}; do + touch ${B}/${config}/${SPL_BINARY} + done +} +do_deploy_append_mx6() { + # if SPL is zero sized file, remove all deployed artefacts + if [ -n "${SPL_BINARY}" ] + then + if [ -n "${UBOOT_CONFIG}" ] + then + for config in ${UBOOT_MACHINE}; do + i=$(expr $i + 1); + for type in ${UBOOT_CONFIG}; do + j=$(expr $j + 1); + if [ $j -eq $i ] + then + if [ ! -s ${DEPLOYDIR}/${SPL_IMAGE}-${type}-${PV}-${PR} ] + then + rm -f ${DEPLOYDIR}/${SPL_IMAGE}-${type}-${PV}-${PR} + rm -f ${DEPLOYDIR}/${SPL_BINARYNAME}-${type} + rm -f ${DEPLOYDIR}/${SPL_SYMLINK}-${type} + rm -f ${DEPLOYDIR}/${SPL_SYMLINK} + else + ln -sf ${SPL_IMAGE}-${type}-${PV}-${PR} ${SPL_BINARYNAME} + fi + fi + done + unset j + done + unset i + fi + fi +} -- cgit v1.2.3