From 4434639d39e2649db08b3d06636b7e7e298a9b7c Mon Sep 17 00:00:00 2001 From: Chunrong Guo Date: Wed, 18 Oct 2017 13:06:42 +0800 Subject: [PATCH] uboot: upgrade to 2017.09 *This includes the following changes: 503eff0 - armv8: ls1046aqds: Fix NAND offset for Fman ucode and env c66ddf7 - arm64: ls2088ardb: Fix kernel validation failure 44ffe98 - armv8: ls1043ardb: disable PPA loading during SPL stage for SD boot 043c85a - armv8: ls1046ardb: disable PPA loading during SPL stage for SD boot b68c991 - armv8: fsl-layerscape: Fix some coding style problems in soc.c 25cd705 - board/ls1088: Add fsl_fdt_fixup_flash 85bfc58 - ls1088aqds: Enable IFC and QIXIS in SPL image 96cc4d7 - armv8: fsl-layerscape: Add back L3 flushing for all exception levels bdf9c1a - fsl-lsch2: csu: correct the workaround A-010315 26aaf13 - armv8/fsl-lsch2: correct QMAN clock a836f94 - arm64: ls1012ardb: Add distro secure boot support ef3b345 - arm64: ls1012afrdm: Add distro boot support 2bed40e - arm64: ls1012ardb: Add distro boot support bb85ef3 - board: common: vid: Move IR chip specific code in flag 806bca8 - board/ls2080ardb: Add mcmemsize variable in default env Signed-off-by: Chunrong Guo Signed-off-by: Otavio Salvador --- .../fix-build-error-under-gcc6.patch | 86 ------------------- ...riq_2017.03.bb => u-boot-qoriq_2017.09.bb} | 3 +- 2 files changed, 1 insertion(+), 88 deletions(-) delete mode 100644 recipes-bsp/u-boot/u-boot-qoriq/fix-build-error-under-gcc6.patch rename recipes-bsp/u-boot/{u-boot-qoriq_2017.03.bb => u-boot-qoriq_2017.09.bb} (97%) diff --git a/recipes-bsp/u-boot/u-boot-qoriq/fix-build-error-under-gcc6.patch b/recipes-bsp/u-boot/u-boot-qoriq/fix-build-error-under-gcc6.patch deleted file mode 100644 index 839cd7df..00000000 --- a/recipes-bsp/u-boot/u-boot-qoriq/fix-build-error-under-gcc6.patch +++ /dev/null @@ -1,86 +0,0 @@ -fix build error under gcc6 - -Fix the following error: -| ../include/linux/compiler-gcc.h:114:30: fatal error: linux/compiler-gcc6.h: No such file or directory -| #include gcc_header(__GNUC__) - -Signed-off-by: Zhenhua Luo - -Upstream-Status: Pending ---- - include/linux/compiler-gcc6.h | 65 +++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 65 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..c8c5659 ---- /dev/null -+++ b/include/linux/compiler-gcc6.h -@@ -0,0 +1,65 @@ -+#ifndef __LINUX_COMPILER_H -+#error "Please don't include directly, include 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. -+ * -+ * (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 */ --- diff --git a/recipes-bsp/u-boot/u-boot-qoriq_2017.03.bb b/recipes-bsp/u-boot/u-boot-qoriq_2017.09.bb similarity index 97% rename from recipes-bsp/u-boot/u-boot-qoriq_2017.03.bb rename to recipes-bsp/u-boot/u-boot-qoriq_2017.09.bb index 5bde945d..ed998288 100644 --- a/recipes-bsp/u-boot/u-boot-qoriq_2017.03.bb +++ b/recipes-bsp/u-boot/u-boot-qoriq_2017.09.bb @@ -19,9 +19,8 @@ DEPENDS_append_qoriq-arm = " change-file-endianess-native dtc-native tcl-native" DEPENDS_append_qoriq-ppc = " boot-format-native" SRC_URI = "git://github.com/qoriq-open-source/u-boot.git;nobranch=1 \ - file://fix-build-error-under-gcc6.patch \ " -SRCREV = "6fc2946a7b1973a8221cdfeccd1666f2d8eec467" +SRCREV = "503eff00a7119d2690a662ed64e83e4782b7d3d9" S = "${WORKDIR}/git" -- 2.40.1