From 4edbac805de1e4363ae93254a9c1186b9edcc2d4 Mon Sep 17 00:00:00 2001 From: Luca Weiss Date: Sat, 19 Jan 2019 14:42:19 +0100 Subject: [PATCH] pine-a64lts: update kernel to 4.20.0 (!153) --- device/device-pine-a64lts/APKBUILD | 4 +- device/device-pine-a64lts/deviceinfo | 2 +- main/linux-postmarketos-allwinner/APKBUILD | 8 +-- .../compiler-gcc6.h | 69 ------------------- 4 files changed, 7 insertions(+), 76 deletions(-) delete mode 100644 main/linux-postmarketos-allwinner/compiler-gcc6.h diff --git a/device/device-pine-a64lts/APKBUILD b/device/device-pine-a64lts/APKBUILD index 6dd2228b7..61fc8550b 100644 --- a/device/device-pine-a64lts/APKBUILD +++ b/device/device-pine-a64lts/APKBUILD @@ -2,7 +2,7 @@ pkgname="device-pine-a64lts" pkgdesc="PINE A64-LTS" pkgver=0.1 -pkgrel=3 +pkgrel=4 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -26,5 +26,5 @@ package() { } -sha512sums="c7f20912c17ce4686ca06a3249d7b33a2df5c7cc3856a733365bbc2e3addc6feb3ac97d4a754c319e1a27828f40a70296ccf13ff884652af744025cea30e0a7c deviceinfo +sha512sums="b550ace9ce15ad574d011d1e966bd040a93a8bf26980b61928059d6328f1b4b7ef7d12e90e6ac78c7b6e4b99c4924b0d49f3b5813f9275c3982ff9df2be7ffef deviceinfo ef7d21144b8c33f80968a6a089dcc6b568abd54f66f30d21d5befc10e51217484440aa8edb1065cd871ffba7bc599f44502bb6d240ee01f59dc92706ec6eabfd uboot-script.cmd" diff --git a/device/device-pine-a64lts/deviceinfo b/device/device-pine-a64lts/deviceinfo index cb7e4bb36..d8c20b2d6 100644 --- a/device/device-pine-a64lts/deviceinfo +++ b/device/device-pine-a64lts/deviceinfo @@ -6,7 +6,7 @@ deviceinfo_name="PINE A64-LTS" deviceinfo_manufacturer="PINE" deviceinfo_codename="pine-a64lts" deviceinfo_date="" -deviceinfo_dtb="allwinner/sun50i-a64-sopine-baseboard" +deviceinfo_dtb="allwinner/sun50i-a64-pine64-lts" deviceinfo_modules_initfs="" deviceinfo_arch="aarch64" deviceinfo_disable_dhcpd="true" diff --git a/main/linux-postmarketos-allwinner/APKBUILD b/main/linux-postmarketos-allwinner/APKBUILD index b1beab3c4..2d218d297 100644 --- a/main/linux-postmarketos-allwinner/APKBUILD +++ b/main/linux-postmarketos-allwinner/APKBUILD @@ -3,8 +3,8 @@ _config="config-${_flavor}.${CARCH}" pkgname=linux-${_flavor} -pkgver=4.18.0 -pkgrel=1 +pkgver=4.20.0 +pkgrel=0 arch="aarch64" pkgdesc="Kernel close to mainline with extra patches for Allwinner devices" @@ -13,7 +13,7 @@ depends="" makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev openssl-dev file bison flex" options="!strip !check !tracedeps" install= -_commit="788a3dffccd03be306646cd3c9a1029f350df3f7" +_commit="585a14815d2a2620c2b673d26147ceb4491dbf65" source=" linux-${_commit}.tar.gz::https://github.com/anarsoul/linux-2.6/archive/${_commit}.tar.gz config-${_flavor}.aarch64 @@ -176,5 +176,5 @@ dev() { fi fi } -sha512sums="8a5b6cbb549360c93d80a888e00a3341333f692db959c9b9b4a182f5bafa471a39ffe2f77e2c5ce9d9b0c197715b04054c7343ec3a160e9e0b52650bbdaeef07 linux-788a3dffccd03be306646cd3c9a1029f350df3f7.tar.gz +sha512sums="c8df91d946f0121f38992bddf4691b9fb999162424461c063851a685cae8329a1fc5a6add73100be197f899b6ccdb18faff2480161f5d24ce8996f35881e30fb linux-585a14815d2a2620c2b673d26147ceb4491dbf65.tar.gz b5a72a1b369f38b33adf1921292fc62ae15ddd13e7fabbd51fd2f31d9daa5db4b823c2f09209d527b95c2f2592a036c4c13c2e2584a851c5f405a61cdfa44fdd config-postmarketos-allwinner.aarch64" diff --git a/main/linux-postmarketos-allwinner/compiler-gcc6.h b/main/linux-postmarketos-allwinner/compiler-gcc6.h deleted file mode 100644 index 844706318..000000000 --- a/main/linux-postmarketos-allwinner/compiler-gcc6.h +++ /dev/null @@ -1,69 +0,0 @@ -// SOURCE: -// https://github.com/NextThingCo/CHIP-u-boot/issues/10#issuecomment-287515505 - -#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 */ -