Merge pull request #450 from asac/fix/scarthgap-kernel-build-orange-pi-3lts

fix orange-pi-3lts kernel build
2025-12-23 21:47:10 +01:00 · 2025-06-12 11:06:43 +02:00 · 2025-06-12 09:05:47 +00:00 · 2025-06-10 09:22:22 +02:00 · 2025-06-10 01:59:52 +02:00 · 2025-06-10 01:59:33 +02:00
33 changed files with 87 additions and 227 deletions
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -14,4 +14,4 @@ LAYERVERSION_sunxi = "1"

 LAYERDEPENDS_sunxi = "core meta-python meta-arm"

-LAYERSERIES_COMPAT_sunxi = "whinlatter"
+LAYERSERIES_COMPAT_sunxi = "honister kirkstone langdale mickledore nanbield scarthgap"
--- a/conf/machine/include/sunxi.inc
+++ b/conf/machine/include/sunxi.inc
@@ -11,7 +11,7 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 XSERVER = "xserver-xorg \
           xf86-input-evdev \
           xf86-input-mouse \
-           xf86-input-keyboard"
+           xf86-input-libinput"

 PREFERRED_PROVIDER_virtual/kernel ?= "linux-mainline"
 PREFERRED_VERSION_linux-mainline ?= "6.6.%"
--- a/conf/machine/olinuxino-a20som204.conf
+++ b/conf/machine/olinuxino-a20som204.conf
@@ -1,9 +0,0 @@
-#@TYPE: Machine
-#@NAME: Olimex A20-SOM204
-#@DESCRIPTION: Machine configuration for the Olimex A20-SOM204 Evaluation Board, based on Allwinner A20 CPU
-#https://github.com/OLIMEX/SOM204
-
-require conf/machine/include/sun7i.inc
-
-KERNEL_DEVICETREE = "allwinner/sun7i-a20-olimex-som204-evb.dtb"
-UBOOT_MACHINE = "A20-Olimex-SOM204-EVB_defconfig"
--- a/recipes-bsp/sunxi-board-fex/sunxi-board-fex.bb
+++ b/recipes-bsp/sunxi-board-fex/sunxi-board-fex.bb
@@ -13,6 +13,8 @@ SRC_URI = "git://github.com/linux-sunxi/sunxi-boards.git;protocol=https;branch=m
 # Increase PV with SRCREV change
 SRCREV = "af5f938ea14a3614d35ad3d9ab51a5d392117444"

+S = "${WORKDIR}/git"
+
 SUNXI_FEX_BIN_IMAGE = "fex-${MACHINE}-${PV}-${PR}.bin"
 SUNXI_FEX_BIN_IMAGE_SYMLINK = "fex-${MACHINE}.bin"
 SUNXI_FEX_BIN_IMAGE_SYMLINK_SIMPLE = "fex.bin"
--- a/recipes-bsp/u-boot/u-boot-sunxi.bb
+++ b/recipes-bsp/u-boot/u-boot-sunxi.bb
@@ -31,6 +31,8 @@ PV = "v2014.04+git${SRCPV}"
 # Corresponds 2014.04 in Makefile
 SRCREV = "ea1ac32bf76eb60baef474c2516fc431b381d952"

+S = "${WORKDIR}/git"
+
 PACKAGE_ARCH = "${MACHINE_ARCH}"

 SPL_BINARY="u-boot-sunxi-with-spl.bin"
--- a/recipes-bsp/u-boot/u-boot_%.bbappend
+++ b/recipes-bsp/u-boot/u-boot_%.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend:sunxi := "${THISDIR}/files:"

 DEPENDS:append:sunxi = " bc-native dtc-native swig-native python3-native flex-native bison-native "
 DEPENDS:append:sun50i = " trusted-firmware-a"
@@ -35,5 +35,5 @@ EXTRA_OEMAKE:append:sun50i = " BL31=${DEPLOY_DIR_IMAGE}/bl31.bin SCP=/dev/null"
 do_compile:sun50i[depends] += "trusted-firmware-a:do_deploy"

 do_compile:append:sunxi() {
-    ${B}/tools/mkimage -C none -A arm -T script -d ${UNPACKDIR}/boot.cmd ${UNPACKDIR}/${UBOOT_ENV_BINARY}
+    ${B}/tools/mkimage -C none -A arm -T script -d ${WORKDIR}/boot.cmd ${WORKDIR}/${UBOOT_ENV_BINARY}
 }
--- a/recipes-devtools/python/files/olinuxino-a20lime2-emmc
+++ b/recipes-devtools/python/files/olinuxino-a20lime2-emmc
@@ -1 +1 @@
-/home/marek/data/projects/kas/sources/meta-sunxi/recipes-devtools/python/files/olinuxino-a20lime2
+olinuxino-a20lime2
--- a/recipes-devtools/python/pya20_0.2.12.bb
+++ b/recipes-devtools/python/pya20_0.2.12.bb
@@ -6,17 +6,17 @@ LIC_FILES_CHKSUM = "file://PKG-INFO;md5=4e584373bb0f46ef1e423cb7df37847d"
 DEPENDS = "python3"

 # No GPIO mappings for other machines yet
-COMPATIBLE_MACHINE = "^(olinuxino-a13|olinuxino-a10|olinuxino-a20|olinuxino-a10lime|olinuxino-a20lime|olinuxino-a20lime2|olinuxino-a13som|olinuxino-a20som)$"
+COMPATIBLE_MACHINE = "(olinuxino-a13|olinuxino-a10|olinuxino-a20|olinuxino-a10lime|olinuxino-a20lime|olinuxino-a20lime2|olinuxino-a13som|olinuxino-a20som)"

 SRC_URI = "https://pypi.python.org/packages/source/p/pyA20/pyA20-${PV}.tar.gz \
           file://mapping.h \
          "
-S = "${UNPACKDIR}/pyA20-${PV}"
+S = "${WORKDIR}/pyA20-${PV}"

 inherit setuptools3

 do_compile:prepend() { 
-    cp ${UNPACKDIR}/mapping.h ${S}/pyA20/gpio/mapping.h
+cp ${WORKDIR}/mapping.h ${S}/pyA20/gpio/mapping.h
 }

 SRC_URI[md5sum] = "cab03b4931199804603d1074f6d8f48f"
--- a/recipes-graphics/libgles/sunxi-mali_git.bb
+++ b/recipes-graphics/libgles/sunxi-mali_git.bb
@@ -29,6 +29,8 @@ SRC_URI = "git://github.com/linux-sunxi/sunxi-mali.git;protocol=https;branch=mas
           file://0001-fix-test-build.patch \
           "

+S = "${WORKDIR}/git"
+
 DEPENDS = "libdrm xorgproto libump patchelf-native"

 PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}"
--- a/recipes-graphics/libump/libump_git.bb
+++ b/recipes-graphics/libump/libump_git.bb
@@ -10,3 +10,6 @@ SRCREV = "ec0680628744f30b8fac35e41a7bd8e23e59c39f"

 SRC_URI = "git://github.com/linux-sunxi/libump.git;protocol=https;branch=master"

+S = "${WORKDIR}/git"
+
+
--- a/recipes-graphics/mesa/mesa-gl_%.bbappend
+++ b/recipes-graphics/mesa/mesa-gl_%.bbappend
--- a/recipes-graphics/mesa/mesa_%.bbappend
+++ b/recipes-graphics/mesa/mesa_%.bbappend
--- a/recipes-graphics/xorg-xserver/libdri2_git.bb
+++ b/recipes-graphics/xorg-xserver/libdri2_git.bb
@@ -11,5 +11,7 @@ SRC_URI = "git://github.com/robclark/libdri2.git;protocol=http;branch=master"

 SRCREV = "4f1eef3183df2b270c3d5cbef07343ee5127a6a4"

+S = "${WORKDIR}/git"
+
 inherit autotools pkgconfig

--- a/recipes-graphics/xorg-xserver/xf86-video-fbturbo_git.bb
+++ b/recipes-graphics/xorg-xserver/xf86-video-fbturbo_git.bb
@@ -14,11 +14,13 @@ SRCREV = "e094e3c8f9004ca3347694bd05b99d136e8621b9"
 SRC_URI = "git://github.com/ssvb/xf86-video-fbturbo.git;protocol=http;branch=master \
           file://20-fbturbo.conf"

+S = "${WORKDIR}/git"
+
 CFLAGS += " -I${STAGING_INCDIR}/xorg "

 do_install:append() {
    install -d ${D}${datadir}/X11/xorg.conf.d
-    install -m 0644 ${UNPACKDIR}/20-fbturbo.conf ${D}${datadir}/X11/xorg.conf.d
+    install -m 0644 ${WORKDIR}/20-fbturbo.conf ${D}${datadir}/X11/xorg.conf.d
 }

 FILES:${PN} += "${datadir}/X11/xorg.conf.d/20-fbturbo.conf"
--- a/recipes-kernel/armbian-firmware/armbian-firmware_git.bb
+++ b/recipes-kernel/armbian-firmware/armbian-firmware_git.bb
@@ -6,6 +6,8 @@ PV = "1.0+git"
 SRC_URI = "git://github.com/armbian/firmware.git;protocol=https;branch=master"
 SRCREV = "4050e02da2dce2b74c97101f7964ecfb962f5aec"

+S = "${WORKDIR}/git"
+
 inherit allarch

 do_compile[noexec] = "1"
@@ -27,6 +29,7 @@ FILES:${PN}-ap6212 = " \
    ${nonarch_base_libdir}/firmware/brcm/BCM43430A1.hcd \
 "

+
 # Make armbian-firmware depend on all of the split-out packages.
 python populate_packages:prepend () {
    firmware_pkgs = oe.utils.packages_filter_out_system(d)
--- a/recipes-kernel/linux/linux-mainline.inc
+++ b/recipes-kernel/linux/linux-mainline.inc
@@ -20,7 +20,7 @@ RDEPENDS_${KERNEL_PACKAGE_NAME}-base += "kernel-devicetree"

 KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"

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

 # get release version 5.x or 6.x based on version
 KRELEASE = "${@d.getVar('PV', True).split('.')[0]}"
--- a/recipes-kernel/linux/linux-mainline/patches/0001-dts-orangepi-zero-Add-wifi-support.patch
+++ b/recipes-kernel/linux/linux-mainline/patches/0001-dts-orangepi-zero-Add-wifi-support.patch
@@ -3,8 +3,6 @@ From: Marek Belisko <marek.belisko@open-nandra.com>
 Date: Tue, 24 Oct 2023 10:40:52 +0200
 Subject: [PATCH] dts: orangepi-zero: Add wifi support

-Upstream-Status: Pending
-
 Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
 ---
 .../allwinner/sun8i-h2-plus-orangepi-zero.dts | 46 +++++++++++++++----
--- a/recipes-kernel/linux/linux-mainline/patches/0002-dts-nanopi-neo-air-Add-camera-support.patch
+++ b/recipes-kernel/linux/linux-mainline/patches/0002-dts-nanopi-neo-air-Add-camera-support.patch
@@ -3,8 +3,6 @@ From: Marek Belisko <marek.belisko@open-nandra.com>
 Date: Tue, 24 Oct 2023 10:42:36 +0200
 Subject: [PATCH] dts:nanopi-neo-air: Add camera support

-Upstream-Status: Pending
-
 Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
 ---
 .../dts/allwinner/sun8i-h3-nanopi-neo-air.dts | 85 +++++++++++++++++++
--- a/recipes-kernel/linux/linux-mainline/patches/0003-dts-allwinner-bananapi-m2-zero-Enforce-consistent-MM.patch
+++ b/recipes-kernel/linux/linux-mainline/patches/0003-dts-allwinner-bananapi-m2-zero-Enforce-consistent-MM.patch
@@ -6,8 +6,6 @@ Subject: [PATCH] dts: allwinner: bananapi-m2-zero: Enforce consistent MMC

 Enforce MMC number (sometimes the order was wrong and the device does not boot).

-Upstream-Status: Pending
-
 Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
 ---
 arch/arm/boot/dts/allwinner/sun8i-h2-plus-bananapi-m2-zero.dts | 3 +++
--- a/recipes-kernel/linux/linux-mainline/patches/0004-dts-allwinner-bananapi-m64-Consistent-nodes-for-mmc-devices.patch
+++ b/recipes-kernel/linux/linux-mainline/patches/0004-dts-allwinner-bananapi-m64-Consistent-nodes-for-mmc-devices.patch
@@ -3,8 +3,6 @@ From: Marek Belisko <marek.belisko@open-nandra.com>
 Date: Thu, 11 May 2023 11:18:33 +0200
 Subject: [PATCH] bananapi-m64: Consistent nodes for mmc devices

-Upstream-Status: Pending
-
 Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
 ---
 arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 3 +++
--- a/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/orange-pi-3lts/0001-clk-config-fixup-of_property_for_each_u32-after-land.patch
+++ b/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/orange-pi-3lts/0001-clk-config-fixup-of_property_for_each_u32-after-land.patch
@@ -0,0 +1,42 @@
+From 071808589900d4f2f5407a8a638466e75bb35a61 Mon Sep 17 00:00:00 2001
+From: Alexander Sack <asac@pantacor.com>
+Date: Thu, 12 Jun 2025 08:43:13 +0000
+Subject: [PATCH] clk-config: fixup of_property_for_each_u32 after landing of
+ 914ef7d1a702c510d0b59151a9623f9d20c69d2a
+
+---
+ drivers/clk/clk-conf.c | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/drivers/clk/clk-conf.c b/drivers/clk/clk-conf.c
+index 70b0fdd63..602383b96 100644
+--- a/drivers/clk/clk-conf.c
+++ b/drivers/clk/clk-conf.c
+@@ -16,9 +16,7 @@
+ static int __set_clk_flags(struct device_node *node)
+ {
+ 	struct of_phandle_args clkspec;
+-	struct property *prop;
+ 	int i, index = 0, rc;
+-	const __be32 *cur;
+ 	struct clk *clk;
+ 	u32 nr_cells;
+ 
+@@ -31,11 +29,11 @@ static int __set_clk_flags(struct device_node *node)
+ 	clkspec.np         = node;
+ 	clkspec.args_count = nr_cells;
+ 
+-	of_property_for_each_u32(node, "protected-clocks", prop, cur, clkspec.args[0]) {
+	of_property_for_each_u32(node, "protected-clocks", clkspec.args[0]) {
+ 		/* read the remainder of the clock specifier */
+ 		for (i = 1; i < nr_cells; ++i) {
+-			cur = of_prop_next_u32(prop, cur, &clkspec.args[i]);
+-			if (!cur) {
+			_it.item = of_prop_next_u32(_it.prop, _it.item, &clkspec.args[i]);
+			if (!_it.item) {
+ 				pr_err("clk: invalid value of protected-clocks"
+ 				       " property at %pOF\n", node);
+ 				return -EINVAL;
+-- 
+2.34.1
+
--- a/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/orange-pi-3lts/ASoC-hdmi-codec-fix-channel-allocation.patch
+++ b/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/orange-pi-3lts/ASoC-hdmi-codec-fix-channel-allocation.patch
@@ -1,142 +0,0 @@
-From 91b69779e0875e58d8973b2938a1cc4b7a1c455b Mon Sep 17 00:00:00 2001
-From: Jonas Karlman <jonas@kwiboo.se>
-Date: Sun, 25 Mar 2018 22:17:06 +0200
-Subject: [PATCH 22/44] ASoC: hdmi-codec: fix channel allocation
-
---
- sound/soc/codecs/hdmi-codec.c | 113 ++++++++++++++++------------------
- 1 file changed, 52 insertions(+), 61 deletions(-)
-
--- a/sound/soc/codecs/hdmi-codec.c
-+++ b/sound/soc/codecs/hdmi-codec.c
-@@ -194,78 +194,69 @@ static const struct snd_pcm_chmap_elem h
-  */
- static const struct hdmi_codec_cea_spk_alloc hdmi_codec_channel_alloc[] = {
- 	{ .ca_id = 0x00, .n_ch = 2,
-	  .mask = FL | FR},
-	/* 2.1 */
-	{ .ca_id = 0x01, .n_ch = 4,
-	  .mask = FL | FR | LFE},
-	/* Dolby Surround */
-+	  .mask = FL | FR },
-+	{ .ca_id = 0x03, .n_ch = 4,
-+	  .mask = FL | FR | LFE | FC },
- 	{ .ca_id = 0x02, .n_ch = 4,
- 	  .mask = FL | FR | FC },
-	/* surround51 */
-+	{ .ca_id = 0x01, .n_ch = 4,
-+	  .mask = FL | FR | LFE },
- 	{ .ca_id = 0x0b, .n_ch = 6,
-	  .mask = FL | FR | LFE | FC | RL | RR},
-	/* surround40 */
-	{ .ca_id = 0x08, .n_ch = 6,
-	  .mask = FL | FR | RL | RR },
-	/* surround41 */
-	{ .ca_id = 0x09, .n_ch = 6,
-	  .mask = FL | FR | LFE | RL | RR },
-	/* surround50 */
-+	  .mask = FL | FR | LFE | FC | RL | RR },
- 	{ .ca_id = 0x0a, .n_ch = 6,
- 	  .mask = FL | FR | FC | RL | RR },
-	/* 6.1 */
-	{ .ca_id = 0x0f, .n_ch = 8,
-	  .mask = FL | FR | LFE | FC | RL | RR | RC },
-	/* surround71 */
-+	{ .ca_id = 0x09, .n_ch = 6,
-+	  .mask = FL | FR | LFE | RL | RR },
-+	{ .ca_id = 0x08, .n_ch = 6,
-+	  .mask = FL | FR | RL | RR },
-+	{ .ca_id = 0x07, .n_ch = 6,
-+	  .mask = FL | FR | LFE | FC | RC },
-+	{ .ca_id = 0x06, .n_ch = 6,
-+	  .mask = FL | FR | FC | RC },
-+	{ .ca_id = 0x05, .n_ch = 6,
-+	  .mask = FL | FR | LFE | RC },
-+	{ .ca_id = 0x04, .n_ch = 6,
-+	  .mask = FL | FR | RC },
- 	{ .ca_id = 0x13, .n_ch = 8,
- 	  .mask = FL | FR | LFE | FC | RL | RR | RLC | RRC },
-	/* others */
-	{ .ca_id = 0x03, .n_ch = 8,
-	  .mask = FL | FR | LFE | FC },
-	{ .ca_id = 0x04, .n_ch = 8,
-	  .mask = FL | FR | RC},
-	{ .ca_id = 0x05, .n_ch = 8,
-	  .mask = FL | FR | LFE | RC },
-	{ .ca_id = 0x06, .n_ch = 8,
-	  .mask = FL | FR | FC | RC },
-	{ .ca_id = 0x07, .n_ch = 8,
-	  .mask = FL | FR | LFE | FC | RC },
-	{ .ca_id = 0x0c, .n_ch = 8,
-	  .mask = FL | FR | RC | RL | RR },
-	{ .ca_id = 0x0d, .n_ch = 8,
-	  .mask = FL | FR | LFE | RL | RR | RC },
-	{ .ca_id = 0x0e, .n_ch = 8,
-	  .mask = FL | FR | FC | RL | RR | RC },
-	{ .ca_id = 0x10, .n_ch = 8,
-	  .mask = FL | FR | RL | RR | RLC | RRC },
-	{ .ca_id = 0x11, .n_ch = 8,
-	  .mask = FL | FR | LFE | RL | RR | RLC | RRC },
-+	{ .ca_id = 0x1f, .n_ch = 8,
-+	  .mask = FL | FR | LFE | FC | RL | RR | FLC | FRC },
- 	{ .ca_id = 0x12, .n_ch = 8,
- 	  .mask = FL | FR | FC | RL | RR | RLC | RRC },
-	{ .ca_id = 0x14, .n_ch = 8,
-	  .mask = FL | FR | FLC | FRC },
-	{ .ca_id = 0x15, .n_ch = 8,
-	  .mask = FL | FR | LFE | FLC | FRC },
-	{ .ca_id = 0x16, .n_ch = 8,
-	  .mask = FL | FR | FC | FLC | FRC },
-	{ .ca_id = 0x17, .n_ch = 8,
-	  .mask = FL | FR | LFE | FC | FLC | FRC },
-	{ .ca_id = 0x18, .n_ch = 8,
-	  .mask = FL | FR | RC | FLC | FRC },
-	{ .ca_id = 0x19, .n_ch = 8,
-	  .mask = FL | FR | LFE | RC | FLC | FRC },
-	{ .ca_id = 0x1a, .n_ch = 8,
-	  .mask = FL | FR | RC | FC | FLC | FRC },
-	{ .ca_id = 0x1b, .n_ch = 8,
-	  .mask = FL | FR | LFE | RC | FC | FLC | FRC },
-	{ .ca_id = 0x1c, .n_ch = 8,
-	  .mask = FL | FR | RL | RR | FLC | FRC },
-	{ .ca_id = 0x1d, .n_ch = 8,
-	  .mask = FL | FR | LFE | RL | RR | FLC | FRC },
- 	{ .ca_id = 0x1e, .n_ch = 8,
- 	  .mask = FL | FR | FC | RL | RR | FLC | FRC },
-	{ .ca_id = 0x1f, .n_ch = 8,
-	  .mask = FL | FR | LFE | FC | RL | RR | FLC | FRC },
-+	{ .ca_id = 0x11, .n_ch = 8,
-+	  .mask = FL | FR | LFE | RL | RR | RLC | RRC },
-+	{ .ca_id = 0x1d, .n_ch = 8,
-+	  .mask = FL | FR | LFE | RL | RR | FLC | FRC },
-+	{ .ca_id = 0x10, .n_ch = 8,
-+	  .mask = FL | FR | RL | RR | RLC | RRC },
-+	{ .ca_id = 0x1c, .n_ch = 8,
-+	  .mask = FL | FR | RL | RR | FLC | FRC },
-+	{ .ca_id = 0x0f, .n_ch = 8,
-+	  .mask = FL | FR | LFE | FC | RL | RR | RC },
-+	{ .ca_id = 0x1b, .n_ch = 8,
-+	  .mask = FL | FR | LFE | RC | FC | FLC | FRC },
-+	{ .ca_id = 0x0e, .n_ch = 8,
-+	  .mask = FL | FR | FC | RL | RR | RC },
-+	{ .ca_id = 0x1a, .n_ch = 8,
-+	  .mask = FL | FR | RC | FC | FLC | FRC },
-+	{ .ca_id = 0x0d, .n_ch = 8,
-+	  .mask = FL | FR | LFE | RL | RR | RC },
-+	{ .ca_id = 0x19, .n_ch = 8,
-+	  .mask = FL | FR | LFE | RC | FLC | FRC },
-+	{ .ca_id = 0x0c, .n_ch = 8,
-+	  .mask = FL | FR | RC | RL | RR },
-+	{ .ca_id = 0x18, .n_ch = 8,
-+	  .mask = FL | FR | RC | FLC | FRC },
-+	{ .ca_id = 0x17, .n_ch = 8,
-+	  .mask = FL | FR | LFE | FC | FLC | FRC },
-+	{ .ca_id = 0x16, .n_ch = 8,
-+	  .mask = FL | FR | FC | FLC | FRC },
-+	{ .ca_id = 0x15, .n_ch = 8,
-+	  .mask = FL | FR | LFE | FLC | FRC },
-+	{ .ca_id = 0x14, .n_ch = 8,
-+	  .mask = FL | FR | FLC | FRC },
- };
- 
- struct hdmi_codec_priv {
--- a/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/orange-pi-3lts/Revert-clk-qcom-Support-protected-clocks-property.patch
+++ b/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/orange-pi-3lts/Revert-clk-qcom-Support-protected-clocks-property.patch
@@ -1,49 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Samuel Holland <samuel@sholland.org>
-Date: Mon, 30 Dec 2019 12:39:31 -0600
-Subject: [PATCH] Revert "clk: qcom: Support 'protected-clocks' property"
-
-Now that protected-clocks is handled in the clk core, this
-driver-specific implementation is redundant.
-
-This reverts commit b181b3b801da8893c8eb706e448dd5111b02de60.
-
-Signed-off-by: Samuel Holland <samuel@sholland.org>
---
- drivers/clk/qcom/common.c | 18 ------------------
- 1 file changed, 18 deletions(-)
-
--- a/drivers/clk/qcom/common.c
-+++ b/drivers/clk/qcom/common.c
-@@ -194,22 +194,6 @@ int qcom_cc_register_sleep_clk(struct de
- }
- EXPORT_SYMBOL_GPL(qcom_cc_register_sleep_clk);
- 
-/* Drop 'protected-clocks' from the list of clocks to register */
-static void qcom_cc_drop_protected(struct device *dev, struct qcom_cc *cc)
-{
-	struct device_node *np = dev->of_node;
-	struct property *prop;
-	const __be32 *p;
-	u32 i;
-
-	of_property_for_each_u32(np, "protected-clocks", prop, p, i) {
-		if (i >= cc->num_rclks)
-			continue;
-
-		cc->rclks[i] = NULL;
-	}
-}
-
- static struct clk_hw *qcom_cc_clk_hw_get(struct of_phandle_args *clkspec,
- 					 void *data)
- {
-@@ -272,8 +256,6 @@ int qcom_cc_really_probe(struct platform
- 	cc->rclks = rclks;
- 	cc->num_rclks = num_clks;
- 
-	qcom_cc_drop_protected(dev, cc);
-
- 	for (i = 0; i < num_clk_hws; i++) {
- 		ret = devm_clk_hw_register(dev, clk_hws[i]);
- 		if (ret)
--- a/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/orange-pi-3lts/orange-pi-3lts-common.scc
+++ b/recipes-kernel/linux/linux-mainline/sunxi-kmeta/bsp/orange-pi-3lts/orange-pi-3lts-common.scc
@@ -2,11 +2,9 @@
 #

 patch clk-Implement-protected-clocks-for-all-OF-clock-prov.patch
-patch Revert-clk-qcom-Support-protected-clocks-property.patch   
 patch rtc-sun6i-Allow-RTC-wakeup-after-shutdown.patch      
 patch firmware-arm_scpi-Support-unidirectional-mailbox-cha.patch
 patch arm64-dts-allwinner-h6-Add-SCPI-protocol.patch   
-patch ASoC-hdmi-codec-fix-channel-allocation.patch               
 patch arm64-dts-h6-deinterlace.patch                               
 patch HACK-h6-Add-HDMI-sound-card.patch                            
 patch arm64-dts-allwinner-h6-Add-AC200-EPHY-related-nodes.patch    
@@ -16,5 +14,6 @@ patch arm64-dts-allwinner-h6-Fix-Cedrus-IOMMU-again.patch
 patch iommu-sun50i-Allow-page-sizes-multiple-of-4096.patch 
 patch OrangePi-3-LTS-support.patch 
 patch arm64-dts-allwinner-Enforce-consistent-MMC-numbering.patch
+patch 0001-clk-config-fixup-of_property_for_each_u32-after-land.patch

-kconf harware orange-pi-3lts.cfg
+kconf hardware orange-pi-3lts.cfg
--- a/recipes-kernel/linux/linux-mainline_6.6.85.bb
+++ b/recipes-kernel/linux/linux-mainline_6.6.85.bb
@@ -9,5 +9,6 @@ SRC_URI += "https://www.kernel.org/pub/linux/kernel/v${KRELEASE}.x/linux-${PV}.t
           "
 SRC_URI[sha256sum] = "5ebaccf4ca3428cd26817bae62171f4efd270eed866a3e3d0a1d9e970b7b7529"

+
 KERNEL_FEATURES:append:orange-pi-3lts = " bsp/orange-pi-3lts/orange-pi-3lts-6_5.scc bsp/uwe5622/uwe5622-6_6.scc bsp/orange-pi-3lts/fix-rtc.scc"
 KERNEL_FEATURES:append:orange-pi-zero2 = " bsp/h61x/orangepi-zero2-6_6.scc bsp/uwe5622/uwe5622-6_6.scc"
--- a/recipes-kernel/linux/linux-sunxi_3.4.bb
+++ b/recipes-kernel/linux/linux-sunxi_3.4.bb
@@ -21,6 +21,8 @@ SRC_URI += "git://github.com/linux-sunxi/linux-sunxi.git;branch=sunxi-3.4;protoc
        "
 LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"

+S = "${WORKDIR}/git"
+
 #fix QA issue "Files/directories were installed but not shipped: /usr/src/debug"
 INHIBIT_PACKAGE_DEBUG_SPLIT = "1"

--- a/recipes-kernel/linux/linux-tools.inc
+++ b/recipes-kernel/linux/linux-tools.inc
@@ -24,6 +24,7 @@ fakeroot do_install_perf () {
    fi
 }

+
 # perf tasks
 addtask compile_perf after do_compile before do_install
 addtask install_perf after do_install before do_package
--- a/recipes-kernel/linux/linux.inc
+++ b/recipes-kernel/linux/linux.inc
@@ -35,10 +35,9 @@ kernel_conf_variable() {
    fi
 }

-do_kernel_configme[depends] += "virtual/cross-binutils:do_populate_sysroot"
-do_kernel_configme[depends] += "virtual/cross-cc:do_populate_sysroot"
+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_kernel_configme[depends] += "kern-tools-native:do_populate_sysroot"

 do_configure:prepend() {
    CONF_SED_SCRIPT=""
@@ -46,8 +45,8 @@ do_configure:prepend() {
    #
    # logo support, if you supply logo_linux_clut224.ppm in SRC_URI, then it's going to be used
    #
-    if [ -e ${UNPACKDIR}/logo_linux_clut224.ppm ]; then
-        install -m 0644 ${UNPACKDIR}/logo_linux_clut224.ppm drivers/video/logo/logo_linux_clut224.ppm
+    if [ -e ${WORKDIR}/logo_linux_clut224.ppm ]; then
+        install -m 0644 ${WORKDIR}/logo_linux_clut224.ppm drivers/video/logo/logo_linux_clut224.ppm
        kernel_conf_variable LOGO y
        kernel_conf_variable LOGO_LINUX_CLUT224 y
    fi
--- a/recipes-kernel/uwe5622-firmware/uwe5622-firmware.bb
+++ b/recipes-kernel/uwe5622-firmware/uwe5622-firmware.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "UWE5622 Wifi firmware"
 LICENSE = "CC0-1.0"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/${LICENSE};md5=0ceb3372c9595f0a8067e55da801e4a1"

-S = "${UNPACKDIR}"
+S = "${WORKDIR}"

 COMPATIBLE_MACHINE = "(orange-pi-zero2|orange-pi-3lts)"

--- a/recipes-kernel/xradio-firmware/xradio-firmware.bb
+++ b/recipes-kernel/xradio-firmware/xradio-firmware.bb
@@ -11,6 +11,8 @@ COMPATIBLE_MACHINE = "orange-pi-zero"

 SRC_URI = "git://github.com/armbian/firmware.git;protocol=https;branch=master"

+S = "${WORKDIR}/git"
+
 do_install() {
    install -d ${D}${base_libdir}/firmware/xr819
    install -m 0644 ${S}/xr819/boot_xr819.bin ${D}${base_libdir}/firmware/xr819/
--- a/recipes-kernel/xradio/xradio.bb
+++ b/recipes-kernel/xradio/xradio.bb
@@ -17,6 +17,8 @@ SRC_URI = "\
 	   git://github.com/fifteenhex/xradio.git;protocol=http;branch=master \
          "

+S = "${WORKDIR}/git"
+
 EXTRA_OEMAKE += "-C ${STAGING_KERNEL_DIR} M=${S}"

 KERNEL_MODULE_AUTOLOAD += "xradio_wlan"
--- a/recipes-multimedia/gstreamer/gst-plugin-cedar_git.bb
+++ b/recipes-multimedia/gstreamer/gst-plugin-cedar_git.bb
@@ -15,6 +15,8 @@ SRC_URI = "git://github.com/ebutera/gst-plugin-cedar.git;protocol=https;branch=m
 PV = "0.10.1+git${SRCPV}"
 PR = "r1"

+S = "${WORKDIR}/git"
+
 FILES:${PN} += "${libdir}/gstreamer-0.10/*.so"
 FILES:${PN}-dbg += "${libdir}/gstreamer-0.10/.debug"
 FILES:${PN}-dev += "${libdir}/gstreamer-0.10/*.la"
--- a/recipes-support/sunxi-tools/sunxi-tools_git.bb
+++ b/recipes-support/sunxi-tools/sunxi-tools_git.bb
@@ -12,6 +12,8 @@ SRCREV = "9a3d62aa0c820b3dd42ba3409b2043f4143683cd"

 inherit pkgconfig

+S = "${WORKDIR}/git"
+
 BBCLASSEXTEND = "native nativesdk"

 FILES:${PN} = "${bindir}/*"
Author	SHA1	Message	Date
Marek Belisko	d5214c790e	Merge pull request #450 from asac/fix/scarthgap-kernel-build-orange-pi-3lts fix orange-pi-3lts kernel build	2025-06-12 11:06:43 +02:00
Alexander Sack	25d90211d9	fix orange-pi-3lts kernel build	2025-06-12 09:05:47 +00:00
Marek Belisko	204836ce5d	Merge pull request #449 from okaestne/scarthgap [Scarthgap] backport PRs for new hardware and fixes	2025-06-10 09:22:22 +02:00
Oliver Kästner	d564c5f776	linux-mainline: fix spacing with KERNEL_FEATURES:prepend Prepends should always end with a space char. Fix that by just turning it into an append. Change the second prepend to an append for consistency. Signed-off-by: Oliver Kästner <git@oliver-kaestner.de>	2025-06-10 01:59:52 +02:00
Oliver Kästner	89bbea9aa1	ap6212: add missing leading space to append Signed-off-by: Oliver Kästner <git@oliver-kaestner.de>	2025-06-10 01:59:33 +02:00
Oliver Kästner	6736fef4ec	linux-mainline: bump to 6.6.85 Signed-off-by: Oliver Kästner <git@oliver-kaestner.de>	2025-06-10 01:59:32 +02:00
Oliver Kästner	0c4b7e95d5	chore: drop stale kmeta drop kmeta for older and removed kernel versions Signed-off-by: Oliver Kästner <git@oliver-kaestner.de>	2025-06-10 01:59:05 +02:00
Oliver Kästner	e89e6b9483	fix handling KERNEL_DEVICETREE with allwinner/ prefix Since linux 6.5, .dts files live in vendor subdirs. Fix all `KERNEL_DEVICETREE` definitions to contain the `allwinner` subdir as prefix and drop code that previously added the prefix on demand. On the other hand, drop the prefix for `BOOT_IMAGE_FILES`, which searches the .dtb within `DEPLOY_DIR`. Signed-off-by: Oliver Kästner <git@oliver-kaestner.de>	2025-06-10 01:59:05 +02:00
Oliver Kästner	118683a0a9	chore: drop linux-mainline pre-v6.5 patches Signed-off-by: Oliver Kästner <git@oliver-kaestner.de>	2025-06-10 01:59:05 +02:00
Oliver Kästner	7c14a6d25e	chore: drop linux-mainline v6.5.11 Signed-off-by: Oliver Kästner <git@oliver-kaestner.de>	2025-06-10 01:59:04 +02:00
Oliver Kästner	6c60b823ae	chore: drop linux-mainline v6.1.9 Signed-off-by: Oliver Kästner <git@oliver-kaestner.de>	2025-06-10 01:59:04 +02:00
Oliver Kästner	54c5cf892a	chore: drop linux-mainline v5.15.91 Signed-off-by: Oliver Kästner <git@oliver-kaestner.de>	2025-06-10 01:59:04 +02:00
Oliver Kästner	585df5b396	ap6212: enable bluetooth support	2025-06-10 01:59:04 +02:00
Oliver Kästner	4657eb284f	feat: add MACHINE_FEATURE wifi and bluetooth for AP6212 and AP6330 boards Signed-off-by: Oliver Kästner <git@oliver-kaestner.de>	2025-06-10 01:59:04 +02:00
Oliver Kästner	e1e48022d7	linux-mainline: dts: orangepi-zero: add mmc aliases for consistent enumeration This fixes random boot failures. Same workaround as in the other patches. Signed-off-by: Oliver Kästner <git@oliver-kaestner.de>	2025-06-10 01:59:04 +02:00
Oliver Kästner	2834b7f951	Add BananaPi M2 Berry support Add `bananapi-m2-berry` machine conf and enable WiFi for it.	2025-06-10 01:59:04 +02:00
Marek Belisko	f5025d0808	sunxi64.inc: Fix wrong UBOOT_LOADADDRESS variable value Signed-off-by: Marek Belisko <marek.belisko@gmail.com>	2025-06-10 01:59:04 +02:00
Stefan Gloor	1d4cf8ae39	recipes-kernel/linux-mainline: add MMC alias for Olinuxino A20 Add patch that adds MMC aliases to device tree for consistent enumeration of SD cards. Signed-off-by: Stefan Gloor <code@stefan-gloor.ch>	2025-06-10 01:59:04 +02:00
Leon Anavi	4e1636e0a4	u-boot_%.bbappend: Fix U-Boot for sun9i Use a proper fix instead of reverting U-Boot commit ffb0294. After reporting this issue to the U-Boot mailing list, a patch that works on Allwinner A80 machines like Merrii A80 Optimus board was proposed by Andre Przywara: https://lists.denx.de/pipermail/u-boot/2024-December/575050.html Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>	2025-06-10 01:59:03 +02:00
Leon Anavi	eada1eeb7a	Enable AMPAK AP6330 WiFi and Bluetooth Enable AMPAK AP6330 that combines Broadcom Wifi (BCM4330) and Bluetooth 4.0 (BCM40183) chips for sun9i devices such as Merrii A80 Optimus and Cubieboard 4. Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>	2025-06-10 01:59:03 +02:00
Stefan Gloor	d365a91be3	recipes/devtools: replace distutils3.bbclass with setuptools3.bbclass distutils3 is deprecated and its use produces warnings during build: WARNING: distutils-common-base.bbclass is deprecated, please use setuptools3-base.bbclass instead WARNING: distutils3-base.bbclass is deprecated, please use setuptools3-base.bbclass instead WARNING: distutils3.bbclass is deprecated, please use setuptools3.bbclass instead setuptools3 should be a drop-in replacement. Signed-off-by: Stefan Gloor <code@stefan-gloor.ch>	2025-06-10 01:59:03 +02:00
Ovidiu Panait	7abeeaf707	u-boot: apply ttyS3 patch only for mangopi-mq-t-tt13 builds For all boards except mangopi-mq-t-tt13, switch back the serial console to ttyS0. Apply the ttyS3 patch added in commit [1] only when building for the mangopi-mq-t-tt13 board. Boot tested on orangepi-zero2 board - the kernel logs are again printed to the debug serial console. [1] `9edbede7bc` ("u-boot: Fix console for mangopi-mq-r-tt13 board") Signed-off-by: Ovidiu Panait <ovidiu.panait.oss@gmail.com>	2025-06-10 01:59:03 +02:00
Leon Anavi	bb90acac4b	xradio-firmware: Add branch to SRC_URI Explicitly specify a branch parameter and fix the warning: The future default branch used by tools and repositories is uncertain and we will therefore soon require this is set in all git urls. Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>	2025-06-10 01:59:03 +02:00
ludiazv	7f554a1d24	update opi zero 2 with auto load modules for wifi and bt	2025-06-10 01:59:03 +02:00
ludiazv	ebbedb7a97	remove hack for hdmi out	2025-06-10 01:59:03 +02:00
ludiazv	2a808de9d1	fix/improve MAC address management	2025-06-10 01:59:03 +02:00
ludiazv	4ad0f09f13	h616 and h618 patches	2025-06-10 01:59:03 +02:00
ludiazv	993171c995	add opizero 2 to 6.6	2025-06-10 01:59:02 +02:00
alperak	41ade85840	Add Orange Pi Prime machine support - Ethernet, WiFi, Bluetooth, USBs are working fine but HDMI is working until U-Boot loading the kernel. Then it stop working. - Tested with core-image-base and kernel mainline 6.6.28 Signed-off-by: alperak <alperyasinak1@gmail.com>	2025-06-10 00:48:19 +02:00
Dan McGregor	0e0525ebfa	trusted-firmware: Make append machine specific	2025-06-10 00:48:19 +02:00
Dan McGregor	5790998d9e	xserver-xorg: don't unconditionally add xshmfence This is only required if dri3 is enabled in the server. It shouldn't be included unconditionally. Arguably this should be put in openembedded-core, but for now it's safe to put here.	2025-06-10 00:48:19 +02:00
Dan McGregor	33b02e648d	linux-firmware: Only add firmware to sunxi machines It doesn't make sense to unconditionally include these firmware files on other machines. Gate it on whether we're a sunxi machine.	2025-06-10 00:45:43 +02:00
Marek Belisko	69c4909d49	u-boot: Fix console for mangopi-mq-r-tt13 board Signed-off-by: Marek Belisko <marek.belisko@gmail.com>	2025-06-10 00:41:50 +02:00
Marek Belisko	66fd7c960f	conf/machine: add support for MangoPi MQ-R T113-S3 Signed-off-by: Leo Soares <leojrfs@gmail.com> Signed-off-by: Marek Belisko <marek.belisko@gmail.com>	2025-06-10 00:34:33 +02:00
ludiazv	d93a7ff945	add preferred kernel version to sunxi64	2025-06-10 00:34:33 +02:00
ludiazv	834efaa4b8	update opi 3lts machine	2025-06-10 00:34:32 +02:00
ludiazv	894fa97145	add kernel features	2025-06-10 00:34:32 +02:00
ludiazv	f8a51177af	update uwe5622 patches	2025-06-10 00:34:32 +02:00
ludiazv	774f0f8649	add kernel patches for orangepi-3lts for 6.1 6.5 kernels(KMETA)	2025-06-10 00:34:32 +02:00
ludiazv	68cc446633	add wifi uwe driver firmware and kernel support(KMETA)	2025-06-10 00:34:31 +02:00
ludiazv	735586e90e	add orange-pi-3lts machine config and u-boot support for this board	2025-06-10 00:34:23 +02:00
Marek Belisko	c73c0a2c4a	Merge pull request #428 from leon-anavi/scarthgap-sun9i [Scartgap] Add Merrii A80 Optimus board and Cubieboard 4	2024-12-10 09:32:16 +01:00
Leon Anavi	3be61ac722	cubieboard4.conf: Add machine Add machine cubieboard4 for Cubieboard 4 with Allwinner A80 SoC from the sun9i family with mainline U-Boot and Linux kernel. Thanks to Lazar Hristov for testing core-image-base on the machine. Tested-by: Lazar Hristov <lhristov@gmail.com> Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>	2024-12-10 00:10:33 +02:00
Leon Anavi	512fed3281	u-boot_%.bbappend: Fix for sun9i Temporary revert commit ffb0294 from 12 Nov 2023 for device with Allwinner A80 SoC (aka sun9i): sunxi: board: simplify early PMIC setup conditions On Merrii A80 Optimus this git commit causes U-Boot to hang at: Starting kernel ... Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>	2024-12-10 00:09:55 +02:00
Leon Anavi	57afbf176f	sun9i/defconfig: Default kernel defconfig Add a default Linux kernel defconfig for devices from the sun9i family with Allwinner A80 SoC such as Merrii A80 Optimus board. Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>	2024-12-10 00:04:54 +02:00
Leon Anavi	3a42520278	merrii-a80-optimus.conf: Add machine Add machine merrii-a80-optimus for Merrii A80 Optimus development board that is supported by U-Boot and mainline Linux kernel. Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>	2024-12-10 00:04:50 +02:00
Leon Anavi	33428d8c22	sun9i.inc: Add SoC family sun9i Create SoC family sun9i for machines with Allwinner A80 that are supported by mainline U-Boot and mainline Linux kernel. Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>	2024-12-10 00:04:40 +02:00
Marek Belisko	05827e296c	Merge pull request #418 from noodlefighter/scarthgap fix(scarthgap): replace xf86-input-keyboard with xf86-input-libinput …	2024-09-16 20:53:30 +02:00
noodlefighter	90bbd8619f	fix(scarthgap): replace xf86-input-keyboard with xf86-input-libinput in Yocto The xf86-input-keyboard package is obsolete and has been replaced by libinput/evdev as per the migration guide (migration-4.1.rst). This commit addresses the error "ERROR: Nothing RPROVIDES 'xf86-input-keyboard'" by updating the dependency to xf86-input-libinput.	2024-09-16 23:21:24 +08:00
Marek Belisko	9e5f3281a5	Merge pull request #415 from leon-anavi/scarthgap-linux-fix-license linux: change licence name	2024-08-16 10:54:13 +02:00
Dan McGregor	2bbe91795d	linux: change licence name Use SPDX name for the kernel, oe-core changed a long time ago and now we're throwing licence name warnings. Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>	2024-08-16 11:45:40 +03:00
Marek Belisko	8f5b915749	Merge pull request #412 from ardavast/lime2-emmc-relative-symlink pya20: Make olinuxino-a20lime2-emmc a relative symlink	2024-06-05 15:14:50 +02:00
Ardavast Dayleryan	3a36f259f5	pya20: Make olinuxino-a20lime2-emmc a relative symlink	2024-05-26 03:49:39 +03:00
Marek Belisko	da878a06b8	pya20: Added support for olinuxino-a20lime2-emmc Signed-off-by: Marek Belisko <marek.belisko@gmail.com>	2024-05-13 09:20:17 +02:00