From: Ting Liu <[email protected]> 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 <[email protected]> --- .../u-boot-qoriq/0001-uboot-support-gcc5.patch | 90 ---------------------- ...ot-qoriq_2015.01.bb => u-boot-qoriq_2016.01.bb} | 26 +++---- 2 files changed, 9 insertions(+), 107 deletions(-) delete mode 100644 recipes-bsp/u-boot/u-boot-qoriq/0001-uboot-support-gcc5.patch rename recipes-bsp/u-boot/{u-boot-qoriq_2015.01.bb => u-boot-qoriq_2016.01.bb} (80%) diff --git a/recipes-bsp/u-boot/u-boot-qoriq/0001-uboot-support-gcc5.patch b/recipes-bsp/u-boot/u-boot-qoriq/0001-uboot-support-gcc5.patch deleted file mode 100644 index c269df0..0000000 --- a/recipes-bsp/u-boot/u-boot-qoriq/0001-uboot-support-gcc5.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 3afcde1104f3fa9102911467929d5752eff484aa Mon Sep 17 00:00:00 2001 -From: Chunrong Guo <[email protected]> -Date: Thu, 29 Oct 2015 03:18:58 -0500 -Subject: [PATCH] uboot : support gcc5 - - -Fixed the following build errors with gcc5: - |error: linux/compiler-gcc5.h: No such file or directory - -Upstream-Status: Pending - ---- - include/linux/compiler-gcc5.h | 65 +++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 65 insertions(+) - create mode 100644 include/linux/compiler-gcc5.h - -diff --git a/include/linux/compiler-gcc5.h b/include/linux/compiler-gcc5.h -new file mode 100644 -index 0000000..c8c5659 ---- /dev/null -+++ b/include/linux/compiler-gcc5.h -@@ -0,0 +1,65 @@ -+#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. -+ * -+ * (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.3.3 - 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 80% 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 2695c14..284d30a 100644 --- a/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb +++ b/recipes-bsp/u-boot/u-boot-qoriq_2016.01.bb @@ -1,6 +1,8 @@ require recipes-bsp/u-boot/u-boot.inc +inherit fsl-u-boot-localversion -DESCRIPTION = "U-Boot provided by Freescale with focus on QorIQ Layerscape1 boards" +DESCRIPTION = "U-Boot provided by Freescale with focus on QorIQ boards" +PROVIDES += "u-boot" LICENSE = "GPLv2 & BSD-3-Clause & BSD-2-Clause & LGPL-2.0 & LGPL-2.1" LIC_FILES_CHKSUM = " \ file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ @@ -10,21 +12,16 @@ LIC_FILES_CHKSUM = " \ file://Licenses/lgpl-2.1.txt;md5=4fbd65380cdd255951079008b364516c \ " -SRCBRANCH = "master" -SRC_URI = "git://git.freescale.com/ppc/sdk/u-boot.git;branch=${SRCBRANCH}" -SRC_URI += "file://0001-uboot-support-gcc5.patch \ +DEPENDS_append = " change-file-endianess-native dtc-native tcl-native" + +SRC_URI = "git://git.freescale.com/ppc/sdk/u-boot.git;branch=sdk-v2.0.x \ file://fix-build-error-under-gcc6.patch \ " -SRCREV = "6ba8eedbcdc4b063f59a63e6288b938af739e8ad" - -LOCALVERSION ?= "+ls1" +SRCREV = "a9b437f50e2051f8d42ec9e1a6df52de4bc00e1e" S = "${WORKDIR}/git" -inherit fsl-u-boot-localversion - -DEPENDS += "change-file-endianess-native dtc-native" -PROVIDES += "u-boot" +LOCALVERSION ?= "+fsl" do_compile_append () { unset i j @@ -51,9 +48,4 @@ do_compile_append () { PACKAGES += "${PN}-images" FILES_${PN}-images += "/boot" - -ALLOW_EMPTY_${PN} = "1" - -PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE = "(ls102xa)" - +COMPATIBLE_MACHINE = "(qoriq)" -- 1.9.2 -- _______________________________________________ meta-freescale mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-freescale
