conf: added sunxi and sunxi64 machine overrides.

fixing missing 'compatible' property in reg_vcc_wifi node
linux: refresh orange-pi-zero wifi patch
2025-07-16 22:09:47 +02:00 · 2020-11-23 08:19:02 +01:00 · 2020-02-10 19:57:09 +01:00 · 2020-02-10 19:56:57 +01:00 · 2019-09-07 22:43:19 +02:00 · 2019-09-07 22:43:08 +02:00
8 changed files with 29 additions and 17 deletions
--- a/conf/machine/include/sun50i.inc
+++ b/conf/machine/include/sun50i.inc
@ -1,4 +1,4 @@
 require conf/machine/include/sunxi64.inc
-require conf/machine/include/arm/arch-armv8.inc
+require conf/machine/include/arm/arch-armv8a.inc

 SOC_FAMILY = "sun50i"
--- a/conf/machine/include/sunxi.inc
+++ b/conf/machine/include/sunxi.inc
@ -1,6 +1,8 @@
 SOC_FAMILY ??= ""
 include conf/machine/include/soc-family.inc

+MACHINEOVERRIDES =. "sunxi:"
+
 # Sub-architecture support
 MACHINE_SOCARCH_SUFFIX ?= ""
 MACHINE_SOCARCH_SUFFIX_sun4i = "-sun4i"
--- a/conf/machine/include/sunxi64.inc
+++ b/conf/machine/include/sunxi64.inc
@ -1,6 +1,8 @@
 SOC_FAMILY ??= ""
 include conf/machine/include/soc-family.inc

+MACHINEOVERRIDES =. "sunxi:sunxi64:"
+
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-mainline"
 PREFERRED_PROVIDER_u-boot ?= "u-boot"
 PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot"
--- a/recipes-graphics/libgles/sunxi-mali_git.bb
+++ b/recipes-graphics/libgles/sunxi-mali_git.bb
@ -70,6 +70,7 @@ 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}
--- 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,8 +1,8 @@
 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 84cd9c061..917986cce 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,15 @@
 		};
 	};
 
@ -19,10 +19,16 @@ index 6713d0f2b3f4..ad0829e8f716 100644
 		gpio = <&pio 0 20 GPIO_ACTIVE_HIGH>;
 +		startup-delay-us = <70000>;
 +		enable-active-high;
+
+ 	};
+ 
+ 	reg_vdd_cpux: vdd-cpux-regulator {
+@@ -106,10 +108,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 +38,10 @@ index 6713d0f2b3f4..ad0829e8f716 100644
 	};
 };
 
-@@ -124,9 +127,11 @@
+@@ -140,9 +144,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 +52,7 @@ index 6713d0f2b3f4..ad0829e8f716 100644
 	non-removable;
 	status = "okay";
 
-@@ -136,9 +141,30 @@
+@@ -152,6 +158,13 @@
 	 */
 	xr819: sdio_wifi@1 {
 		reg = <1>;
@ -60,6 +66,11 @@ index 6713d0f2b3f4..ad0829e8f716 100644
 	};
 };
 
+@@ -208,3 +221,18 @@
+ 	status = "okay";
+ 	usb0_id_det-gpios = <&pio 6 12 GPIO_ACTIVE_HIGH>; /* PG12 */
+ };
+
 +&pio {
 +	wifi_wake: wifi_wake {
 +		pins = "PG10";
@ -74,6 +85,3 @@ index 6713d0f2b3f4..ad0829e8f716 100644
 +    };
 +};
 +
- &mmc1_pins_a {
- 	bias-pull-up;
- };
--- a/recipes-kernel/linux/linux-mainline_4.19.63.bb
+++ b/recipes-kernel/linux/linux-mainline_4.19.63.bb
@ -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] = "5f72b9a1e40192aecf867ff2cdcc15ba"
+SRC_URI[sha256sum] = "75988760b931864b46292dcfad1dd54b3f4da10168041f48ca6d7f6dd4e5d25d"

 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
@ -28,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-add-wifi-support.patch \
+	file://0001-dts-orange-pi-zero-Add-wifi-support.patch \
 	"
--- a/recipes-kernel/linux/linux-mainline_5.2-rc2.bb
+++ b/recipes-kernel/linux/linux-mainline_5.2-rc2.bb
@ -26,9 +26,8 @@ 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"
Author	SHA1	Message	Date
Bartłomiej Burdukiewicz	910aa5f159	conf: added sunxi and sunxi64 machine overrides.	2020-11-23 08:19:02 +01:00
Petr Buchta	41953517cb	fixing missing 'compatible' property in reg_vcc_wifi node	2020-02-10 19:57:09 +01:00
Marek Belisko	cfca593338	linux: refresh orange-pi-zero wifi patch Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>	2020-02-10 19:56:57 +01:00
slapin	345cd0d023	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:43:19 +02:00
slapin	4a083b6678	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 22:43:08 +02:00
Marek Belisko	986634abbb	linux-mainline: Bump 4.19 to latest stable Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>	2019-08-07 08:14:58 +02:00