libre-testing/uboot4extlinux-*: new versions and configs

also patch old u-boot tarballs to build with gcc7

3 files changed, 16 insertions, 46 deletions

diff --git a/libre-testing/uboot4extlinux-nitrogen6q/0002-kernel-add-support-for-gcc-5.patch b/libre-testing/uboot4extlinux-nitrogen6q/0002-kernel-add-support-for-gcc-7.patch
index 30718c561..ca59b159a 100644
--- a/libre-testing/uboot4extlinux-nitrogen6q/0002-kernel-add-support-for-gcc-5.patch
+++ b/libre-testing/uboot4extlinux-nitrogen6q/0002-kernel-add-support-for-gcc-7.patch
@@ -1,33 +1,11 @@
-From 5b07fc2c680ad4279a45d863108544020b4d74cd Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sasha.levin@oracle.com>
-Date: Mon, 13 Oct 2014 15:51:05 -0700
-Subject: [PATCH 2/6] kernel: add support for gcc 5
-
-We're missing include/linux/compiler-gcc5.h which is required now
-because gcc branched off to v5 in trunk.
-
-Just copy the relevant bits out of include/linux/compiler-gcc4.h,
-no new code is added as of now.
-
-This fixes a build error when using gcc 5.
-
-Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
-Cc: <stable@vger.kernel.org>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
----
- include/linux/compiler-gcc5.h | 66 +++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 66 insertions(+)
- create mode 100644 include/linux/compiler-gcc5.h
-
-diff --git a/include/linux/compiler-gcc5.h b/include/linux/compiler-gcc5.h
+diff --git a/include/linux/compiler-gcc7.h b/include/linux/compiler-gcc7.h
 new file mode 100644
-index 0000000..cdd1cc2
+index 0000000..ba064fa
 --- /dev/null
-+++ b/include/linux/compiler-gcc5.h
-@@ -0,0 +1,66 @@
++++ b/include/linux/compiler-gcc7.h
+@@ -0,0 +1,59 @@
 +#ifndef __LINUX_COMPILER_H
-+#error "Please don't include <linux/compiler-gcc5.h> directly, include <linux/compiler.h> instead."
++#error "Please don't include <linux/compiler-gcc7.h> directly, include <linux/compiler.h> instead."
 +#endif
 +
 +#define __used				__attribute__((__used__))
@@ -40,10 +18,6 @@ index 0000000..cdd1cc2
 +   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 */
@@ -60,10 +34,6 @@ index 0000000..cdd1cc2
 + * 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()
 +
@@ -81,7 +51,6 @@ index 0000000..cdd1cc2
 + *   http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670
 + *
 + * Work it around via a compiler barrier quirk suggested by Jakub Jelinek.
-+ * Fixed in GCC 4.8.2 and later versions.
 + *
 + * (asm goto is automatically volatile - the naming reflects this.)
 + */
@@ -92,6 +61,8 @@ index 0000000..cdd1cc2
 +#define __HAVE_BUILTIN_BSWAP64__
 +#define __HAVE_BUILTIN_BSWAP16__
 +#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */
++
++#define KASAN_ABI_VERSION 4
 -- 
-2.4.4
+2.1.4
 
diff --git a/libre-testing/uboot4extlinux-nitrogen6q/PKGBUILD b/libre-testing/uboot4extlinux-nitrogen6q/PKGBUILD
index cf16bd4f1..009cd629a 100644
--- a/libre-testing/uboot4extlinux-nitrogen6q/PKGBUILD
+++ b/libre-testing/uboot4extlinux-nitrogen6q/PKGBUILD
@@ -1,7 +1,6 @@
 # U-Boot: Boundary Devices Nitrogen6X/Sabre Lite
-# Maintainer: André Silva <emulatorman@parabola.nu>
-
-buildarch=4
+# Maintainer: Isaac David <isacdaavid@at@isacdaavid@dot@info>
+# Contributor: André Silva <emulatorman@parabola.nu>
 
 pkgname=uboot4extlinux-nitrogen6q
 pkgver=2014.07
@@ -17,7 +16,7 @@ install=${pkgname}.install
 _commit=bb9dde563768731423fd6c560e95e1793a90710a
 source=("https://github.com/boundarydevices/u-boot-imx6/archive/${_commit}.tar.gz"
         '0001-parabola-arm-modifications.patch'
-        '0002-kernel-add-support-for-gcc-5.patch'
+        '0002-kernel-add-support-for-gcc-7.patch'
         '0003-ARM-asm-io.h-use-static-inline.patch'
         '0004-common-main.c-make-show_boot_progress-__weak.patch'
         '0005-common-board-use-__weak.patch'
@@ -25,7 +24,7 @@ source=("https://github.com/boundarydevices/u-boot-imx6/archive/${_commit}.tar.g
         'extlinux.conf')
 sha256sums=('d06ad5e6b9adb84e7bfa99f8d5335ef06d48b351809e6f65e83a92c0e8a4d3ce'
             '1592a845ef7a229e5d370586edf344502f3ded5c24c853c790b600e8ef0128c7'
-            '257269c4573712d3454b7c6d53d04b45af1166cb65dd9df73bd397a087f85e1e'
+            '9e80aa27cccdb07b03d56a970f247c91d586d0b936868c076c20acc2e68a3968'
             '2fb98981885fbffba32fadb7b4a321e5540278c2a97f39b2700ad14c2ddb4d2a'
             '83f56e80b09d010a7d0f9cc18d4df43c7f100ee3a815421f2ccbf2c337ae5431'
             'bb9f0bde66266998db0eae3204346364568bab963fe7be1086d633339652b70c'
@@ -36,7 +35,7 @@ prepare() {
   cd u-boot-imx6-${_commit}
 
   patch -Np1 -i ../0001-parabola-arm-modifications.patch
-  patch -Np1 -i ../0002-kernel-add-support-for-gcc-5.patch
+  patch -Np1 -i ../0002-kernel-add-support-for-gcc-7.patch
   patch -Np1 -i ../0003-ARM-asm-io.h-use-static-inline.patch
   patch -Np1 -i ../0004-common-main.c-make-show_boot_progress-__weak.patch
   patch -Np1 -i ../0005-common-board-use-__weak.patch
@@ -45,10 +44,10 @@ prepare() {
 
 build() {
   cd u-boot-imx6-${_commit}
-  
+
   unset CFLAGS
   unset CXXFLAGS
-  
+
   make distclean
   make nitrogen6q_config
   make
diff --git a/libre-testing/uboot4extlinux-nitrogen6q/uboot4extlinux-nitrogen6q.install b/libre-testing/uboot4extlinux-nitrogen6q/uboot4extlinux-nitrogen6q.install
index 8aff26699..ed1fce75f 100644
--- a/libre-testing/uboot4extlinux-nitrogen6q/uboot4extlinux-nitrogen6q.install
+++ b/libre-testing/uboot4extlinux-nitrogen6q/uboot4extlinux-nitrogen6q.install
@@ -1,5 +1,5 @@
 extlinux_warning() {
-  echo "==> WARNING: U-Boot uses Extlinux support to boot up. For setting it up, edit /boot/extlinux/extlinux.conf"
+  echo "==> WARNING: Remember to set up your kernels in /boot/extlinux/extlinux.conf"
 }
 
 post_install() {