* Licence have no idea what changed in the license file README. For plausibility a grep here on checksum a2c678cfd4a4d97135585cad908541c6 unveiled:
recipes-bsp/u-boot/u-boot-boundary-common_2017.07.inc recipes-bsp/u-boot/u-boot-toradex.inc recipes-bsp/u-boot/u-boot-boundary-common_2017.03.imx8m.inc All these set license to GPLv2+ - so we should be fine. * Fix-the-compile-issue-under-gcc6.patch Later versions of u-boot support a version independent gcc header file making the patch obsolete * COMPATIBLE_MACHINE resrict to imx6qdl-variscite-som Signed-off-by: Andreas Müller <schnitzelt...@gmail.com> --- .../Fix-the-compile-issue-under-gcc6.patch | 92 ---------------------- ...cite_2015.04.bb => u-boot-variscite_2017.03.bb} | 9 +-- 2 files changed, 4 insertions(+), 97 deletions(-) delete mode 100644 recipes-bsp/u-boot/u-boot-variscite-2015.04/Fix-the-compile-issue-under-gcc6.patch rename recipes-bsp/u-boot/{u-boot-variscite_2015.04.bb => u-boot-variscite_2017.03.bb} (53%) diff --git a/recipes-bsp/u-boot/u-boot-variscite-2015.04/Fix-the-compile-issue-under-gcc6.patch b/recipes-bsp/u-boot/u-boot-variscite-2015.04/Fix-the-compile-issue-under-gcc6.patch deleted file mode 100644 index 3d080b6..0000000 --- a/recipes-bsp/u-boot/u-boot-variscite-2015.04/Fix-the-compile-issue-under-gcc6.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 5d39bd421fc093e2c852316080538cef85a9e1a0 Mon Sep 17 00:00:00 2001 -From: yocto <yo...@yocto.org> -Date: Thu, 2 Jun 2016 00:18:33 -0500 -Subject: [PATCH] Fix the compile issue under gcc6 - -Fix the following build error: -| .../include/linux/compiler-gcc.h:106:30: fatal error: linux/compiler-gcc6.h: No such file or directory -| #include gcc_header(__GNUC__) - -Signed-off-by: Zhenhua Luo <zhenhua....@nxp.com> - -Upstream-Status: Pending ---- - include/linux/compiler-gcc6.h | 66 +++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 66 insertions(+) - create mode 100644 include/linux/compiler-gcc6.h - -diff --git a/include/linux/compiler-gcc6.h b/include/linux/compiler-gcc6.h -new file mode 100644 -index 0000000..cdd1cc2 ---- /dev/null -+++ b/include/linux/compiler-gcc6.h -@@ -0,0 +1,66 @@ -+#ifndef __LINUX_COMPILER_H -+#error "Please don't include <linux/compiler-gcc5.h> directly, include <linux/compiler.h> instead." -+#endif -+ -+#define __used __attribute__((__used__)) -+#define __must_check __attribute__((warn_unused_result)) -+#define __compiler_offsetof(a, b) __builtin_offsetof(a, b) -+ -+/* Mark functions as cold. gcc will assume any path leading to a call -+ to them will be unlikely. This means a lot of manual unlikely()s -+ are unnecessary now for any paths leading to the usual suspects -+ like BUG(), printk(), panic() etc. [but let's keep them for now for -+ older compilers] -+ -+ Early snapshots of gcc 4.3 don't support this and we can't detect this -+ in the preprocessor, but we can live with this because they're unreleased. -+ Maketime probing would be overkill here. -+ -+ gcc also has a __attribute__((__hot__)) to move hot functions into -+ a special section, but I don't see any sense in this right now in -+ the kernel context */ -+#define __cold __attribute__((__cold__)) -+ -+#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__) -+ -+#ifndef __CHECKER__ -+# define __compiletime_warning(message) __attribute__((warning(message))) -+# define __compiletime_error(message) __attribute__((error(message))) -+#endif /* __CHECKER__ */ -+ -+/* -+ * Mark a position in code as unreachable. This can be used to -+ * suppress control flow warnings after asm blocks that transfer -+ * control elsewhere. -+ * -+ * Early snapshots of gcc 4.5 don't support this and we can't detect -+ * this in the preprocessor, but we can live with this because they're -+ * unreleased. Really, we need to have autoconf for the kernel. -+ */ -+#define unreachable() __builtin_unreachable() -+ -+/* Mark a function definition as prohibited from being cloned. */ -+#define __noclone __attribute__((__noclone__)) -+ -+/* -+ * Tell the optimizer that something else uses this function or variable. -+ */ -+#define __visible __attribute__((externally_visible)) -+ -+/* -+ * GCC 'asm goto' miscompiles certain code sequences: -+ * -+ * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670 -+ * -+ * Work it around via a compiler barrier quirk suggested by Jakub Jelinek. -+ * Fixed in GCC 4.8.2 and later versions. -+ * -+ * (asm goto is automatically volatile - the naming reflects this.) -+ */ -+#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0) -+ -+#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP -+#define __HAVE_BUILTIN_BSWAP32__ -+#define __HAVE_BUILTIN_BSWAP64__ -+#define __HAVE_BUILTIN_BSWAP16__ -+#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */ --- -2.5.0 - diff --git a/recipes-bsp/u-boot/u-boot-variscite_2015.04.bb b/recipes-bsp/u-boot/u-boot-variscite_2017.03.bb similarity index 53% rename from recipes-bsp/u-boot/u-boot-variscite_2015.04.bb rename to recipes-bsp/u-boot/u-boot-variscite_2017.03.bb index 9dbd58a..818e03e 100644 --- a/recipes-bsp/u-boot/u-boot-variscite_2015.04.bb +++ b/recipes-bsp/u-boot/u-boot-variscite_2017.03.bb @@ -2,19 +2,18 @@ require recipes-bsp/u-boot/u-boot.inc SUMMARY = "U-Boot for Variscite i.MX6Q/DL VAR-SOM-MX6" LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://Licenses/README;md5=c7383a594871c03da76b3707929d2919" -COMPATIBLE_MACHINE = "(mxs|mx6)" +LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6" +COMPATIBLE_MACHINE = "(imx6qdl-variscite-som)" PROVIDES += "u-boot" SPL_BINARY = "SPL" -SRCREV = "d4b69fe88b20223acf36e4c36ea464cd5a866ab2" -SRCBRANCH = "imx_v2015.04_4.1.15_1.1.0_ga_var01" +SRCREV = "3b5f889cb501c9fbe44c750c657dcd9ea4875176" +SRCBRANCH = "imx_v2017.03_4.9.11_1.0.0_ga_var01" SRC_URI = "\ git://github.com/varigit/uboot-imx.git;protocol=git;branch=${SRCBRANCH} \ - file://Fix-the-compile-issue-under-gcc6.patch \ " S = "${WORKDIR}/git" -- 2.14.4 -- _______________________________________________ meta-freescale mailing list meta-freescale@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-freescale