From 9f16ecb750ac4881889ee9ab841a0737949a8be4 Mon Sep 17 00:00:00 2001 From: Dalon Westergreen Date: Fri, 13 Jan 2017 16:30:40 -0800 Subject: Add u-boot-socfpga_v2013.01.01 back v2013.01.01 is the officially supported uboot version for socfpga, per Yves' request, adding support for this version back in. Signed-off-by: Dalon Westergreen --- .../u-boot/files/fix-build-error-under-gcc6.patch | 91 ++++++++++++++++++++++ .../v2014.10/fix-build-error-under-gcc6.patch | 91 ---------------------- recipes-bsp/u-boot/u-boot-socfpga_v2013.01.01.bb | 23 ++++++ recipes-bsp/u-boot/u-boot-socfpga_v2014.10.bb | 2 +- 4 files changed, 115 insertions(+), 92 deletions(-) create mode 100644 recipes-bsp/u-boot/files/fix-build-error-under-gcc6.patch delete mode 100644 recipes-bsp/u-boot/files/v2014.10/fix-build-error-under-gcc6.patch create mode 100644 recipes-bsp/u-boot/u-boot-socfpga_v2013.01.01.bb diff --git a/recipes-bsp/u-boot/files/fix-build-error-under-gcc6.patch b/recipes-bsp/u-boot/files/fix-build-error-under-gcc6.patch new file mode 100644 index 0000000..18c5e74 --- /dev/null +++ b/recipes-bsp/u-boot/files/fix-build-error-under-gcc6.patch @@ -0,0 +1,91 @@ +From 07373b2e477ae61f9f6a0e2eff41be3276d92923 Mon Sep 17 00:00:00 2001 +From: yocto +Date: Thu, 2 Jun 2016 03:21:51 -0500 +Subject: [PATCH] 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 */ +-- +2.5.0 + diff --git a/recipes-bsp/u-boot/files/v2014.10/fix-build-error-under-gcc6.patch b/recipes-bsp/u-boot/files/v2014.10/fix-build-error-under-gcc6.patch deleted file mode 100644 index 18c5e74..0000000 --- a/recipes-bsp/u-boot/files/v2014.10/fix-build-error-under-gcc6.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 07373b2e477ae61f9f6a0e2eff41be3276d92923 Mon Sep 17 00:00:00 2001 -From: yocto -Date: Thu, 2 Jun 2016 03:21:51 -0500 -Subject: [PATCH] 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 */ --- -2.5.0 - diff --git a/recipes-bsp/u-boot/u-boot-socfpga_v2013.01.01.bb b/recipes-bsp/u-boot/u-boot-socfpga_v2013.01.01.bb new file mode 100644 index 0000000..449f6c3 --- /dev/null +++ b/recipes-bsp/u-boot/u-boot-socfpga_v2013.01.01.bb @@ -0,0 +1,23 @@ +require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot.inc +PR="r1" + +SRCREV = "95ab599e1ad7840e08be0aa567eea3fca357572f" + +UBOOT_BRANCH ?= "socfpga_${PV}" +UBOOT_REPO ?= "git://github.com/altera-opensource/u-boot-socfpga.git" +UBOOT_PROT ?= "https" + +SRC_URI = "\ + ${UBOOT_REPO};protocol=${UBOOT_PROT};branch=${UBOOT_BRANCH} \ + file://fix-build-error-under-gcc6.patch \ + " + +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://README;md5=176c127db28f1a9e8d88f682a2a34963" + +DEPENDS += "dtc-native" + +UBOOT_CONFIG[cyclone5-socdk] = "socfpga_cyclone5_config" + +SPL_BINARY_cyclone5 = "spl/u-boot-spl.bin" +SPL_BINARY_arria5 = "spl/u-boot-spl.bin" diff --git a/recipes-bsp/u-boot/u-boot-socfpga_v2014.10.bb b/recipes-bsp/u-boot/u-boot-socfpga_v2014.10.bb index 7804080..3b9b885 100644 --- a/recipes-bsp/u-boot/u-boot-socfpga_v2014.10.bb +++ b/recipes-bsp/u-boot/u-boot-socfpga_v2014.10.bb @@ -9,7 +9,7 @@ UBOOT_PROT ?= "https" SRC_URI = "\ ${UBOOT_REPO};protocol=${UBOOT_PROT};branch=${UBOOT_BRANCH} \ - file://v2014.10/fix-build-error-under-gcc6.patch \ + file://fix-build-error-under-gcc6.patch \ " LICENSE = "GPLv2+" -- cgit v1.2.3-54-g00ecf