From f60ebada1401e67653cf8fefceec92abb7829120 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Feb 16 2016 09:58:20 +0000 Subject: add patch for gcc6, enable clearfog --- diff --git a/0001-Copy-gcc5-over-to-compiler-gcc6.h-as-a-beginning-of-.patch b/0001-Copy-gcc5-over-to-compiler-gcc6.h-as-a-beginning-of-.patch new file mode 100644 index 0000000..5b64636 --- /dev/null +++ b/0001-Copy-gcc5-over-to-compiler-gcc6.h-as-a-beginning-of-.patch @@ -0,0 +1,87 @@ +From 47bcc5136fe4e9f5bcc352395a723a8e4ac1aef7 Mon Sep 17 00:00:00 2001 +From: Peter Robinson +Date: Wed, 3 Feb 2016 09:08:39 +0000 +Subject: [PATCH] Copy gcc5 over to compiler-gcc6.h as a beginning of support + +Add initial support for gcc6 by taking a copy of compiler-gcc5.h + +Signed-off-by: Peter Robinson +--- + 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..622117b +--- /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/0001-wandboard-fix-variable-name-so-PXE-boot-works.patch b/0001-wandboard-fix-variable-name-so-PXE-boot-works.patch deleted file mode 100644 index 239d122..0000000 --- a/0001-wandboard-fix-variable-name-so-PXE-boot-works.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 157e782c643ee8359086e355a78104149395a1b0 Mon Sep 17 00:00:00 2001 -From: Peter Robinson -Date: Wed, 20 Jan 2016 01:26:16 +0000 -Subject: [PATCH] wandboard: fix variable name so PXE boot works - -All boards that support PXE booting use the pxefile_addr_r variable. Standardise -wandboard with this variable as pxe_addr_r isn't used anywhere else so it's a -typo. - -Signed-off-by: Peter Robinson ---- - include/configs/wandboard.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h -index 4c8e9e9..8fb0abc 100644 ---- a/include/configs/wandboard.h -+++ b/include/configs/wandboard.h -@@ -150,7 +150,7 @@ - "if test $fdtfile = undefined; then " \ - "echo WARNING: Could not determine dtb to use; fi; \0" \ - "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ -- "pxe_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ -+ "pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ - "ramdisk_addr_r=0x13000000\0" \ - "ramdiskaddr=0x13000000\0" \ - "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \ --- -2.5.0 - diff --git a/armv7-boards b/armv7-boards index 2f0d457..1e6b860 100644 --- a/armv7-boards +++ b/armv7-boards @@ -17,6 +17,7 @@ Bananapi Bananapro CHIP Chuwi_V7_CW0825 +clearfog cm_fx6 Colombus CSQ_CS908 diff --git a/uboot-tools.spec b/uboot-tools.spec index d510c0e..0b515fb 100644 --- a/uboot-tools.spec +++ b/uboot-tools.spec @@ -13,7 +13,7 @@ Source1: armv7-boards Patch1: 0004-Add-BOOTENV_INIT_COMMAND-for-commands-that-may-be-ne.patch Patch2: 0005-port-utilite-to-distro-generic-boot-commands.patch -#Patch5: 0001-wandboard-fix-variable-name-so-PXE-boot-works.patch +Patch3: 0001-Copy-gcc5-over-to-compiler-gcc6.h-as-a-beginning-of-.patch BuildRequires: bc BuildRequires: dtc @@ -165,6 +165,7 @@ install -p -m 0644 tools/env/fw_env.config $RPM_BUILD_ROOT%{_sysconfdir} %changelog * Tue Feb 16 2016 Peter Robinson 2016.03-0.2rc2 - Update to 2016.03 RC2 +- Enable SolidRun Clearfog * Wed Feb 3 2016 Peter Robinson 2016.03-0.1rc1 - Update to 2016.03 RC1