Merge pull request #241 from nandra/sumo-backports

Add kernel build fix + wifi support to sumo
xradio: Drop unnecessary patch when fix module compilation
2025-07-16 13:59:46 +02:00 · 2019-03-07 07:12:14 +01:00 · 2018-12-04 10:52:56 +01:00 · 2018-12-04 10:52:56 +01:00 · 2018-12-04 10:52:56 +01:00 · 2018-12-04 10:52:56 +01:00
25 changed files with 246 additions and 142 deletions
--- a/README.md
+++ b/README.md
@ -31,7 +31,7 @@ If you want to switch back to sunxi versions for some reasons (no device tree av

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

-	bitbake -c clean linux u-boot
+	bitbake -c clean virtual/kernel virtual/bootloader

 Performance
 ===========
--- a/conf/layer.conf
+++ b/conf/layer.conf
@ -7,3 +7,4 @@ BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend"
 BBFILE_COLLECTIONS += "meta-sunxi"
 BBFILE_PATTERN_meta-sunxi := "^${LAYERDIR}/"
 BBFILE_PRIORITY_meta-sunxi = "10"
+LAYERSERIES_COMPAT_meta-sunxi = "morty pyro rocko sumo thud"
--- a/conf/machine/nanopi-neo-air.conf
+++ b/conf/machine/nanopi-neo-air.conf
@ -5,7 +5,7 @@

 require conf/machine/include/sun8i.inc

-PREFERRED_VERSION_u-boot = "v2017.11%"
+PREFERRED_VERSION_u-boot = "v2018.03%"

 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
@ -0,0 +1,11 @@
+#@TYPE: Machine
+#@NAME: nanopi-neo-plus2
+#@DESCRIPTION: Machine configuration for the FriendlyARM NanoPi Neo Plus2, based
+# on the Allwinner H5 SoC.
+
+require conf/machine/include/sun50i.inc
+
+PREFERRED_VERSION_u-boot = "v2018.03%"
+
+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,7 +4,7 @@

 require conf/machine/include/sun8i.inc

-PREFERRED_VERSION_u-boot = "v2017.11%"
+PREFERRED_VERSION_u-boot = "v2018.03%"

 KERNEL_DEVICETREE = "sun8i-h3-nanopi-neo.dtb"
 UBOOT_MACHINE = "nanopi_neo_defconfig"
--- a/conf/machine/nanopi-neo2.conf
+++ b/conf/machine/nanopi-neo2.conf
@ -0,0 +1,11 @@
+#@TYPE: Machine
+#@NAME: nanopi-neo2
+#@DESCRIPTION: Machine configuration for the FriendlyARM NanoPi Neo 2, based on
+# the Allwinner H5 SoC.
+
+require conf/machine/include/sun50i.inc
+
+PREFERRED_VERSION_u-boot = "v2018.03%"
+
+KERNEL_DEVICETREE = "allwinner/sun50i-h5-nanopi-neo2.dtb"
+UBOOT_MACHINE = "nanopi_neo2_defconfig"
--- a/conf/machine/orange-pi-one.conf
+++ b/conf/machine/orange-pi-one.conf
@ -4,7 +4,7 @@

 require conf/machine/include/sun8i.inc

-PREFERRED_VERSION_u-boot = "v2017.11%"
+PREFERRED_VERSION_u-boot = "v2018.03%"

 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,7 +4,7 @@

 require conf/machine/include/sun8i.inc

-PREFERRED_VERSION_u-boot = "v2017.03%"
+PREFERRED_VERSION_u-boot = "v2018.03%"

 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,7 +4,7 @@

 require conf/machine/include/sun8i.inc

-PREFERRED_VERSION_u-boot = "v2017.11%"
+PREFERRED_VERSION_u-boot = "v2018.03%"

 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,7 @@

 require conf/machine/include/sun50i.inc

-PREFERRED_VERSION_u-boot = "v2017.11%"
+PREFERRED_VERSION_u-boot = "v2018.03%"

 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,7 +4,7 @@

 require conf/machine/include/sun8i.inc

-PREFERRED_VERSION_u-boot = "v2017.11%"
+PREFERRED_VERSION_u-boot = "v2018.03%"

 KERNEL_DEVICETREE = "sun8i-h2-plus-orangepi-zero.dtb"
 UBOOT_MACHINE = "orangepi_zero_defconfig"
--- a/conf/machine/pcduino.conf
+++ b/conf/machine/pcduino.conf
@ -4,7 +4,7 @@

 require conf/machine/include/sun4i.inc

-PREFERRED_VERSION_u-boot = "v2017.11%"
+PREFERRED_VERSION_u-boot = "v2018.03%"

 KERNEL_DEVICETREE = "sun4i-a10-pcduino.dtb"
 UBOOT_MACHINE = "Linksprite_pcDuino_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
@ -0,0 +1,26 @@
+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 ca9c2dd..74ce044 100644
+--- a/configs/nanopi_neo_air_defconfig
+++ b/configs/nanopi_neo_air_defconfig
+@@ -10,6 +10,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-nanopi-neo-air"
+ # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+ CONFIG_CONSOLE_MUX=y
+ CONFIG_SPL=y
+CONFIG_MMC_SUNXI_SLOT_EXTRA=2
+ # CONFIG_CMD_FLASH is not set
+ # CONFIG_SPL_DOS_PARTITION is not set
+ # CONFIG_SPL_ISO_PARTITION is not set
+-- 
+2.7.4
+
--- a/recipes-bsp/u-boot/files/u-boot-pylibfdt-native-build.patch
+++ b/recipes-bsp/u-boot/files/u-boot-pylibfdt-native-build.patch
@ -1,12 +1,16 @@
-diff --git a/tools/Makefile b/tools/Makefile
-index 5db2a54..54bd224 100644
--- a/tools/Makefile
-+++ b/tools/Makefile
-@@ -134,6 +134,7 @@ tools/_libfdt.so: $(LIBFDT_SRCS) $(LIBFDT_SWIG)
- 	$(Q)unset CC; \
- 	unset CROSS_COMPILE; \
- 	LDFLAGS="$(HOSTLDFLAGS)" CFLAGS= VERSION="u-boot-$(UBOOTVERSION)" \
-+		CC="$(HOSTCC)" LDSHARED="$(HOSTLDSHARED)" \
- 		CPPFLAGS="$(_hostc_flags)" OBJDIR=tools \
- 		SOURCES="$(LIBFDT_SRCS) tools/libfdt.i" \
- 		SWIG_OPTS="-I$(srctree)/lib/libfdt -I$(srctree)/lib" \
+diff --git a/scripts/dtc/pylibfdt/Makefile b/scripts/dtc/pylibfdt/Makefile
+index 01d5e0ffe3..2b2dfe0bd9 100644
+--- a/scripts/dtc/pylibfdt/Makefile
+++ b/scripts/dtc/pylibfdt/Makefile
+@@ -15,6 +15,8 @@ PYLIBFDT_srcs = $(addprefix $(LIBFDT_srcdir)/,$(LIBFDT_SRCS)) \
+ 
+ quiet_cmd_pymod = PYMOD   $@
+       cmd_pymod = unset CC; unset CROSS_COMPILE; unset CFLAGS;\
+		CC="$(HOSTCC)" \
+		LDSHARED="$(HOSTLDSHARED)" \
+ 		LDFLAGS="$(HOSTLDFLAGS)" \
+ 		VERSION="u-boot-$(UBOOTVERSION)" \
+ 		CPPFLAGS="$(HOSTCFLAGS) -I$(LIBFDT_srcdir)" OBJDIR=$(obj) \
+-- 
+2.11.0
+
--- a/recipes-bsp/u-boot/u-boot_2018.03.bb
+++ b/recipes-bsp/u-boot/u-boot_2018.03.bb
@ -18,12 +18,13 @@ DEFAULT_PREFERENCE_sun50i="1"

 SRC_URI = "git://git.denx.de/u-boot.git;branch=master \
           file://u-boot-pylibfdt-native-build.patch \
+           file://0001-nanopi_neo_air_defconfig-Enable-eMMC-support.patch \
           file://boot.cmd \
           "

-SRCREV = "c253573f3e269fd9a24ee6684d87dd91106018a5"
+SRCREV = "f95ab1fb6e37f0601f397091bb011edf7a98b890"

-PV = "v2017.11+git${SRCPV}"
+PV = "v2018.03+git${SRCPV}"
 PE = "2"

 S = "${WORKDIR}/git"
--- a/recipes-kernel/linux/linux-mainline/0001-arm64-dts-orange-pi-zero-plus2-fix-sdcard-detect.patch
+++ b/recipes-kernel/linux/linux-mainline/0001-arm64-dts-orange-pi-zero-plus2-fix-sdcard-detect.patch
@ -1,29 +0,0 @@
-From 1596e282f52c8f43fd1cc4a39096f28563558a5c Mon Sep 17 00:00:00 2001
-From: Sergey Matyukevich <geomatsi@gmail.com>
-Date: Fri, 3 Nov 2017 22:12:43 +0300
-Subject: [PATCH 1/2] arm64: dts: orange-pi-zero-plus2: fix sdcard detect
-
-The sdcard detect pin on orange-pi-zero-plus2 is pulled up.
-Fix cd-gpio description to enable sdcard detect.
-
-Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>
---
- arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts
-index b6b7a561df8c..a42fd79a62a3 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts
-+++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts
-@@ -71,7 +71,7 @@
- 	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;
- 	vmmc-supply = <&reg_vcc3v3>;
- 	bus-width = <4>;
-	cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>;
-+	cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>;
- 	status = "okay";
- };
- 
-- 
-2.11.0
-
--- a/recipes-kernel/linux/linux-mainline/0002-arm64-dts-orange-pi-zero-plus2-enable-AP6212a-WiFi-B.patch
+++ b/recipes-kernel/linux/linux-mainline/0002-arm64-dts-orange-pi-zero-plus2-enable-AP6212a-WiFi-B.patch
@ -1,74 +0,0 @@
-From 4d470855525b5993e766ad9f9304482739ba918d Mon Sep 17 00:00:00 2001
-From: Sergey Matyukevich <geomatsi@gmail.com>
-Date: Fri, 3 Nov 2017 22:24:45 +0300
-Subject: [PATCH 2/2] arm64: dts: orange-pi-zero-plus2: enable AP6212a WiFi/BT
- combo
-
-Enable AP6212a WiFi/BT combo chip on orange-pi-zero-plus2 board:
- WiFi SDIO interface is connected to MMC1
- WiFi REG_ON pin connected to gpio PA9: attach to mmc-pwrseq
- WiFi HOST_WAKE pin connected to gpio PL7
- BT is connected to UART1
-
-Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>
---
- .../allwinner/sun50i-h5-orangepi-zero-plus2.dts    | 32 ++++++++++++++++++++++
- 1 file changed, 32 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts
-index a42fd79a62a3..d415b7b67cce 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts
-+++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts
-@@ -64,6 +64,13 @@
- 		regulator-min-microvolt = <3300000>;
- 		regulator-max-microvolt = <3300000>;
- 	};
-+
-+	wifi_pwrseq: wifi_pwrseq {
-+		compatible = "mmc-pwrseq-simple";
-+		pinctrl-names = "default";
-+		reset-gpios = <&pio 0 9 GPIO_ACTIVE_LOW>; /* PA9 */
-+		post-power-on-delay-ms = <200>;
-+	};
- };
- 
- &mmc0 {
-@@ -75,6 +82,25 @@
- 	status = "okay";
- };
- 
-+&mmc1 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&mmc1_pins_a>;
-+	vmmc-supply = <&reg_vcc3v3>;
-+	vqmmc-supply = <&reg_vcc3v3>;
-+	mmc-pwrseq = <&wifi_pwrseq>;
-+	bus-width = <4>;
-+	non-removable;
-+	status = "okay";
-+
-+	brcmf: wifi@1 {
-+		reg = <1>;
-+		compatible = "brcm,bcm4329-fmac";
-+		interrupt-parent = <&r_pio>;
-+		interrupts = <0 7 IRQ_TYPE_LEVEL_LOW>;	/* PL7 */
-+		interrupt-names = "host-wake";
-+	};
-+};
-+
- &mmc2 {
- 	pinctrl-names = "default";
- 	pinctrl-0 = <&mmc2_8bit_pins>;
-@@ -90,3 +116,9 @@
- 	pinctrl-0 = <&uart0_pins_a>;
- 	status = "okay";
- };
-+
-+&uart1 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&uart1_pins>, <&uart1_rts_cts_pins>;
-+	status = "okay";
-+};
-- 
-2.11.0
-
--- a/recipes-kernel/linux/linux-mainline/0003-ARM-dts-nanopi-neo-air-Add-WiFi-eMMC.patch
+++ b/recipes-kernel/linux/linux-mainline/0003-ARM-dts-nanopi-neo-air-Add-WiFi-eMMC.patch
@ -9,18 +9,22 @@ This patch was originally submitted by Jelle van der Waa. Martin Kelly
 modified it to compile on the latest kernel, fixed up some review
 comments from Maxime Ripard, and re-tested the patch.

+The patch has been reworked to add back eMMC support which has been left
+out at the last backport.
+
 Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
 Cc: linux-sunxi@googlegroups.com
 Cc: devicetree@vger.kernel.org
 Signed-off-by: Jelle van der Waa <jelle@vdwaa.nl>
 Signed-off-by: Martin Kelly <mkelly@xevo.com>
 Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+Signed-off-by: Florin Sarbu <florin@resin.io>
 ---
- arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts | 24 ++++++++++++++++++++++++
- 1 file changed, 24 insertions(+)
+ arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts | 34 +++++++++++++++++++++++++++
+ 1 file changed, 34 insertions(+)

 diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts b/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts
-index 03ff6f8b93ff..920849092cc8 100644
+index 03ff6f8..a9331fe 100644
 --- a/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts
 +++ b/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts
@@ -72,6 +72,11 @@
@ -35,7 +39,7 @@ index 03ff6f8b93ff..920849092cc8 100644
 };
 
 &mmc0 {
-@@ -84,6 +89,25 @@
+@@ -84,6 +89,35 @@
 	status = "okay";
 };
 
@ -57,6 +61,16 @@ index 03ff6f8b93ff..920849092cc8 100644
 +		interrupt-names = "host-wake";
 +	};
 +};
+
+&mmc2 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&mmc2_8bit_pins>;
+	vmmc-supply = <&reg_vcc3v3>;
+	vqmmc-supply = <&reg_vcc3v3>;
+	bus-width = <8>;
+	non-removable;
+	status = "okay";
+};
 +
 &uart0 {
 	pinctrl-names = "default";
--- a/recipes-kernel/linux/linux-mainline/aarch64/defconfig
+++ b/recipes-kernel/linux/linux-mainline/aarch64/defconfig
@ -431,6 +431,11 @@ CONFIG_USB_QCOM_8X16_PHY=y
 CONFIG_USB_ULPI=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_RENESAS_USBHS_UDC=m
+CONFIG_USB_MUSB_HDRC=y
+# Restrict to host mode, as it is hard-coded that way in the device tree
+# (dr_mode = "host" in the &usb_otg node)
+CONFIG_USB_MUSB_HOST=y
+CONFIG_USB_MUSB_SUNXI=y
 CONFIG_MMC=y
 CONFIG_MMC_BLOCK_MINORS=32
 CONFIG_MMC_ARMMMCI=y
--- a/recipes-kernel/linux/linux-mainline/orange-pi-zero/0001-add-wifi-support.patch
+++ b/recipes-kernel/linux/linux-mainline/orange-pi-zero/0001-add-wifi-support.patch
@ -0,0 +1,79 @@
+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
+--- 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 @@
+ 		};
+ 	};
+ 
+-	reg_vcc_wifi: reg_vcc_wifi {
+	vdd_wifi: vdd_wifi {
+ 		compatible = "regulator-fixed";
+-		regulator-min-microvolt = <3300000>;
+-		regulator-max-microvolt = <3300000>;
+-		regulator-name = "vcc-wifi";
+-		enable-active-high;
+		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;
+ 	};
+ 
+-	wifi_pwrseq: wifi_pwrseq {
+	pwrseq_wifi: pwrseq_wifi@0 {
+ 		compatible = "mmc-pwrseq-simple";
+		pinctrl-names = "default";
+		pinctrl-0 = <&wifi_rst>;
+ 		reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>;
+-		post-power-on-delay-ms = <200>;
+		post-power-on-delay-ms = <50>;
+ 	};
+ };
+ 
+@@ -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>;
+	vqmmc-supply = <&vdd_wifi>;
+	mmc-pwrseq = <&pwrseq_wifi>;
+ 	bus-width = <4>;
+	max-frequency = <16000000>;
+ 	non-removable;
+ 	status = "okay";
+ 
+@@ -136,9 +141,30 @@
+ 	 */
+ 	xr819: sdio_wifi@1 {
+ 		reg = <1>;
+		compatible = "xradio,xr819";
+		pinctrl-names = "default";
+		pinctrl-0 = <&wifi_wake>;
+		interrupt-parent = <&pio>;
+		interrupts = <6 10 IRQ_TYPE_EDGE_RISING>;
+		interrupt-names = "host-wake";
+		local-mac-address = [dc 44 6d c0 ff ee];
+ 	};
+ };
+ 
+&pio {
+	wifi_wake: wifi_wake {
+		pins = "PG10";
+		function = "gpio_in";
+    };
+};
+
+&r_pio {
+	wifi_rst: wifi_rst {
+		pins = "PL7";
+		function = "gpio_out";
+    };
+};
+
+ &mmc1_pins_a {
+ 	bias-pull-up;
+ };
--- a/recipes-kernel/linux/linux-mainline_4.16.13.bb
+++ b/recipes-kernel/linux/linux-mainline_4.16.13.bb
@ -19,12 +19,14 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"

 S = "${WORKDIR}/linux-${PV}"
 	
-SRC_URI[md5sum] = "e1051f6b15d6399a5de2441dd4e15537"
-SRC_URI[sha256sum] = "ffc393a0c66f80375eacd3fb177b92e5c9daa07de0dcf947e925e049352e6142"
+SRC_URI[md5sum] = "86f56f586f35ac3a98e086dccfd2ff99"
+SRC_URI[sha256sum] = "6f0a7b3abd48eca3df5e29bfbcfc1c06dd2792f86d23cdb9ad37cf3e572df2e3"

 SRC_URI = "https://www.kernel.org/pub/linux/kernel/v4.x/linux-${PV}.tar.xz \
-        file://0001-arm64-dts-orange-pi-zero-plus2-fix-sdcard-detect.patch \
-        file://0002-arm64-dts-orange-pi-zero-plus2-enable-AP6212a-WiFi-B.patch \
        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 \
+	"
--- a/recipes-kernel/linux/linux-mainline_git.bb
+++ b/recipes-kernel/linux/linux-mainline_git.bb
@ -1,13 +1,15 @@
 SECTION = "kernel"
 DESCRIPTION = "Mainline Linux kernel"
 LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
-COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i|sun8i)"
+LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
+COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i|sun8i|sun50i)"

 inherit kernel

 require linux.inc

+# Since we're not using git, this doesn't make a difference, but we need to fill
+# in something or kernel-yocto.bbclass will fail.
 KBRANCH ?= "master"

 # Pull in the devicetree files into the rootfs
@ -19,9 +21,9 @@ DEFAULT_PREFERENCE = "-1"

 KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
 	
-# 4.15-rc1
-PV = "4.15+git${SRCPV}"
-SRCREV_pn-${PN} = "4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323"
+# v4.17-rc7
+PV = "v4.17-rc7+git${SRCPV}"
+SRCREV_pn-${PN} = "b04e217704b7f879c6b91222b066983a44a7a09f"

 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git;protocol=git;branch=master \
        file://defconfig \
--- a/recipes-kernel/linux/linux.inc
+++ b/recipes-kernel/linux/linux.inc
@ -1,7 +1,6 @@
 DESCRIPTION = "Linux Kernel"
 SECTION = "kernel"
 LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"

 INC_PR = "r0"

@ -16,7 +15,7 @@ CMDLINE_DEBUG ?= "loglevel=3"

 # Kernel bootlogo is distro-specific (default is OE logo).
 # Logo resolution (qvga, vga, ...) is machine-specific.
-LOGO_SIZE ?= '${@base_conditional("MACHINE_GUI_CLASS", "bigscreen", "vga", "qvga", d)}'
+LOGO_SIZE ?= '${@oe.utils.conditional("MACHINE_GUI_CLASS", "bigscreen", "vga", "qvga", d)}'
 # To use this, add file://${LOGO_SIZE}/logo_linux_clut224.ppm.bz2 or similar
 # to your kernel recipe, and then structure your logos for each resolution
 # accordingly.
@ -36,6 +35,10 @@ kernel_conf_variable() {
    fi
 }

+do_kernel_configme[depends] += "virtual/${TARGET_PREFIX}binutils:do_populate_sysroot"
+do_kernel_configme[depends] += "virtual/${TARGET_PREFIX}gcc:do_populate_sysroot"
+do_kernel_configme[depends] += "bc-native:do_populate_sysroot bison-native:do_populate_sysroot"
+
 do_configure_prepend() {
    CONF_SED_SCRIPT=""

--- a/recipes-kernel/xradio-firmware/xradio-firmware.bb
+++ b/recipes-kernel/xradio-firmware/xradio-firmware.bb
@ -0,0 +1,25 @@
+DESCRIPTION = "Xradio xr819 WiFi firmware"
+LICENSE = "CC0-1.0"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/${LICENSE};md5=0ceb3372c9595f0a8067e55da801e4a1"
+
+PV = "1.0"
+PR = "r0"
+
+SRCREV = "8b4a4ed16f7f9d12e59ff2f9ceba3cc335374dbe"
+
+COMPATIBLE_MACHINE = "orange-pi-zero"
+
+SRC_URI = "git://github.com/armbian/build.git;protocol=https"
+
+S = "${WORKDIR}/git"
+
+do_install() {
+    install -d ${D}${base_libdir}/firmware/xr819
+    install -m 0644 ${S}/bin/firmware-overlay/xr819/boot_xr819.bin ${D}${base_libdir}/firmware/xr819/
+    install -m 0644 ${S}/bin/firmware-overlay/xr819/sdd_xr819.bin ${D}${base_libdir}/firmware/xr819/
+    install -m 0644 ${S}/bin/firmware-overlay/xr819/fw_xr819.bin ${D}${base_libdir}/firmware/xr819/
+}
+
+FILES_${PN} = "${base_libdir}/*"
+
+PACKAGES = "${PN}"
--- a/recipes-kernel/xradio/xradio.bb
+++ b/recipes-kernel/xradio/xradio.bb
@ -0,0 +1,23 @@
+SUMMARY = "Xradio WiFi driver for orangepi-zero"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=a23a74b3f4caf9616230789d94217acb"
+
+inherit module
+
+PV = "0.1"
+PR = "r0"
+
+RDEPENDS_${PN} += "xradio-firmware"
+
+COMPATIBLE_MACHINE = "orange-pi-zero"
+
+SRCREV = "d649e5a78efdc56ecd0951e35ca60db175650232"
+
+SRC_URI = "git://github.com/fifteenhex/xradio.git;protocol=https \
+          "
+
+S = "${WORKDIR}/git"
+
+EXTRA_OEMAKE += "-C ${STAGING_KERNEL_DIR} M=${S}"
+
+KERNEL_MODULE_AUTOLOAD += "xradio_wlan"
Author	SHA1	Message	Date
Enrico Butera	fd625c6ada	Merge pull request #241 from nandra/sumo-backports Add kernel build fix + wifi support to sumo	2019-03-07 07:12:14 +01:00
Marek Belisko	6408de735c	xradio: Drop unnecessary patch when fix module compilation Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>	2018-12-04 10:52:56 +01:00
Marek Belisko	76a5f2b367	linux-mainline: Added wifi dts changes for orange-pi-zero wifi Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>	2018-12-04 10:52:56 +01:00
Marek Belisko	89714be769	recipes-kernel: xradio-firmware: Added wifi firmware for orange-pi-zero Taken from: https://github.com/Halolo/orange-pi-distro.git Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>	2018-12-04 10:52:56 +01:00
Marek Belisko	15ad39d0e1	recipes-kernel: xradio: Added wifi driver for orange-pi-zero wifi Driver taken from: https://github.com/Halolo/orange-pi-distro.git Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>	2018-12-04 10:52:56 +01:00
Sergey Matyukevich	d1e20fbe84	linux: specify explicit dependencies to configme task This change is an adaptation of commit 81e8a52e8e40e47 from poky/master. Linux kernel build dependencies include bison since v4.16. There were two different commits in poky adding those dependencies: - poky/master: 81e8a52e8e40e47 - poky/sumo: 20e4d309e12bf10 However just adding bison-native to DEPENDS in linux or linux-yocto class (as in poky/sumo) appears to be insufficient. The reason has been clarified in 81e8a52e8e40e47 commit message: "For linux-yocto, we also need to specify the compiler/tools dependencies for the configme task since it executes before configure and hence the main kernel build DEPENDS will not always be in the sysroot before it executes. Without those dependencies the kernel will be incorrectly configured (i.e. bison is missing) or the configuration will fail the mitigation tests." Layer meta-sunxi is compatible with multiple Yocto releases. Some of those releases have been developed and tested with earlier kernels. So they may not include new bison kernel build dependencies. That is why it makes sense to specify new kernel build dependencies explicitely in meta-sunxi kernel recipes rather than rely upon upper layers. Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>	2018-12-04 10:47:53 +01:00
Enrico Butera	29b20da5e8	orange-pi-pc-plus: update preferred U-boot version to v2018.03 Signed-off-by: Enrico Butera <ebutera@users.sourceforge.net>	2018-09-27 21:04:14 +02:00
Enrico Butera	214b4dbce6	Merge pull request #229 from floion/enable_nanopi-neo-air_emmc_support_in_uboot u-boot_2018.03.bb: Enable eMMC support for Nanopi Neo Air	2018-09-25 19:32:22 +02:00
Enrico Butera	7f0f6c99cf	Merge pull request #228 from floion/add_back_emmc_support_for_nanopi-neo-air linux-mainline: Add back eMMC support for Nanopi Neo Air	2018-09-25 19:30:12 +02:00
Florin Sarbu	3818d72941	u-boot_2018.03.bb: Enable eMMC support for Nanopi Neo Air Signed-off-by: Florin Sarbu <florin@resin.io>	2018-09-12 14:50:33 +02:00
Florin Sarbu	c8dbcebcfd	linux-mainline: Add back eMMC support for Nanopi Neo Air Signed-off-by: Florin Sarbu <florin@resin.io>	2018-09-12 11:57:05 +02:00
Enrico Butera	df468d72d7	Merge pull request #215 from XevoInc/nanopi-neo-plus2 Add the nanopi neo 2 and plus2	2018-06-10 23:40:08 +02:00
Enrico Butera	fef6da2d86	Merge pull request #220 from Kynetics/master Update kernel to latest versions	2018-06-10 23:38:58 +02:00
Enrico Butera	85cc70a3fa	Merge pull request #214 from XevoInc/layerseries-compat add LAYERSERIES_COMPAT declaration	2018-06-10 23:38:33 +02:00
Enrico Butera	f54a652383	Merge pull request #216 from leon-anavi/master README.md: Update Kernel / U-Boot Version	2018-06-10 23:37:46 +02:00
Enrico Butera	927dd91361	Merge pull request #221 from koenkooi/master-oe.utils Fix parse failure with sumo and master	2018-06-10 22:31:31 +02:00
Koen Kooi	9bd942ab3b	linux.inc: base_conditional -> oe.utils.conditional Fixes parsing with e.g. 'sumo' and 'master' branch of OE-core Signed-off-by: Koen Kooi <koen.kooi@linaro.org>	2018-06-10 08:55:39 +02:00
Diego Rondini	6759ac4ce6	linux-mainline: update stable to 4.16.13 Update stable kernel to 4.16.13 and git kernel to 4.17-rc7. Signed-off-by: Diego Rondini <diego.rondini@kynetics.com>	2018-06-01 11:59:44 +00:00
Martin Kelly	cf8eb364a0	add LAYERSERIES_COMPAT declaration In current Yocto master, it's now a warning not to include LAYERSERIES_COMPAT in layer.conf. See below for more information: https://www.yoctoproject.org/docs/latest/mega-manual/mega-manual.html#var-LAYERSERIES_COMPAT Add this information for all current development and stable releases. Tested-by: Sergey Matyukevich <geomatsi@gmail.com> Tested-by: Diego Rondini <diego.rondini@kynetics.com> Signed-off-by: Martin Kelly <mkelly@xevo.com>	2018-05-30 09:16:42 -07:00
Martin Kelly	4900e75a6a	nanopi-neo2: add new board Signed-off-by: Martin Kelly <mkelly@xevo.com>	2018-05-01 10:11:57 -07:00
Martin Kelly	d419cfe0a1	nanopi-neo-plus2: enable the second USB port Currently, only one of the exposed USB ports works because we haven't loaded the sunxi musb driver, which enables the OTG port to act in host mode. After enabling this driver in the config, both ports work correctly. Signed-off-by: Martin Kelly <mkelly@xevo.com>	2018-04-30 16:54:47 -07:00
Martin Kelly	c0f804f573	nanopi-neo-plus2: add new board Signed-off-by: Martin Kelly <mkelly@xevo.com>	2018-04-30 16:54:43 -07:00
Leon Anavi	8cd113bdd8	README.md: Update Kernel / U-Boot Version Update and improve the information in section "Kernel / U-Boot Version". Signed-off-by: Leon Anavi <leon@anavi.org>	2018-04-13 03:20:45 +03:00
Martin Kelly	5e61ba92e3	u-boot: upgrade to 2018.03 This version of u-boot includes nanopi-neo-plus2 support. Signed-off-by: Martin Kelly <mkelly@xevo.com>	2018-04-12 15:18:56 -07:00
Martin Kelly	7df74e3847	add LAYERSERIES_COMPAT declaration In current Yocto master, it's now a warning not to include LAYERSERIES_COMPAT in layer.conf. See below for more information: https://www.yoctoproject.org/docs/latest/mega-manual/mega-manual.html#var-LAYERSERIES_COMPAT Add this information for all current development and stable releases. Signed-off-by: Martin Kelly <mkelly@xevo.com>	2018-04-10 13:45:56 -07:00
Enrico Butera	073dbda366	Merge pull request #208 from geomatsi/kernel-update linux: bump kernel version to 4.15	2018-03-09 08:48:42 +01:00
Sergey Matyukevich	7bbd1ea6fa	linux: bump kernel version to 4.15 Bump Linux kernel version to 4.15. Notes: - orange-pi-zero-plus2: drop patch fixing sdcard detect -- this fix is already in 4.15 - H2+/H3 SoCs: in 4.15 ethernet works right out of the box Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>	2018-02-03 21:11:09 +03:00