Merge pull request #279 from kedder/zeus

Backport linux-sunxi compilation fixes to Zeus
Mention that devicetree needs to be disabled for old kernel
2025-07-16 13:59:46 +02:00 · 2020-01-26 19:35:19 +01:00 · 2020-01-26 12:11:20 +02:00 · 2020-01-26 12:11:20 +02:00 · 2020-01-26 12:11:19 +02:00 · 2020-01-26 12:11:19 +02:00
33 changed files with 167 additions and 76 deletions
--- a/README.md
+++ b/README.md
@ -26,9 +26,10 @@ 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"
+		PREFERRED_PROVIDER_u-boot="u-boot-sunxi"
+		PREFERRED_PROVIDER_virtual/bootloader="u-boot-sunxi"
+		PREFERRED_PROVIDER_virtual/kernel="linux-sunxi"
+		KERNEL_DEVICETREE = ""

 If you already have built the mainline versions it might be necessary to reset the build directories with:

--- a/conf/layer.conf
+++ b/conf/layer.conf
@ -14,4 +14,4 @@ LAYERVERSION_meta-sunxi = "1"

 LAYERDEPENDS_meta-sunxi = "core openembedded-layer"

-LAYERSERIES_COMPAT_meta-sunxi = "morty pyro rocko sumo thud warrior"
+LAYERSERIES_COMPAT_meta-sunxi = "zeus"
--- a/conf/machine/include/sun50i.inc
+++ b/conf/machine/include/sun50i.inc
@ -1,4 +1,6 @@
 require conf/machine/include/sunxi64.inc
-require conf/machine/include/arm/arch-armv8a.inc
+
+DEFAULTTUNE ?= "cortexa53-crypto"
+require conf/machine/include/tune-cortexa53.inc

 SOC_FAMILY = "sun50i"
--- a/conf/machine/include/sunxi-mali.inc
+++ b/conf/machine/include/sunxi-mali.inc
@ -4,6 +4,8 @@ PREFERRED_PROVIDER_virtual/libgles1 ?= "sunxi-mali"
 PREFERRED_PROVIDER_virtual/libgles2 ?= "sunxi-mali"
 PREFERRED_PROVIDER_virtual/egl ?= "sunxi-mali"

+PACKAGECONFIG_remove_pn-xserver-xorg = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glamor', '', d)}"
+
 XSERVER += "sunxi-mali \
            sunxi-mali-dev"

--- a/conf/machine/nanopi-m1-plus.conf
+++ b/conf/machine/nanopi-m1-plus.conf
@ -4,8 +4,6 @@

 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"

--- a/conf/machine/nanopi-neo-air.conf
+++ b/conf/machine/nanopi-neo-air.conf
@ -5,7 +5,5 @@

 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"
--- a/conf/machine/nanopi-neo-plus2.conf
+++ b/conf/machine/nanopi-neo-plus2.conf
@ -5,7 +5,5 @@

 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"
--- a/conf/machine/nanopi-neo.conf
+++ b/conf/machine/nanopi-neo.conf
@ -4,8 +4,6 @@

 require conf/machine/include/sun8i.inc

-PREFERRED_VERSION_u-boot = "v2018.09%"
-
 KERNEL_DEVICETREE = "sun8i-h3-nanopi-neo.dtb"
 UBOOT_MACHINE = "nanopi_neo_defconfig"

--- a/conf/machine/nanopi-neo2.conf
+++ b/conf/machine/nanopi-neo2.conf
@ -5,7 +5,5 @@

 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"
--- a/conf/machine/olinuxino-a64.conf
+++ b/conf/machine/olinuxino-a64.conf
@ -7,5 +7,7 @@ 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"
--- a/conf/machine/orange-pi-one.conf
+++ b/conf/machine/orange-pi-one.conf
@ -4,8 +4,6 @@

 require conf/machine/include/sun8i.inc

-PREFERRED_VERSION_u-boot = "v2018.09%"
-
 KERNEL_DEVICETREE = "sun8i-h3-orangepi-one.dtb"
 UBOOT_MACHINE = "orangepi_one_defconfig"

--- a/conf/machine/orange-pi-pc-plus.conf
+++ b/conf/machine/orange-pi-pc-plus.conf
@ -4,8 +4,6 @@

 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"

--- a/conf/machine/orange-pi-pc.conf
+++ b/conf/machine/orange-pi-pc.conf
@ -4,8 +4,6 @@

 require conf/machine/include/sun8i.inc

-PREFERRED_VERSION_u-boot = "v2018.09%"
-
 KERNEL_DEVICETREE = "sun8i-h3-orangepi-pc.dtb"
 UBOOT_MACHINE = "orangepi_pc_defconfig"

--- a/conf/machine/orange-pi-zero-plus2.conf
+++ b/conf/machine/orange-pi-zero-plus2.conf
@ -5,7 +5,5 @@

 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"
--- a/conf/machine/orange-pi-zero.conf
+++ b/conf/machine/orange-pi-zero.conf
@ -4,8 +4,6 @@

 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"

--- a/conf/machine/pcduino.conf
+++ b/conf/machine/pcduino.conf
@ -4,8 +4,6 @@

 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"
--- a/conf/machine/pine64-plus.conf
+++ b/conf/machine/pine64-plus.conf
@ -5,7 +5,5 @@

 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"
--- a/recipes-bsp/u-boot/files/0001-nanopi_neo_air_defconfig-Enable-eMMC-support.patch
+++ b/recipes-bsp/u-boot/files/0001-nanopi_neo_air_defconfig-Enable-eMMC-support.patch
@ -1,20 +1,21 @@
-From f4a77da23b3890b53efab6a927cbe99b76ef3b26 Mon Sep 17 00:00:00 2001
+From 6adb2ebdc4022c24497e9ee4dccab41d18e3105d 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 8c362fa885..c7929ff015 100644
+index 5ad90ddd16..8b7a4eb45d 100644
 --- a/configs/nanopi_neo_air_defconfig
 +++ b/configs/nanopi_neo_air_defconfig
-@@ -15,3 +15,4 @@ CONFIG_CONSOLE_MUX=y
- CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-nanopi-neo-air"
+@@ -15,3 +15,4 @@ 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
--- a/recipes-bsp/u-boot/u-boot-sunxi.bb
+++ b/recipes-bsp/u-boot/u-boot-sunxi.bb
@ -20,8 +20,9 @@ UBOOT_MACHINE_meleg = "Mele_A1000G_config"

 SRC_URI = " \
 	git://github.com/linux-sunxi/u-boot-sunxi.git;protocol=git;branch=sunxi \
-	file://0002-gcc5-fixes.patch \
-	file://0003-gcc6-fixes.patch \
+	file://0001-gcc5-fixes.patch \
+	file://0002-gcc6-fixes.patch \
+	file://0003-No-gcc-version-specific-includes.patch \
 	"

 PE = "1"
@ -35,3 +36,7 @@ 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}
+}
--- a/recipes-bsp/u-boot/u-boot-sunxi/0001-gcc5-fixes.patch
+++ b/recipes-bsp/u-boot/u-boot-sunxi/0001-gcc5-fixes.patch
--- a/recipes-bsp/u-boot/u-boot-sunxi/0002-gcc6-fixes.patch
+++ b/recipes-bsp/u-boot/u-boot-sunxi/0002-gcc6-fixes.patch
--- a/recipes-bsp/u-boot/u-boot-sunxi/0003-No-gcc-version-specific-includes.patch
+++ b/recipes-bsp/u-boot/u-boot-sunxi/0003-No-gcc-version-specific-includes.patch
@ -0,0 +1,24 @@
+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
+
--- a/recipes-bsp/u-boot/u-boot_%.bbappend
+++ b/recipes-bsp/u-boot/u-boot_%.bbappend
@ -1,13 +1,8 @@
-DESCRIPTION="Upstream's U-boot configured for sunxi devices"
-
-require recipes-bsp/u-boot/u-boot.inc
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"

 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"
@ -16,18 +11,11 @@ DEFAULT_PREFERENCE_sun7i="1"
 DEFAULT_PREFERENCE_sun8i="1"
 DEFAULT_PREFERENCE_sun50i="1"

-SRC_URI = "git://git.denx.de/u-boot.git;branch=master \
+SRC_URI += " \
           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"

--- a/recipes-graphics/libgles/sunxi-mali_git.bb
+++ b/recipes-graphics/libgles/sunxi-mali_git.bb
@ -31,7 +31,7 @@ SRC_URI = "gitsm://github.com/linux-sunxi/sunxi-mali.git \

 S = "${WORKDIR}/git"

-DEPENDS = "libdrm xorgproto libump"
+DEPENDS = "libdrm xorgproto libump patchelf-native"

 PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}"
 PACKAGECONFIG[wayland] = "EGL_TYPE=framebuffer,,,"
@ -70,11 +70,13 @@ 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}

    mv ${D}${libdir}/libMali.so ${D}${libdir}/libMali.so.3
+    patchelf --set-soname libMali.so.3 ${D}${libdir}/libMali.so.3
    ln -sf libMali.so.3 ${D}${libdir}/libMali.so

    for flib in libEGL.so.1.4 libGLESv1_CM.so.1.1 libGLESv2.so.2.0 ; do
--- a/recipes-kernel/linux/linux-mainline/aarch64/defconfig
+++ b/recipes-kernel/linux/linux-mainline/aarch64/defconfig
@ -141,6 +141,11 @@ 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
@ -494,6 +499,8 @@ 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
--- a/recipes-kernel/linux/linux-mainline/orange-pi-zero/0001-dts-orange-pi-zero-Add-wifi-support.patch
+++ b/recipes-kernel/linux/linux-mainline/orange-pi-zero/0001-dts-orange-pi-zero-Add-wifi-support.patch
@ -1,28 +1,44 @@
+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 6713d0f2b3f4..ad0829e8f716 100644
+index 84cd9c0..77b2fc6 100644
 --- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
 +++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
-@@ -80,19 +80,22 @@
+@@ -80,13 +80,14 @@
 		};
 	};
 
 -	reg_vcc_wifi: reg_vcc_wifi {
-+	vdd_wifi: vdd_wifi {
- 		compatible = "regulator-fixed";
+-		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@0 {
+	pwrseq_wifi: pwrseq_wifi {
 		compatible = "mmc-pwrseq-simple";
 +		pinctrl-names = "default";
 +		pinctrl-0 = <&wifi_rst>;
@ -32,10 +48,10 @@ index 6713d0f2b3f4..ad0829e8f716 100644
 	};
 };
 
-@@ -124,9 +127,11 @@
+@@ -140,9 +143,11 @@
+ };
+ 
 &mmc1 {
- 	pinctrl-names = "default";
- 	pinctrl-0 = <&mmc1_pins_a>;
 -	vmmc-supply = <&reg_vcc_wifi>;
 -	mmc-pwrseq = <&wifi_pwrseq>;
 +	vmmc-supply = <&reg_vcc3v3>;
@ -46,7 +62,7 @@ index 6713d0f2b3f4..ad0829e8f716 100644
 	non-removable;
 	status = "okay";
 
-@@ -136,9 +141,30 @@
+@@ -152,6 +157,13 @@
 	 */
 	xr819: sdio_wifi@1 {
 		reg = <1>;
@ -60,6 +76,11 @@ index 6713d0f2b3f4..ad0829e8f716 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";
@ -74,6 +95,6 @@ index 6713d0f2b3f4..ad0829e8f716 100644
 +    };
 +};
 +
- &mmc1_pins_a {
- 	bias-pull-up;
- };
+-- 
+2.7.4
+
--- a/recipes-kernel/linux/linux-mainline_4.19.81.bb
+++ b/recipes-kernel/linux/linux-mainline_4.19.81.bb
@ -1,5 +1,5 @@
 SECTION = "kernel"
-DESCRIPTION = "Mainline Linux kernel"
+DESCRIPTION = "Mainline Longterm 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] = "5e171996b176df3db2150bcb47d042a7"
-SRC_URI[sha256sum] = "097b52fe8a872259f4a3dba571b2eaf7b9863d9cde5399c6b316dec0ef57e67a"
+SRC_URI[md5sum] = "bf96b6783a2d11178a2aaa3cf376f975"
+SRC_URI[sha256sum] = "293ec1ae0f6b3b4be83a217224b51d137f2163cf2d9d294eecf5d0a354e4e29d"

 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-add-wifi-support.patch \
+	file://0001-dts-orange-pi-zero-Add-wifi-support.patch \
 	"
--- a/recipes-kernel/linux/linux-mainline_5.0.19.bb
+++ b/recipes-kernel/linux/linux-mainline_5.0.19.bb
@ -1,5 +1,5 @@
 SECTION = "kernel"
-DESCRIPTION = "Mainline Linux kernel"
+DESCRIPTION = "Mainline Stable Linux kernel"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
 COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i|sun8i|sun50i)"
@ -12,6 +12,8 @@ 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"

@ -19,8 +21,8 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"

 S = "${WORKDIR}/linux-${PV}"

-SRC_URI[md5sum] = "52fb710109527b042278359526588da8"
-SRC_URI[sha256sum] = "0bf0d5c64dafc1184e9aafd2f3ebb77aa88ddee881a7766436258feaa214d9ec"
+SRC_URI[md5sum] = "6f4ab59d6ac7311f4245fc359706a0b7"
+SRC_URI[sha256sum] = "78f3cfc6c20b10ff21c0bb22d7d257cab03781c44d8c5aae289f749f94f76649"

 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 \
@ -28,5 +30,5 @@ SRC_URI = "https://www.kernel.org/pub/linux/kernel/v5.x/linux-${PV}.tar.xz \
        "

 SRC_URI_append_orange-pi-zero += "\
-	file://0001-add-wifi-support.patch \
+	file://0001-dts-orange-pi-zero-Add-wifi-support.patch \
 	"
--- a/recipes-kernel/linux/linux-mainline_5.4-rc6.bb
+++ b/recipes-kernel/linux/linux-mainline_5.4-rc6.bb
@ -1,5 +1,5 @@
 SECTION = "kernel"
-DESCRIPTION = "Mainline Linux kernel"
+DESCRIPTION = "Mainline RC Linux kernel"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
 COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i|sun8i|sun50i)"
@ -12,6 +12,8 @@ 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"

@ -19,16 +21,15 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"

 S = "${WORKDIR}/linux-${PV}"

-SRC_URI[md5sum] = "bf80c4ab5f475a2c0846340fb9eb6449"
-SRC_URI[sha256sum] = "8ec8258e75ebdcd8197328b8571435c246f55d7da7f6ed65e96aa8d4bff9a639"
+SRC_URI[md5sum] = "58b2b15fb3c429948051ce4f12f30c37"
+SRC_URI[sha256sum] = "b07532aa008438e0bce2b8f0253079a4f1654a048a75ae1477c8826f32feea7a"

 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-add-wifi-support.patch \
+	file://0001-dts-orange-pi-zero-Add-wifi-support.patch \
 	"

 FILES_${KERNEL_PACKAGE_NAME}-base_append = " ${nonarch_base_libdir}/modules/${KERNEL_VERSION}/modules.builtin.modinfo"
--- a/recipes-kernel/linux/linux-sunxi/0003-gcc5-fixes.patch
+++ b/recipes-kernel/linux/linux-sunxi/0003-gcc5-fixes.patch
--- a/recipes-kernel/linux/linux-sunxi/0004-arm-put-user-asm-fix.patch
+++ b/recipes-kernel/linux/linux-sunxi/0004-arm-put-user-asm-fix.patch
@ -0,0 +1,29 @@
+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
+
--- a/recipes-kernel/linux/linux-sunxi/0005-silence-warning.patch
+++ b/recipes-kernel/linux/linux-sunxi/0005-silence-warning.patch
@ -0,0 +1,25 @@
+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
+
--- a/recipes-kernel/linux/linux-sunxi_3.4.bb
+++ b/recipes-kernel/linux/linux-sunxi_3.4.bb
@ -14,9 +14,12 @@ 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://0001-gcc5-fixes.patch \
+        file://0003-gcc5-fixes.patch \
+        file://0004-arm-put-user-asm-fix.patch \
+        file://0005-silence-warning.patch \
        file://defconfig \
        "
+LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"

 S = "${WORKDIR}/git"
Author	SHA1	Message	Date
Marek Belisko	26ecaec7cb	Merge pull request #279 from kedder/zeus Backport linux-sunxi compilation fixes to Zeus	2020-01-26 19:35:19 +01:00
Andrey Lebedev	3aec777673	Mention that devicetree needs to be disabled for old kernel	2020-01-26 12:11:20 +02:00
Andrey Lebedev	b88a5c62f1	Correctly generate .config file for the compilation	2020-01-26 12:11:20 +02:00
Andrey Lebedev	3107a0c1c9	u-boot-sunxi: fix compilation under gcc, newer than 4	2020-01-26 12:11:19 +02:00
Andrey Lebedev	4c6dd3d573	linux-sunxi: fix compilation issue on gcc-9 Error comes in form of /tmp/ccCGMQmS.s:648: Error: .err encountered Tested on zeus branch of linux-sunxi.	2020-01-26 12:11:19 +02:00
Enrico Butera	b7b8764c8f	Merge pull request #271 from Kynetics/master machine: remove U-Boot PREFERRED_VERSION	2019-11-07 11:24:48 +01:00
Diego Rondini	504fa1bb71	machine: remove U-Boot PREFERRED_VERSION Remove pointless U-Boot PREFERRED_VERSION, as meta-sunxi no longer provides its own u-boot recipe. Signed-off-by: Diego Rondini <diego.rondini@kynetics.com>	2019-11-06 12:44:11 +00:00
Marek Belisko	902841dcd4	Merge pull request #272 from Kynetics/kernel-update/master Update kernel recipes to latest revisions	2019-11-06 12:58:23 +01:00
Diego Rondini	9fef250ca8	linux-mainline: update rc to 5.4-rc6 Signed-off-by: Diego Rondini <diego.rondini@kynetics.com>	2019-11-06 11:19:00 +00:00
Diego Rondini	0419afad79	linux-mainline: update stable to 5.3.8 Signed-off-by: Diego Rondini <diego.rondini@kynetics.com>	2019-11-06 11:19:00 +00:00
Diego Rondini	444672b854	linux-mainline: update longterm to 4.19.81 Signed-off-by: Diego Rondini <diego.rondini@kynetics.com>	2019-11-06 11:19:00 +00:00
Marek Belisko	f1378e33af	Merge pull request #270 from twoerner/contrib/twoerner/fixes-05 LAYERSERIES_COMPAT: warrior -> zeus	2019-10-16 14:05:56 +02:00
Trevor Woerner	efe6aef33f	LAYERSERIES_COMPAT: warrior -> zeus Update the layer compatibility information to indicate this layer is compatible with "zeus". Signed-off-by: Trevor Woerner <twoerner@gmail.com>	2019-10-09 08:00:20 -04:00
slapin	b20940edd0	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	2019-09-07 22:16:50 +02:00
slapin	63ee6333dc	Fix soname in Mali.so to make auto-RDEPENDS work The auto-RDEPENDs system reqires that all .so libraries have proper soname set. If library soes not have soname set, it will not be added to RDEPENDs list of other elf files. Closes #240	2019-09-07 16:38:48 +02:00
Marek Belisko	23acf5bc61	Merge pull request #266 from twoerner/contrib/twoerner/fixes-04 Contrib/twoerner/fixes 04	2019-09-02 07:52:42 +02:00
Trevor Woerner	d0bbc7334d	U-Boot: patch refresh Signed-off-by: Trevor Woerner <twoerner@gmail.com>	2019-08-30 14:06:41 -04:00
Trevor Woerner	7964ef28bd	U-Boot: switch to upstream Use the upstream U-Boot and simply bbappend the changes that are needed. U-Boot 2018.09 no longer builds against master. Signed-off-by: Trevor Woerner <twoerner@gmail.com>	2019-08-30 14:06:41 -04:00
Marek Belisko	e10f05d494	Merge pull request #264 from nandra/mbe-fix-wifi-patch linux: refresh orange-pi-zero wifi patch	2019-08-07 08:17:00 +02:00
Marek Belisko	1f46cadd4c	linux: refresh orange-pi-zero wifi patch Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>	2019-08-07 08:16:15 +02:00
Marek Belisko	a5cecabb42	Merge pull request #265 from nandra/mbe-update-kernels Update mainline kernels	2019-08-07 08:14:03 +02:00
Marek Belisko	d034a64bc4	linux-mainline: Added bleeding edge kernel 5.3-rc2 Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>	2019-08-07 08:13:19 +02:00
Marek Belisko	6bfa745149	linux-mainline: Drop 5.0 and use 5.2 as latest release Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>	2019-08-07 08:13:19 +02:00
Marek Belisko	70d37fa203	linux-mainline: Bump 4.19 to latest stable Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>	2019-08-07 08:13:19 +02:00
Marek Belisko	741b6238b6	Merge pull request #262 from MdeVries86/feature/olinuxino-a64-wifi Add wifi support for olinuxino-a64	2019-07-09 11:35:36 +02:00
Marek Belisko	917850e01d	Merge pull request #261 from lorem-ipsum/sun50i-tune sun50i: change tuning params to cortex-a53	2019-07-04 10:00:17 +02:00
Marcel de Vries	5e1a2937bd	Add wifi support for olinuxino-a64	2019-06-25 23:50:52 +02:00
Hendrik v. Raven	be78fab082	drop layers older than warrior from layercompat	2019-06-25 16:23:08 +02:00
Hendrik v. Raven	f4e059ee3d	sun50i: change tuning params to cortex-a53	2019-06-25 16:17:10 +02:00