From 16ccaddd806fec102cd01d2f74c9a7ccba498dd3 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Thu, 1 Dec 2016 17:32:57 +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: Marcel Ziswiler --- ...fw_env.c-include-stdint.h-unconditionally.patch | 37 ---------------------- recipes-bsp/u-boot/u-boot-toradex-fw-utils_git.bb | 13 ++++---- recipes-bsp/u-boot/u-boot-toradex_git.bb | 10 +++--- 3 files changed, 11 insertions(+), 49 deletions(-) delete mode 100644 recipes-bsp/u-boot/files/0001-fw_env.c-include-stdint.h-unconditionally.patch (limited to 'recipes-bsp') 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-fw-utils_git.bb b/recipes-bsp/u-boot/u-boot-toradex-fw-utils_git.bb index a750d1e..9d14574 100644 --- a/recipes-bsp/u-boot/u-boot-toradex-fw-utils_git.bb +++ b/recipes-bsp/u-boot/u-boot-toradex-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" @@ -14,19 +14,18 @@ DEFAULT_PREFERENCE_colibri-t30 = "1" FILESPATHPKG =. "git:" S="${WORKDIR}/git" -# This revision is based on upstream "v2015.04" -SRCREV = "95b2e908c6aecaefccbad3f3fa808f8ffe1b3a92" -SRCBRANCH = "2015.04-toradex" +# This revision is based on upstream "v2016.11" +SRCREV = "2cb59d1289cb7994c98f9c91f94ed7bd7b279d93" +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_tegra3 = " file://fw_unlock_mmc.sh \ " SRC_URI_append_tegra124 = " file://fw_unlock_mmc.sh \ " -PV = "v2015.04-v2.6.1b2+git${SRCPV}" +PV = "v2016.11-v2.6.2b1+git${SRCPV}" S = "${WORKDIR}/git" @@ -34,7 +33,7 @@ S = "${WORKDIR}/git" CC_remove = "-mfpu=neon" EXTRA_OEMAKE = 'CC="${CC}"' -INSANE_SKIP_${PN} = "already-stripped" +INSANE_SKIP_${PN} = "already-stripped ldflags" inherit uboot-config diff --git a/recipes-bsp/u-boot/u-boot-toradex_git.bb b/recipes-bsp/u-boot/u-boot-toradex_git.bb index 737e059..52be5dd 100644 --- a/recipes-bsp/u-boot/u-boot-toradex_git.bb +++ b/recipes-bsp/u-boot/u-boot-toradex_git.bb @@ -4,7 +4,7 @@ PROVIDES = "u-boot virtual/bootloader" DEPENDS += "dtc-native" LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://Licenses/README;md5=c7383a594871c03da76b3707929d2919" +LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6" COMPATIBLE_MACHINE = "(apalis-t30|apalis-tk1|colibri-t20|colibri-t30)" @@ -15,12 +15,12 @@ DEFAULT_PREFERENCE_colibri-t30 = "1" FILESPATHPKG =. "git:" S="${WORKDIR}/git" -# This revision is based on upstream "v2015.04" -SRCREV = "95b2e908c6aecaefccbad3f3fa808f8ffe1b3a92" -SRCBRANCH = "2015.04-toradex" +# This revision is based on upstream "v2016.11" +SRCREV = "2cb59d1289cb7994c98f9c91f94ed7bd7b279d93" +SRCBRANCH = "2016.11-toradex-next" SRC_URI = "git://git.toradex.com/u-boot-toradex.git;protocol=git;branch=${SRCBRANCH}" -PV = "v2015.04-v2.6.1b2+git${SRCPV}" +PV = "v2016.11-v2.6.2b1+git${SRCPV}" # require u-boot-dtb-tegra.bin to be used UBOOT_IMAGE = "u-boot-dtb-tegra-${MACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" -- cgit v1.2.3