From 79ba856434b0e2d28352afe7828fd00faa91f71a Mon Sep 17 00:00:00 2001 From: Ting Liu Date: Sat, 16 Jul 2016 00:35:42 +0800 Subject: [PATCH] u-boot-qoriq: upgrade to 2016.01 plus fsl patches The main features are: * Upgrade to 2016.01 * On ARM platforms, the U-Boot image includes the device tree * Non-secure and Secure Boot (ESBC) * Primary Protected Application (PPA) firmware integration [LS1043A] * Clock, CPLD, DUART, DDR3, DDR4, DSPI, eSDHC, GIC-400, GIC-500, I2C, OCRAM, PCIe, USB 2 & 3, SATA, UART * Networking support using eTSEC, FMAN Independent Mode or DPAA2 networking * DCU, eMMC 4.5, I2C3, LPUART, QSPI [LS1021A] * eLBC and IFC access to NOR and NAND flash * Boot from NOR, NAND flash, eSPI, SDHC * Boot from SRIO [B4860, P5020, P4080] * Voltage ID (board specific) * CodeWarrior debug patch for U-Boot Detailed commit log can be found at: http://git.freescale.com/git/cgit.cgi/ppc/sdk/u-boot.git/log/?h=sdk-v2.0.x Signed-off-by: Ting Liu Signed-off-by: Otavio Salvador --- .../add-fgnu89-inline-option-for-gcc5.patch | 39 -------- recipes-bsp/u-boot/files/gcc5.patch | 91 ------------------- .../fix-build-error-under-gcc6.patch | 0 ...riq_2015.01.bb => u-boot-qoriq_2016.01.bb} | 6 +- 4 files changed, 2 insertions(+), 134 deletions(-) delete mode 100644 recipes-bsp/u-boot/files/add-fgnu89-inline-option-for-gcc5.patch delete mode 100644 recipes-bsp/u-boot/files/gcc5.patch rename recipes-bsp/u-boot/{files => u-boot-qoriq}/fix-build-error-under-gcc6.patch (100%) rename recipes-bsp/u-boot/{u-boot-qoriq_2015.01.bb => u-boot-qoriq_2016.01.bb} (97%) diff --git a/recipes-bsp/u-boot/files/add-fgnu89-inline-option-for-gcc5.patch b/recipes-bsp/u-boot/files/add-fgnu89-inline-option-for-gcc5.patch deleted file mode 100644 index cfe1c07a..00000000 --- a/recipes-bsp/u-boot/files/add-fgnu89-inline-option-for-gcc5.patch +++ /dev/null @@ -1,39 +0,0 @@ -Upstream-Status: Pending - -From 4d4fcfc41288134b48b72ac69702f68741d7631f Mon Sep 17 00:00:00 2001 -From: Ting Liu -Date: Tue, 28 Jul 2015 16:29:26 +0800 -Subject: [PATCH] add -fgnu89-inline option for gcc5 - -Fix the below build issues: - CC drivers/crypto/fsl/sec.o - LD arch/powerpc/cpu/mpc8xxx/built-in.o -arch/powerpc/cpu/mpc8xxx/fdt.o: In function `ld_le16': -../arch/powerpc/include/asm/byteorder.h:12: multiple definition of `ld_le16' - -The problem is the change of the default C standard from gnu89 to gnu11 -which changes the semantics of 'inline'. The issue is described in the -Porting guide at https://gcc.gnu.org/gcc-5/porting_to.html. Adding the -'-fgnu89-inline' option fixes the issue. - -Signed-off-by: Ting Liu ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 9995e00..00497cc 100644 ---- a/Makefile -+++ b/Makefile -@@ -349,7 +349,7 @@ CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ \ - - KBUILD_CPPFLAGS := -D__KERNEL__ -D__UBOOT__ - --KBUILD_CFLAGS := -Wall -Wstrict-prototypes \ -+KBUILD_CFLAGS := -fgnu89-inline -Wall -Wstrict-prototypes \ - -Wno-format-security \ - -fno-builtin -ffreestanding - KBUILD_AFLAGS := -D__ASSEMBLY__ --- -1.9.2 - diff --git a/recipes-bsp/u-boot/files/gcc5.patch b/recipes-bsp/u-boot/files/gcc5.patch deleted file mode 100644 index 12db94ca..00000000 --- a/recipes-bsp/u-boot/files/gcc5.patch +++ /dev/null @@ -1,91 +0,0 @@ -Upstream-Status: Backport - -From 478b02f1a7043b673565075ea5016376f3293b23 Mon Sep 17 00:00:00 2001 -From: Hans de Goede -Date: Sat, 7 Feb 2015 22:52:40 +0100 -Subject: [PATCH] Add linux/compiler-gcc5.h to fix builds with gcc5 - -Add linux/compiler-gcc5/h from the kernel sources at: - -commit 5631b8fba640a4ab2f8a954f63a603fa34eda96b -Author: Steven Noonan -Date: Sat Oct 25 15:09:42 2014 -0700 - - compiler/gcc4+: Remove inaccurate comment about 'asm goto' miscompiles - -Signed-off-by: Hans de Goede ---- - include/linux/compiler-gcc5.h | 65 +++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 65 insertions(+) - create mode 100644 include/linux/compiler-gcc5.h - -Index: git/include/linux/compiler-gcc5.h -=================================================================== ---- /dev/null -+++ git/include/linux/compiler-gcc5.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/files/fix-build-error-under-gcc6.patch b/recipes-bsp/u-boot/u-boot-qoriq/fix-build-error-under-gcc6.patch similarity index 100% rename from recipes-bsp/u-boot/files/fix-build-error-under-gcc6.patch rename to recipes-bsp/u-boot/u-boot-qoriq/fix-build-error-under-gcc6.patch diff --git a/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb b/recipes-bsp/u-boot/u-boot-qoriq_2016.01.bb similarity index 97% rename from recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb rename to recipes-bsp/u-boot/u-boot-qoriq_2016.01.bb index 8b20b5ad..601edbd3 100644 --- a/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb +++ b/recipes-bsp/u-boot/u-boot-qoriq_2016.01.bb @@ -22,13 +22,11 @@ DEPENDS_append_qoriq-ppc = " boot-format-native" inherit deploy -SRCBRANCH = "sdk-v1.9.x" +SRCBRANCH = "sdk-v2.0.x" SRC_URI = "git://git.freescale.com/ppc/sdk/u-boot.git;branch=${SRCBRANCH} \ - file://gcc5.patch \ - file://add-fgnu89-inline-option-for-gcc5.patch \ file://fix-build-error-under-gcc6.patch \ " -SRCREV = "eb3d4fc5759729d7af71ac31ebf6a7e8d0e79da3" +SRCREV = "a9b437f50e2051f8d42ec9e1a6df52de4bc00e1e" python () { if d.getVar("TCMODE", True) == "external-fsl": -- 2.40.1