From 4bd68c59e109de8fea2cfcd3047d6916439bda47 Mon Sep 17 00:00:00 2001 From: Quentin Schulz Date: Fri, 3 Feb 2023 18:10:04 +0100 Subject: kernel: linux: linux-tsd: prepare for new board support In preparation for a new board support, let's make the current variables board-specific wherever appropriate. Signed-off-by: Quentin Schulz --- recipes-kernel/linux/linux-tsd_6.0.bb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/recipes-kernel/linux/linux-tsd_6.0.bb b/recipes-kernel/linux/linux-tsd_6.0.bb index d3e3119..f2ce785 100644 --- a/recipes-kernel/linux/linux-tsd_6.0.bb +++ b/recipes-kernel/linux/linux-tsd_6.0.bb @@ -9,16 +9,18 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" inherit kernel -SRC_GIT_REPO = "git://git.theobroma-systems.com/ringneck-linux.git" +SRC_GIT_REPO:ringneck-haikou = "git://git.theobroma-systems.com/ringneck-linux.git" SRC_GIT_REPO_PROTO = ";protocol=https" -SRC_GIT_BRANCH = ";branch=v6.0.2-ringneck" +SRC_GIT_BRANCH:ringneck-haikou = ";branch=v6.0.2-ringneck" + +COMPATIBLE_MACHINE = "ringneck-haikou" SRC_URI = " \ ${SRC_GIT_REPO}${SRC_GIT_REPO_PROTO}${SRC_GIT_BRANCH} \ ${SRC_URI_PATCHES} \ " -SRCREV = "de748a4593915b3566233e6724bac9ecb4418e38" +SRCREV:ringneck-haikou = "de748a4593915b3566233e6724bac9ecb4418e38" S = "${WORKDIR}/git" @@ -26,7 +28,7 @@ SRC_URI_PATCHES ?= "" LINUX_VERSION ?= "6.0.2" -DEFCONFIG ?= "ringneck-px30_defconfig" +DEFCONFIG:ringneck-haikou ?= "ringneck-px30_defconfig" # Borrowed from kernel-yocto.bbclass:do_kernel_metadata() do_configure:prepend () { -- cgit v1.2.3 From 9030006fb75e2344b28c51986f057d904fa3ec2c Mon Sep 17 00:00:00 2001 From: Quentin Schulz Date: Fri, 3 Feb 2023 18:11:51 +0100 Subject: kernel: linux: linux-tsd: add Puma support RK3399-Q7 Puma SoM is now supported on our custom v6.0.2 so let's add it to the linux-tsd recipe for v6.0 kernel branch. Signed-off-by: Quentin Schulz --- recipes-kernel/linux/linux-tsd_6.0.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/recipes-kernel/linux/linux-tsd_6.0.bb b/recipes-kernel/linux/linux-tsd_6.0.bb index f2ce785..c0f75c8 100644 --- a/recipes-kernel/linux/linux-tsd_6.0.bb +++ b/recipes-kernel/linux/linux-tsd_6.0.bb @@ -10,10 +10,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" inherit kernel SRC_GIT_REPO:ringneck-haikou = "git://git.theobroma-systems.com/ringneck-linux.git" +SRC_GIT_REPO:puma-haikou = "git://git.theobroma-systems.com/puma-linux.git" SRC_GIT_REPO_PROTO = ";protocol=https" SRC_GIT_BRANCH:ringneck-haikou = ";branch=v6.0.2-ringneck" +SRC_GIT_BRANCH:puma-haikou = ";branch=v6.0.2-puma" -COMPATIBLE_MACHINE = "ringneck-haikou" +COMPATIBLE_MACHINE = "(puma-haikou|ringneck-haikou)" SRC_URI = " \ ${SRC_GIT_REPO}${SRC_GIT_REPO_PROTO}${SRC_GIT_BRANCH} \ @@ -21,6 +23,7 @@ SRC_URI = " \ " SRCREV:ringneck-haikou = "de748a4593915b3566233e6724bac9ecb4418e38" +SRCREV:puma-haikou = "7624b244784bd19b4f5100a94ea3ac2bb1f3624d" S = "${WORKDIR}/git" @@ -29,6 +32,7 @@ SRC_URI_PATCHES ?= "" LINUX_VERSION ?= "6.0.2" DEFCONFIG:ringneck-haikou ?= "ringneck-px30_defconfig" +DEFCONFIG:puma-haikou ?= "puma-rk3399_defconfig" # Borrowed from kernel-yocto.bbclass:do_kernel_metadata() do_configure:prepend () { -- cgit v1.2.3 From dea2b391b2966c75269a2a5196b00e37ba225f8d Mon Sep 17 00:00:00 2001 From: Quentin Schulz Date: Fri, 3 Feb 2023 18:13:45 +0100 Subject: machine: puma-haikou: add version specifier for linux-tsd recipe Now that there exists a more recent linux-tsd recipe, an additional variable needs to be set so that the recipe version to pick is explicit. Since this is just in the event someone selects the 4.4 kernel (which is not the default behavior), this is left as a comment. Signed-off-by: Quentin Schulz --- conf/machine/puma-haikou.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/machine/puma-haikou.conf b/conf/machine/puma-haikou.conf index 83878be..698b453 100644 --- a/conf/machine/puma-haikou.conf +++ b/conf/machine/puma-haikou.conf @@ -26,6 +26,7 @@ PREFERRED_PROVIDER_u-boot = "u-boot-tsd" # Uncomment the next few variables to use Rockchip Android 4.4 vendor kernel #PREFERRED_PROVIDER_virtual/kernel = "linux-tsd" +#PREFERRED_VERSION_linux-tsd = "4.4%" #KERNEL_DEVICETREE = "rockchip/rk3399-puma.dtb" # The following few variables are required because the fitImage for some reasons -- cgit v1.2.3 From 4315935baf52bf37fd075e6a55700abf0fd5607a Mon Sep 17 00:00:00 2001 From: Quentin Schulz Date: Fri, 3 Feb 2023 18:17:47 +0100 Subject: machine: puma-haikou: select vendor linux-tsd recipe as default Linux Since our vendor Linux tree is newer than what's currently offered by Yocto and we also happen to support a tiny bit more than upstream does at the moment, let's make our vendor kernel tree the default one. Signed-off-by: Quentin Schulz --- conf/machine/puma-haikou.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/machine/puma-haikou.conf b/conf/machine/puma-haikou.conf index 698b453..e516425 100644 --- a/conf/machine/puma-haikou.conf +++ b/conf/machine/puma-haikou.conf @@ -19,6 +19,8 @@ MACHINE_EXTRA_RRECOMMENDS += "kernel-modules" PREFERRED_VERSION_linux-yocto = "5.10%" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-tsd" PREFERRED_PROVIDER_u-boot = "u-boot-tsd" +PREFERRED_PROVIDER_virtual/kernel = "linux-tsd" +PREFERRED_VERSION_linux-tsd = "6.0" ############################################################## # Rockchip Android 4.4 vendor kernel configuration/selection # -- cgit v1.2.3 From b26e9a8eda6552b8a5cbc24bbc584049e4761962 Mon Sep 17 00:00:00 2001 From: Quentin Schulz Date: Fri, 3 Feb 2023 18:22:46 +0100 Subject: kernel: linux: linux-tsd: add support for Haikou Video Demo adapter on Puma Our vendor Linux kernel tree v6.0.2 and later supports Haikou Video Demo adapter on Haikou devkit with a RK3399-Q7 Puma fitted. Therefore, let's add its Device Tree to the list of Device Tree to include in the package. Furthermore, make it the default Device Tree by adding in first position. It does not hurt to use this by default since it'll impair nothing from the original devkit if absent and allows for a more featureful default. Signed-off-by: Quentin Schulz --- recipes-kernel/linux/linux-tsd_6.0.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes-kernel/linux/linux-tsd_6.0.bb b/recipes-kernel/linux/linux-tsd_6.0.bb index c0f75c8..743081a 100644 --- a/recipes-kernel/linux/linux-tsd_6.0.bb +++ b/recipes-kernel/linux/linux-tsd_6.0.bb @@ -34,6 +34,8 @@ LINUX_VERSION ?= "6.0.2" DEFCONFIG:ringneck-haikou ?= "ringneck-px30_defconfig" DEFCONFIG:puma-haikou ?= "puma-rk3399_defconfig" +KERNEL_DEVICETREE:prepend:puma-haikou = "rockchip/rk3399-puma-haikou-video-demo.dtb " + # Borrowed from kernel-yocto.bbclass:do_kernel_metadata() do_configure:prepend () { if [ -n "${DEFCONFIG}" ]; then -- cgit v1.2.3 From 8c9a9b47b6a0ade31c741bb9c1fd8440b858c6be Mon Sep 17 00:00:00 2001 From: Quentin Schulz Date: Fri, 3 Feb 2023 18:26:28 +0100 Subject: kernel: linux: linux-tsd: bump version for Ringneck This brings in the following commits: * 805aa082cec9 TSD: arm64: configs: ringneck: increase number of 8250 UARTs * d0d7ef047c3e TSD: arm64: dts: rockchip: ringneck: move Video Demo adapter LED to its own device which fixes an issue of UART index in userspace and the module LED probe issue on Haikou Video Demo adapter DTB if Haikou Video adapter is not physically plugged in the Haikou devkit. Signed-off-by: Quentin Schulz --- recipes-kernel/linux/linux-tsd_6.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-kernel/linux/linux-tsd_6.0.bb b/recipes-kernel/linux/linux-tsd_6.0.bb index 743081a..db9bc26 100644 --- a/recipes-kernel/linux/linux-tsd_6.0.bb +++ b/recipes-kernel/linux/linux-tsd_6.0.bb @@ -22,7 +22,7 @@ SRC_URI = " \ ${SRC_URI_PATCHES} \ " -SRCREV:ringneck-haikou = "de748a4593915b3566233e6724bac9ecb4418e38" +SRCREV:ringneck-haikou = "805aa082cec9a41c51e8af36c5092495e37388da" SRCREV:puma-haikou = "7624b244784bd19b4f5100a94ea3ac2bb1f3624d" S = "${WORKDIR}/git" -- cgit v1.2.3