linux-sunxi: disable glamor build if Mali is used

Unless somebody writes libgbm replacement for binary Mali driver
(sort of converter for gbm-UMB) there is no glamor for us.

Closes #227

README.md

@@ -26,10 +26,9 @@ If you want to switch back to sunxi versions for some reasons (no device tree av
 - change the file conf/machine/include/sunxi.inc to include the following block
 - edit your conf/local.conf to add the following block
 
-		PREFERRED_PROVIDER_u-boot="u-boot-sunxi"
-		PREFERRED_PROVIDER_virtual/bootloader="u-boot-sunxi"
-		PREFERRED_PROVIDER_virtual/kernel="linux-sunxi"
-		KERNEL_DEVICETREE = ""
+	PREFERRED_PROVIDER_u-boot="u-boot-sunxi"
+	PREFERRED_PROVIDER_virtual/bootloader="u-boot-sunxi"
+	PREFERRED_PROVIDER_virtual/kernel="linux-sunxi"
 
 If you already have built the mainline versions it might be necessary to reset the build directories with:
 

conf/layer.conf

@@ -14,4 +14,4 @@ LAYERVERSION_meta-sunxi = "1"
 
 LAYERDEPENDS_meta-sunxi = "core openembedded-layer"
 
-LAYERSERIES_COMPAT_meta-sunxi = "zeus"
+LAYERSERIES_COMPAT_meta-sunxi = "morty pyro rocko sumo thud warrior"

conf/machine/include/sun50i.inc

@@ -1,6 +1,4 @@
 require conf/machine/include/sunxi64.inc
-
-DEFAULTTUNE ?= "cortexa53-crypto"
-require conf/machine/include/tune-cortexa53.inc
+require conf/machine/include/arm/arch-armv8.inc
 
 SOC_FAMILY = "sun50i"

conf/machine/nanopi-m1-plus.conf

@@ -4,6 +4,8 @@
 
 require conf/machine/include/sun8i.inc
 
+PREFERRED_VERSION_u-boot = "v2018.09%"
+
 KERNEL_DEVICETREE = "sun8i-h3-nanopi-m1-plus.dtb"
 UBOOT_MACHINE = "nanopi_m1_plus_defconfig"
 

conf/machine/nanopi-neo-air.conf

@@ -5,5 +5,7 @@
 
 require conf/machine/include/sun8i.inc
 
+PREFERRED_VERSION_u-boot = "v2018.09%"
+
 KERNEL_DEVICETREE = "sun8i-h3-nanopi-neo-air.dtb"
 UBOOT_MACHINE = "nanopi_neo_air_defconfig"

conf/machine/nanopi-neo-plus2.conf

@@ -5,5 +5,7 @@
 
 require conf/machine/include/sun50i.inc
 
+PREFERRED_VERSION_u-boot = "v2018.09%"
+
 KERNEL_DEVICETREE = "allwinner/sun50i-h5-nanopi-neo-plus2.dtb"
 UBOOT_MACHINE = "nanopi_neo_plus2_defconfig"

conf/machine/nanopi-neo.conf

@@ -4,6 +4,8 @@
 
 require conf/machine/include/sun8i.inc
 
+PREFERRED_VERSION_u-boot = "v2018.09%"
+
 KERNEL_DEVICETREE = "sun8i-h3-nanopi-neo.dtb"
 UBOOT_MACHINE = "nanopi_neo_defconfig"
 

conf/machine/nanopi-neo2.conf

@@ -5,5 +5,7 @@
 
 require conf/machine/include/sun50i.inc
 
+PREFERRED_VERSION_u-boot = "v2018.09%"
+
 KERNEL_DEVICETREE = "allwinner/sun50i-h5-nanopi-neo2.dtb"
 UBOOT_MACHINE = "nanopi_neo2_defconfig"

conf/machine/olinuxino-a64.conf

@@ -7,7 +7,5 @@ require conf/machine/include/sun50i.inc
 
 PREFFERED_VERSION_u-boot = "v2018.09%"
 
-MACHINE_EXTRA_RRECOMMENDS += " linux-firmware-rtl8723"
-
 KERNEL_DEVICETREE = "allwinner/sun50i-a64-olinuxino.dtb"
 UBOOT_MACHINE = "a64-olinuxino_defconfig"

conf/machine/orange-pi-one.conf

@@ -4,6 +4,8 @@
 
 require conf/machine/include/sun8i.inc
 
+PREFERRED_VERSION_u-boot = "v2018.09%"
+
 KERNEL_DEVICETREE = "sun8i-h3-orangepi-one.dtb"
 UBOOT_MACHINE = "orangepi_one_defconfig"
 

conf/machine/orange-pi-pc-plus.conf

@@ -4,6 +4,8 @@
 
 require conf/machine/include/sun8i.inc
 
+PREFERRED_VERSION_u-boot = "v2018.09%"
+
 KERNEL_DEVICETREE = "sun8i-h3-orangepi-pc-plus.dtb"
 UBOOT_MACHINE = "orangepi_pc_plus_defconfig"
 

conf/machine/orange-pi-pc.conf

@@ -4,6 +4,8 @@
 
 require conf/machine/include/sun8i.inc
 
+PREFERRED_VERSION_u-boot = "v2018.09%"
+
 KERNEL_DEVICETREE = "sun8i-h3-orangepi-pc.dtb"
 UBOOT_MACHINE = "orangepi_pc_defconfig"
 

conf/machine/orange-pi-zero-plus2.conf

@@ -5,5 +5,7 @@
 
 require conf/machine/include/sun50i.inc
 
+PREFERRED_VERSION_u-boot = "v2018.09%"
+
 KERNEL_DEVICETREE = "allwinner/sun50i-h5-orangepi-zero-plus2.dtb"
 UBOOT_MACHINE = "orangepi_zero_plus2_defconfig"

conf/machine/orange-pi-zero.conf

@@ -4,6 +4,8 @@
 
 require conf/machine/include/sun8i.inc
 
+PREFERRED_VERSION_u-boot = "v2018.09%"
+
 KERNEL_DEVICETREE = "sun8i-h2-plus-orangepi-zero.dtb"
 UBOOT_MACHINE = "orangepi_zero_defconfig"
 

conf/machine/pcduino.conf

@@ -4,6 +4,8 @@
 
 require conf/machine/include/sun4i.inc
 
+PREFERRED_VERSION_u-boot = "v2018.09%"
+
 KERNEL_DEVICETREE = "sun4i-a10-pcduino.dtb"
 UBOOT_MACHINE = "Linksprite_pcDuino_defconfig"
 SUNXI_FEX_FILE = "sys_config/a10/pcduino.fex"

conf/machine/pine64-plus.conf

@@ -5,5 +5,7 @@
 
 require conf/machine/include/sun50i.inc
 
+PREFERRED_VERSION_u-boot = "v2018.09%"
+
 KERNEL_DEVICETREE = "allwinner/sun50i-a64-pine64-plus.dtb"
 UBOOT_MACHINE = "pine64_plus_defconfig"

recipes-bsp/u-boot/files/0001-nanopi_neo_air_defconfig-Enable-eMMC-support.patch

@@ -1,21 +1,20 @@
-From 6adb2ebdc4022c24497e9ee4dccab41d18e3105d Mon Sep 17 00:00:00 2001
+From f4a77da23b3890b53efab6a927cbe99b76ef3b26 Mon Sep 17 00:00:00 2001
 From: Florin Sarbu <florin@resin.io>
 Date: Wed, 12 Sep 2018 14:22:49 +0200
 Subject: [PATCH] nanopi_neo_air_defconfig: Enable eMMC support
 
 Upstream-status: Pending
 Signed-off-by: Florin Sarbu <florin@resin.io>
-
 ---
  configs/nanopi_neo_air_defconfig | 1 +
  1 file changed, 1 insertion(+)
 
 diff --git a/configs/nanopi_neo_air_defconfig b/configs/nanopi_neo_air_defconfig
-index 5ad90ddd16..8b7a4eb45d 100644
+index 8c362fa885..c7929ff015 100644
 --- a/configs/nanopi_neo_air_defconfig
 +++ b/configs/nanopi_neo_air_defconfig
-@@ -15,3 +15,4 @@ CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-nanopi-neo-air"
+@@ -15,3 +15,4 @@ CONFIG_CONSOLE_MUX=y
+ CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-nanopi-neo-air"
  CONFIG_USB_EHCI_HCD=y
- CONFIG_USB_OHCI_HCD=y
  CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
 +CONFIG_MMC_SUNXI_SLOT_EXTRA=2

recipes-bsp/u-boot/u-boot-sunxi.bb

@@ -20,9 +20,8 @@ UBOOT_MACHINE_meleg = "Mele_A1000G_config"
 
 SRC_URI = " \
 	git://github.com/linux-sunxi/u-boot-sunxi.git;protocol=git;branch=sunxi \
-	file://0001-gcc5-fixes.patch \
-	file://0002-gcc6-fixes.patch \
-	file://0003-No-gcc-version-specific-includes.patch \
+	file://0002-gcc5-fixes.patch \
+	file://0003-gcc6-fixes.patch \
 	"
 
 PE = "1"
@@ -36,7 +35,3 @@ S = "${WORKDIR}/git"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 SPL_BINARY="u-boot-sunxi-with-spl.bin"
-
-do_configure () {
-    oe_runmake -C ${S} O=${B} ${UBOOT_MACHINE}
-}

recipes-bsp/u-boot/u-boot-sunxi/0003-No-gcc-version-specific-includes.patch

@@ -1,24 +0,0 @@
-From bc4aa5814cbedbfaa1c79dfe7ea2571fee7f2d51 Mon Sep 17 00:00:00 2001
-From: Andrey Lebedev <andrey@lebedev.lt>
-Date: Wed, 22 Jan 2020 20:00:11 +0200
-Subject: [PATCH] No gcc version-specific includes
-
-In order to support gcc-5 and above. Fixes compilation errors like
-
-linux/compiler-gcc9.h: No such file or directory
----
- include/linux/compiler-gcc.h | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h
-index 9896e547b9..5f0bd65f3a 100644
---- a/include/linux/compiler-gcc.h
-+++ b/include/linux/compiler-gcc.h
-@@ -90,4 +90,3 @@
- #define __gcc_header(x) #x
- #define _gcc_header(x) __gcc_header(linux/compiler-gcc##x.h)
- #define gcc_header(x) _gcc_header(x)
--#include gcc_header(__GNUC__)
--- 
-2.20.1
-

recipes-bsp/u-boot/u-boot_2018.09.bb

@@ -1,8 +1,13 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+DESCRIPTION="Upstream's U-boot configured for sunxi devices"
+
+require recipes-bsp/u-boot/u-boot.inc
 
 DEPENDS += " bc-native dtc-native swig-native python3-native flex-native bison-native "
 DEPENDS_append_sun50i = " atf-sunxi "
 
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e"
+
 COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i|sun8i|sun50i)"
 
 DEFAULT_PREFERENCE_sun4i="1"
@@ -11,11 +16,18 @@ DEFAULT_PREFERENCE_sun7i="1"
 DEFAULT_PREFERENCE_sun8i="1"
 DEFAULT_PREFERENCE_sun50i="1"
 
-SRC_URI += " \
+SRC_URI = "git://git.denx.de/u-boot.git;branch=master \
            file://0001-nanopi_neo_air_defconfig-Enable-eMMC-support.patch \
            file://boot.cmd \
            "
 
+SRCREV = "f88b6facb87dc4a52f1630eb9d858c0f54c6628e"
+
+PV = "v2018.09+git${SRCPV}"
+PE = "2"
+
+S = "${WORKDIR}/git"
+
 UBOOT_ENV_SUFFIX = "scr"
 UBOOT_ENV = "boot"
 

recipes-graphics/libgles/sunxi-mali_git.bb

@@ -70,7 +70,6 @@ do_install() {
 
     make libdir=${D}${libdir}/ includedir=${D}${includedir}/ install
     make libdir=${D}${libdir}/ includedir=${D}${includedir}/ install -C include
-    rm -f ${D}${includedir}/KHR/khrplatform.h
 
     # Fix .so name and create symlinks, binary package provides .so wich can't be included directly in package without triggering the 'dev-so' QA check
     # Packages like xf86-video-fbturbo dlopen() libUMP.so, so we do need to ship the .so files in ${PN}

recipes-kernel/linux/linux-mainline/aarch64/defconfig

@@ -141,11 +141,6 @@ CONFIG_BT_LEDS=y
 # CONFIG_BT_DEBUGFS is not set
 CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_LL=y
-CONFIG_WIRELESS=y
-CONFIG_WIRELESS_EXT=y
-CONFIG_WEXT_CORE=y
-CONFIG_WEXT_PROC=y
-CONFIG_WEXT_PRIV=y
 CONFIG_CFG80211=m
 CONFIG_MAC80211=m
 CONFIG_MAC80211_LEDS=y
@@ -499,8 +494,6 @@ CONFIG_VIRTIO_BALLOON=y
 CONFIG_VIRTIO_MMIO=y
 CONFIG_XEN_GNTDEV=y
 CONFIG_XEN_GRANT_DEV_ALLOC=y
-CONFIG_STAGING=y
-CONFIG_RTL8723BS=m
 CONFIG_COMMON_CLK_RK808=y
 CONFIG_COMMON_CLK_SCPI=y
 CONFIG_COMMON_CLK_CS2000_CP=y

recipes-kernel/linux/linux-mainline/orange-pi-zero/0001-add-wifi-support.patch

@@ -1,44 +1,28 @@
-From 055155f463693e61f9018a011ad600d872d6736f Mon Sep 17 00:00:00 2001
-From: Marek Belisko <marek.belisko@open-nandra.com>
-Date: Fri, 2 Aug 2019 14:46:10 +0200
-Subject: [PATCH] dts: orange-pi-zero: Add wifi support
-
-Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
----
- arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 47 ++++++++++++++++++-----
- 1 file changed, 37 insertions(+), 10 deletions(-)
-
 diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
-index 84cd9c0..77b2fc6 100644
+index 6713d0f2b3f4..ad0829e8f716 100644
 --- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
 +++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
-@@ -80,13 +80,14 @@
+@@ -80,19 +80,22 @@
  		};
  	};
  
 -	reg_vcc_wifi: reg_vcc_wifi {
--		compatible = "regulator-fixed";
++	vdd_wifi: vdd_wifi {
+ 		compatible = "regulator-fixed";
 -		regulator-min-microvolt = <3300000>;
 -		regulator-max-microvolt = <3300000>;
 -		regulator-name = "vcc-wifi";
 -		enable-active-high;
-+	vdd_wifi: vdd_wifi {
 +		regulator-name = "wifi";
 +		regulator-min-microvolt = <1800000>;
 +		regulator-max-microvolt = <1800000>;
  		gpio = <&pio 0 20 GPIO_ACTIVE_HIGH>;
 +		startup-delay-us = <70000>;
 +		enable-active-high;
-+
- 	};
- 
- 	reg_vdd_cpux: vdd-cpux-regulator {
-@@ -106,10 +107,12 @@
- 			  1300000 1>;
  	};
  
 -	wifi_pwrseq: wifi_pwrseq {
-+	pwrseq_wifi: pwrseq_wifi {
++	pwrseq_wifi: pwrseq_wifi@0 {
  		compatible = "mmc-pwrseq-simple";
 +		pinctrl-names = "default";
 +		pinctrl-0 = <&wifi_rst>;
@@ -48,10 +32,10 @@ index 84cd9c0..77b2fc6 100644
  	};
  };
  
-@@ -140,9 +143,11 @@
- };
- 
+@@ -124,9 +127,11 @@
  &mmc1 {
+ 	pinctrl-names = "default";
+ 	pinctrl-0 = <&mmc1_pins_a>;
 -	vmmc-supply = <&reg_vcc_wifi>;
 -	mmc-pwrseq = <&wifi_pwrseq>;
 +	vmmc-supply = <&reg_vcc3v3>;
@@ -62,7 +46,7 @@ index 84cd9c0..77b2fc6 100644
  	non-removable;
  	status = "okay";
  
-@@ -152,6 +157,13 @@
+@@ -136,9 +141,30 @@
  	 */
  	xr819: sdio_wifi@1 {
  		reg = <1>;
@@ -76,11 +60,6 @@ index 84cd9c0..77b2fc6 100644
  	};
  };
  
-@@ -208,3 +220,18 @@
- 	status = "okay";
- 	usb0_id_det-gpios = <&pio 6 12 GPIO_ACTIVE_HIGH>; /* PG12 */
- };
-+
 +&pio {
 +	wifi_wake: wifi_wake {
 +		pins = "PG10";
@@ -95,6 +74,6 @@ index 84cd9c0..77b2fc6 100644
 +    };
 +};
 +
--- 
-2.7.4
-
+ &mmc1_pins_a {
+ 	bias-pull-up;
+ };

recipes-kernel/linux/linux-mainline_4.19.46.bb

@@ -1,5 +1,5 @@
 SECTION = "kernel"
-DESCRIPTION = "Mainline Longterm Linux kernel"
+DESCRIPTION = "Mainline Linux kernel"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
 COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i|sun8i|sun50i)"
@@ -19,8 +19,8 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
 
 S = "${WORKDIR}/linux-${PV}"
 
-SRC_URI[md5sum] = "bf96b6783a2d11178a2aaa3cf376f975"
-SRC_URI[sha256sum] = "293ec1ae0f6b3b4be83a217224b51d137f2163cf2d9d294eecf5d0a354e4e29d"
+SRC_URI[md5sum] = "5e171996b176df3db2150bcb47d042a7"
+SRC_URI[sha256sum] = "097b52fe8a872259f4a3dba571b2eaf7b9863d9cde5399c6b316dec0ef57e67a"
 
 SRC_URI = "https://www.kernel.org/pub/linux/kernel/v4.x/linux-${PV}.tar.xz \
         file://0003-ARM-dts-nanopi-neo-air-Add-WiFi-eMMC.patch \
@@ -28,5 +28,5 @@ SRC_URI = "https://www.kernel.org/pub/linux/kernel/v4.x/linux-${PV}.tar.xz \
         "
 
 SRC_URI_append_orange-pi-zero += "\
-	file://0001-dts-orange-pi-zero-Add-wifi-support.patch \
+	file://0001-add-wifi-support.patch \
 	"

recipes-kernel/linux/linux-mainline_5.0.19.bb

@@ -1,5 +1,5 @@
 SECTION = "kernel"
-DESCRIPTION = "Mainline Stable Linux kernel"
+DESCRIPTION = "Mainline Linux kernel"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
 COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i|sun8i|sun50i)"
@@ -12,8 +12,6 @@ require linux.inc
 # in something or kernel-yocto.bbclass will fail.
 KBRANCH ?= "master"
 
-DEPENDS += "rsync-native"
-
 # Pull in the devicetree files into the rootfs
 RDEPENDS_${KERNEL_PACKAGE_NAME}-base += "kernel-devicetree"
 
@@ -21,8 +19,8 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
 
 S = "${WORKDIR}/linux-${PV}"
 
-SRC_URI[md5sum] = "6f4ab59d6ac7311f4245fc359706a0b7"
-SRC_URI[sha256sum] = "78f3cfc6c20b10ff21c0bb22d7d257cab03781c44d8c5aae289f749f94f76649"
+SRC_URI[md5sum] = "52fb710109527b042278359526588da8"
+SRC_URI[sha256sum] = "0bf0d5c64dafc1184e9aafd2f3ebb77aa88ddee881a7766436258feaa214d9ec"
 
 SRC_URI = "https://www.kernel.org/pub/linux/kernel/v5.x/linux-${PV}.tar.xz \
         file://0003-ARM-dts-nanopi-neo-air-Add-WiFi-eMMC.patch \
@@ -30,5 +28,5 @@ SRC_URI = "https://www.kernel.org/pub/linux/kernel/v5.x/linux-${PV}.tar.xz \
         "
 
 SRC_URI_append_orange-pi-zero += "\
-	file://0001-dts-orange-pi-zero-Add-wifi-support.patch \
+	file://0001-add-wifi-support.patch \
 	"

recipes-kernel/linux/linux-mainline_5.2-rc2.bb

@@ -1,5 +1,5 @@
 SECTION = "kernel"
-DESCRIPTION = "Mainline RC Linux kernel"
+DESCRIPTION = "Mainline Linux kernel"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
 COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i|sun8i|sun50i)"
@@ -12,8 +12,6 @@ require linux.inc
 # in something or kernel-yocto.bbclass will fail.
 KBRANCH ?= "master"
 
-DEPENDS += "rsync-native"
-
 # Pull in the devicetree files into the rootfs
 RDEPENDS_${KERNEL_PACKAGE_NAME}-base += "kernel-devicetree"
 
@@ -21,15 +19,16 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
 
 S = "${WORKDIR}/linux-${PV}"
 
-SRC_URI[md5sum] = "58b2b15fb3c429948051ce4f12f30c37"
-SRC_URI[sha256sum] = "b07532aa008438e0bce2b8f0253079a4f1654a048a75ae1477c8826f32feea7a"
+SRC_URI[md5sum] = "bf80c4ab5f475a2c0846340fb9eb6449"
+SRC_URI[sha256sum] = "8ec8258e75ebdcd8197328b8571435c246f55d7da7f6ed65e96aa8d4bff9a639"
 
 SRC_URI = "https://git.kernel.org/torvalds/t/linux-${PV}.tar.gz \
         file://0003-ARM-dts-nanopi-neo-air-Add-WiFi-eMMC.patch \
         file://defconfig \
         "
+
 SRC_URI_append_orange-pi-zero += "\
-	file://0001-dts-orange-pi-zero-Add-wifi-support.patch \
+	file://0001-add-wifi-support.patch \
 	"
 
 FILES_${KERNEL_PACKAGE_NAME}-base_append = " ${nonarch_base_libdir}/modules/${KERNEL_VERSION}/modules.builtin.modinfo"

recipes-kernel/linux/linux-sunxi/0004-arm-put-user-asm-fix.patch

@@ -1,29 +0,0 @@
-From 25a7e85eb0d58479f7d8895b1b29a648bd07d60e Mon Sep 17 00:00:00 2001
-From: Andrey Lebedev <andrey@lebedev.lt>
-Date: Mon, 20 Jan 2020 23:19:51 +0200
-Subject: [PATCH 2/2] Fix asm error in put_user under gcc version 8 and above
-
-Fixes these errors during compilation of linux-sunxi-3.4 kernel:
-/tmp/ccCGMQmS.s:648: Error: .err encountered
-
-Taken from https://patchwork.kernel.org/patch/10546809/
----
- arch/arm/include/asm/uaccess.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h
-index b04850fd..abfafbbf 100644
---- a/arch/arm/include/asm/uaccess.h
-+++ b/arch/arm/include/asm/uaccess.h
-@@ -159,7 +159,7 @@ extern int __put_user_8(void *, unsigned long long);
- 	({								\
- 		unsigned long __limit = current_thread_info()->addr_limit - 1; \
- 		const typeof(*(p)) __user *__tmp_p = (p);		\
--		register const typeof(*(p)) __r2 asm("r2") = (x);	\
-+		register typeof(*(p)) __r2 asm("r2") = (x);		\
- 		register const typeof(*(p)) __user *__p asm("r0") = __tmp_p; \
- 		register unsigned long __l asm("r1") = __limit;		\
- 		register int __e asm("r0");				\
--- 
-2.20.1
-

recipes-kernel/linux/linux-sunxi/0005-silence-warning.patch

@@ -1,25 +0,0 @@
-From 302604ee4a2011871cb26deaf69d567cf57d0fe3 Mon Sep 17 00:00:00 2001
-From: Andrey Lebedev <andrey@lebedev.lt>
-Date: Mon, 20 Jan 2020 23:20:07 +0200
-Subject: [PATCH 1/2] Silence annoying warning
-
----
- include/linux/log2.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/linux/log2.h b/include/linux/log2.h
-index fd7ff3d9..14458fdd 100644
---- a/include/linux/log2.h
-+++ b/include/linux/log2.h
-@@ -18,7 +18,7 @@
- /*
-  * deal with unrepresentable constant logarithms
-  */
--extern __attribute__((const, noreturn))
-+extern __attribute__((const))
- int ____ilog2_NaN(void);
- 
- /*
--- 
-2.20.1
-

recipes-kernel/linux/linux-sunxi_3.4.bb

@@ -14,12 +14,9 @@ MACHINE_KERNEL_PR_append = "a"
 SRC_URI += "git://github.com/linux-sunxi/linux-sunxi.git;branch=sunxi-3.4;protocol=git \
         file://0001-compiler-gcc-integrate-the-various-compiler-gcc-345-.patch \
         file://0002-use-static-inline-in-ARM-ftrace.patch \
-        file://0003-gcc5-fixes.patch \
-        file://0004-arm-put-user-asm-fix.patch \
-        file://0005-silence-warning.patch \
+        file://0001-gcc5-fixes.patch \
         file://defconfig \
         "
-LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
 
 S = "${WORKDIR}/git"