[PATCH 1/3] u-boot: switch to upstream SRCREV for rk-u-boot-env

[PATCH 1/3] u-boot: switch to upstream SRCREV for rk-u-boot-env

[Trevor Woerner]

When the rk-u-boot-env feature was implemented, in order for it to work the
build needed a version of U-Boot that was slightly newer than 2024.04 (the
current release supported by Yocto at that time). Now that 2024.10 is out,
remove the SRCREV pin since the necessary code is now part of this release.

Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
 recipes-bsp/u-boot/u-boot_%.bbappend | 1 -
 1 file changed, 1 deletion(-)

diff --git a/recipes-bsp/u-boot/u-boot_%.bbappend b/recipes-bsp/u-boot/u-boot_%.bbappend
index de7024545841..06ba6d54de8e 100644
--- a/recipes-bsp/u-boot/u-boot_%.bbappend
+++ b/recipes-bsp/u-boot/u-boot_%.bbappend
@@ -7,7 +7,6 @@ SRCREV:radxa-zero-3 = "8cdf606e616baa36751f3b4adcfaefc781126c8c"
 SRCREV:radxa-zero-3:rk-u-boot-env = "8cdf606e616baa36751f3b4adcfaefc781126c8c"
 
 SRC_URI:append:rk-u-boot-env = " file://rockchip-enable-environment-mmc.cfg"
-SRCREV:rk-u-boot-env = "cdfcc37428e06f4730ab9a17cc084eeb7676ea1a"
 
 DEPENDS:append:rk3308 = " u-boot-tools-native"
 DEPENDS:append:rock-pi-4 = " gnutls-native"
-- 
2.44.0.478.g7774cfed6261

[PATCH 2/3] u-boot: use upstream for radxa-zero-3{e|w}

[Trevor Woerner]

Upstream U-Boot 2024.10 (the latest release supported by Yocto) has support
for radxa-zero-3{e|w}. Therefore switch away from the fork where the initial
U-Boot development for this board had been added.

Reported-by: Oleksii Kurochko <oleksii.kurochko@gmail.com>
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
 recipes-bsp/u-boot/u-boot_%.bbappend | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/recipes-bsp/u-boot/u-boot_%.bbappend b/recipes-bsp/u-boot/u-boot_%.bbappend
index 06ba6d54de8e..08e1730b5d3d 100644
--- a/recipes-bsp/u-boot/u-boot_%.bbappend
+++ b/recipes-bsp/u-boot/u-boot_%.bbappend
@@ -2,10 +2,6 @@ require u-boot-rockchip.inc
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-SRC_URI:radxa-zero-3 = "git://github.com/Kwiboo/u-boot-rockchip.git;protocol=https;branch=rk3xxx-2024.07;name=Kwiboo"
-SRCREV:radxa-zero-3 = "8cdf606e616baa36751f3b4adcfaefc781126c8c"
-SRCREV:radxa-zero-3:rk-u-boot-env = "8cdf606e616baa36751f3b4adcfaefc781126c8c"
-
 SRC_URI:append:rk-u-boot-env = " file://rockchip-enable-environment-mmc.cfg"
 
 DEPENDS:append:rk3308 = " u-boot-tools-native"
-- 
2.44.0.478.g7774cfed6261

Re: [PATCH 2/3] u-boot: use upstream for radxa-zero-3{e|w}

[Oleksii Kurochko]

Hi Trevor,

On 12/12/24 8:57 PM, Trevor Woerner wrote:
> Upstream U-Boot 2024.10 (the latest release supported by Yocto) has support
> for radxa-zero-3{e|w}. Therefore switch away from the fork where the initial
> U-Boot development for this board had been added.
>
> Reported-by: Oleksii Kurochko <oleksii.kurochko@gmail.com>
> Signed-off-by: Trevor Woerner <twoerner@gmail.com>
> ---
>   recipes-bsp/u-boot/u-boot_%.bbappend | 4 ----
>   1 file changed, 4 deletions(-)
>
> diff --git a/recipes-bsp/u-boot/u-boot_%.bbappend b/recipes-bsp/u-boot/u-boot_%.bbappend
> index 06ba6d54de8e..08e1730b5d3d 100644
> --- a/recipes-bsp/u-boot/u-boot_%.bbappend
> +++ b/recipes-bsp/u-boot/u-boot_%.bbappend
> @@ -2,10 +2,6 @@ require u-boot-rockchip.inc
>   
>   FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
>   
> -SRC_URI:radxa-zero-3 = "git://github.com/Kwiboo/u-boot-rockchip.git;protocol=https;branch=rk3xxx-2024.07;name=Kwiboo"
> -SRCREV:radxa-zero-3 = "8cdf606e616baa36751f3b4adcfaefc781126c8c"
> -SRCREV:radxa-zero-3:rk-u-boot-env = "8cdf606e616baa36751f3b4adcfaefc781126c8c"
> -
>   SRC_URI:append:rk-u-boot-env = " file://rockchip-enable-environment-mmc.cfg"
>   
>   DEPENDS:append:rk3308 = " u-boot-tools-native"
I have a compilation issue after applying of this patch series:
     | scripts/kconfig/conf 
--defconfig=arch/../configs/radxa-zero-3-rk3566_defconfig Kconfig
     | ***
     | *** Can't find default configuration 
"arch/../configs/radxa-zero-3-rk3566_defconfig"!
     | ***
     | make[2]: *** 
[/home/ok/Projects/yocto/build/tmp/work/radxa_zero_3e-poky-linux/u-boot/2024.01/git/scripts/kconfig/Makefile:96: 
radxa-zero-3-rk3566_defconfig] Error 1


And it seems like there is not defconfig for radxa-zero-3 at all:

ok@fedora:~/Projects/yocto/build/tmp/work/radxa_zero_3e-poky-linux/u-boot/2024.01/git/configs$ 
ls -la radxa-
     radxa-cm3-io-rk3566_defconfig  radxa-e25-rk3568_defconfig 
radxa-zero2_defconfig          radxa-zero_defconfig


Should I apply something else except the current patch series?


Best regards,

  Oleksii

Re: [PATCH 2/3] u-boot: use upstream for radxa-zero-3{e|w}

[Oleksii Kurochko]

On 12/15/24 3:49 PM, Oleksii Kurochko wrote:
> Hi Trevor,
>
> On 12/12/24 8:57 PM, Trevor Woerner wrote:
>> Upstream U-Boot 2024.10 (the latest release supported by Yocto) has 
>> support
>> for radxa-zero-3{e|w}. Therefore switch away from the fork where the 
>> initial
>> U-Boot development for this board had been added.
>>
>> Reported-by: Oleksii Kurochko <oleksii.kurochko@gmail.com>
>> Signed-off-by: Trevor Woerner <twoerner@gmail.com>
>> ---
>>   recipes-bsp/u-boot/u-boot_%.bbappend | 4 ----
>>   1 file changed, 4 deletions(-)
>>
>> diff --git a/recipes-bsp/u-boot/u-boot_%.bbappend 
>> b/recipes-bsp/u-boot/u-boot_%.bbappend
>> index 06ba6d54de8e..08e1730b5d3d 100644
>> --- a/recipes-bsp/u-boot/u-boot_%.bbappend
>> +++ b/recipes-bsp/u-boot/u-boot_%.bbappend
>> @@ -2,10 +2,6 @@ require u-boot-rockchip.inc
>>     FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
>>   -SRC_URI:radxa-zero-3 = 
>> "git://github.com/Kwiboo/u-boot-rockchip.git;protocol=https;branch=rk3xxx-2024.07;name=Kwiboo"
>> -SRCREV:radxa-zero-3 = "8cdf606e616baa36751f3b4adcfaefc781126c8c"
>> -SRCREV:radxa-zero-3:rk-u-boot-env = 
>> "8cdf606e616baa36751f3b4adcfaefc781126c8c"
>> -
>>   SRC_URI:append:rk-u-boot-env = " 
>> file://rockchip-enable-environment-mmc.cfg"
>>     DEPENDS:append:rk3308 = " u-boot-tools-native"
> I have a compilation issue after applying of this patch series:
>     | scripts/kconfig/conf 
> --defconfig=arch/../configs/radxa-zero-3-rk3566_defconfig Kconfig
>     | ***
>     | *** Can't find default configuration 
> "arch/../configs/radxa-zero-3-rk3566_defconfig"!
>     | ***
>     | make[2]: *** 
> [/home/ok/Projects/yocto/build/tmp/work/radxa_zero_3e-poky-linux/u-boot/2024.01/git/scripts/kconfig/Makefile:96: 
> radxa-zero-3-rk3566_defconfig] Error 1
>
>
> And it seems like there is not defconfig for radxa-zero-3 at all:
>
> ok@fedora:~/Projects/yocto/build/tmp/work/radxa_zero_3e-poky-linux/u-boot/2024.01/git/configs$ 
> ls -la radxa-
>     radxa-cm3-io-rk3566_defconfig  radxa-e25-rk3568_defconfig 
> radxa-zero2_defconfig          radxa-zero_defconfig

But it is present in the master:

https://source.denx.de/u-boot/u-boot/-/blob/master/configs/radxa-zero-3-rk3566_defconfig?ref_type=heads

And It seems we need or cherry-pick the patch ( 5d199ad9a6b("board: 
rockchip: Add Radxa ZERO 3W/3E") ) or switch to newer tag:
    git tag --contains 5d199ad9a6b
    v2024.10
    v2024.10-rc3
    v2024.10-rc4
    v2024.10-rc5
    v2024.10-rc6
    v2025.01-rc1
    v2025.01-rc2
    v2025.01-rc3
    v2025.01-rc4

~ Oleksii


>
>
> Should I apply something else except the current patch series?
>
>
> Best regards,
>
>  Oleksii
>

Re: [yocto-patches] [PATCH 2/3] u-boot: use upstream for radxa-zero-3{e|w}

[Oleksii Kurochko]

On 12/15/24 3:59 PM, Oleksii Kurochko via lists.yoctoproject.org wrote:
>
> On 12/15/24 3:49 PM, Oleksii Kurochko wrote:
>> Hi Trevor,
>>
>> On 12/12/24 8:57 PM, Trevor Woerner wrote:
>>> Upstream U-Boot 2024.10 (the latest release supported by Yocto) has 
>>> support
>>> for radxa-zero-3{e|w}. Therefore switch away from the fork where the 
>>> initial
>>> U-Boot development for this board had been added.
>>>
>>> Reported-by: Oleksii Kurochko <oleksii.kurochko@gmail.com>
>>> Signed-off-by: Trevor Woerner <twoerner@gmail.com>
>>> ---
>>>   recipes-bsp/u-boot/u-boot_%.bbappend | 4 ----
>>>   1 file changed, 4 deletions(-)
>>>
>>> diff --git a/recipes-bsp/u-boot/u-boot_%.bbappend 
>>> b/recipes-bsp/u-boot/u-boot_%.bbappend
>>> index 06ba6d54de8e..08e1730b5d3d 100644
>>> --- a/recipes-bsp/u-boot/u-boot_%.bbappend
>>> +++ b/recipes-bsp/u-boot/u-boot_%.bbappend
>>> @@ -2,10 +2,6 @@ require u-boot-rockchip.inc
>>>     FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
>>>   -SRC_URI:radxa-zero-3 = 
>>> "git://github.com/Kwiboo/u-boot-rockchip.git;protocol=https;branch=rk3xxx-2024.07;name=Kwiboo"
>>> -SRCREV:radxa-zero-3 = "8cdf606e616baa36751f3b4adcfaefc781126c8c"
>>> -SRCREV:radxa-zero-3:rk-u-boot-env = 
>>> "8cdf606e616baa36751f3b4adcfaefc781126c8c"
>>> -
>>>   SRC_URI:append:rk-u-boot-env = " 
>>> file://rockchip-enable-environment-mmc.cfg"
>>>     DEPENDS:append:rk3308 = " u-boot-tools-native"
>> I have a compilation issue after applying of this patch series:
>>     | scripts/kconfig/conf 
>> --defconfig=arch/../configs/radxa-zero-3-rk3566_defconfig Kconfig
>>     | ***
>>     | *** Can't find default configuration 
>> "arch/../configs/radxa-zero-3-rk3566_defconfig"!
>>     | ***
>>     | make[2]: *** 
>> [/home/ok/Projects/yocto/build/tmp/work/radxa_zero_3e-poky-linux/u-boot/2024.01/git/scripts/kconfig/Makefile:96: 
>> radxa-zero-3-rk3566_defconfig] Error 1
>>
>>
>> And it seems like there is not defconfig for radxa-zero-3 at all:
>>
>> ok@fedora:~/Projects/yocto/build/tmp/work/radxa_zero_3e-poky-linux/u-boot/2024.01/git/configs$ 
>> ls -la radxa-
>>     radxa-cm3-io-rk3566_defconfig  radxa-e25-rk3568_defconfig 
>> radxa-zero2_defconfig          radxa-zero_defconfig
>
> But it is present in the master:
>
> https://source.denx.de/u-boot/u-boot/-/blob/master/configs/radxa-zero-3-rk3566_defconfig?ref_type=heads 
>
>
> And It seems we need or cherry-pick the patch ( 5d199ad9a6b("board: 
> rockchip: Add Radxa ZERO 3W/3E") ) or switch to newer tag:
>    git tag --contains 5d199ad9a6b
>    v2024.10
>    v2024.10-rc3
>    v2024.10-rc4
>    v2024.10-rc5
>    v2024.10-rc6
>    v2025.01-rc1
>    v2025.01-rc2
>    v2025.01-rc3
>    v2025.01-rc4

Sorry for flooding but I think it is needed to note that it is needed 
for scarthgap branch.

~ Oleksii

>
> ~ Oleksii
>
>
>>
>>
>> Should I apply something else except the current patch series?
>>
>>
>> Best regards,
>>
>>  Oleksii
>>
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#909): 
> https://lists.yoctoproject.org/g/yocto-patches/message/909
> Mute This Topic: https://lists.yoctoproject.org/mt/110086429/7609514
> Group Owner: yocto-patches+owner@lists.yoctoproject.org
> Unsubscribe: 
> https://lists.yoctoproject.org/g/yocto-patches/leave/13794076/7609514/1776480132/xyzzy 
> [oleksii.kurochko@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>

Re: [yocto-patches] [PATCH 2/3] u-boot: use upstream for radxa-zero-3{e|w}

[Trevor Woerner]

On Sun 2024-12-15 @ 04:15:53 PM, Oleksii Kurochko wrote:
> 
> On 12/15/24 3:59 PM, Oleksii Kurochko via lists.yoctoproject.org wrote:
> > 
> > On 12/15/24 3:49 PM, Oleksii Kurochko wrote:
> > > Hi Trevor,
> > > 
> > > On 12/12/24 8:57 PM, Trevor Woerner wrote:
> > > > Upstream U-Boot 2024.10 (the latest release supported by Yocto)
> > > > has support
> > > > for radxa-zero-3{e|w}. Therefore switch away from the fork where
> > > > the initial
> > > > U-Boot development for this board had been added.
> > > > 
> > > > Reported-by: Oleksii Kurochko <oleksii.kurochko@gmail.com>
> > > > Signed-off-by: Trevor Woerner <twoerner@gmail.com>
> > > > ---
> > > >   recipes-bsp/u-boot/u-boot_%.bbappend | 4 ----
> > > >   1 file changed, 4 deletions(-)
> > > > 
> > > > diff --git a/recipes-bsp/u-boot/u-boot_%.bbappend
> > > > b/recipes-bsp/u-boot/u-boot_%.bbappend
> > > > index 06ba6d54de8e..08e1730b5d3d 100644
> > > > --- a/recipes-bsp/u-boot/u-boot_%.bbappend
> > > > +++ b/recipes-bsp/u-boot/u-boot_%.bbappend
> > > > @@ -2,10 +2,6 @@ require u-boot-rockchip.inc
> > > >     FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
> > > >   -SRC_URI:radxa-zero-3 = "git://github.com/Kwiboo/u-boot-rockchip.git;protocol=https;branch=rk3xxx-2024.07;name=Kwiboo"
> > > > -SRCREV:radxa-zero-3 = "8cdf606e616baa36751f3b4adcfaefc781126c8c"
> > > > -SRCREV:radxa-zero-3:rk-u-boot-env =
> > > > "8cdf606e616baa36751f3b4adcfaefc781126c8c"
> > > > -
> > > >   SRC_URI:append:rk-u-boot-env = "
> > > > file://rockchip-enable-environment-mmc.cfg"
> > > >     DEPENDS:append:rk3308 = " u-boot-tools-native"
> > > I have a compilation issue after applying of this patch series:
> > >     | scripts/kconfig/conf
> > > --defconfig=arch/../configs/radxa-zero-3-rk3566_defconfig Kconfig
> > >     | ***
> > >     | *** Can't find default configuration
> > > "arch/../configs/radxa-zero-3-rk3566_defconfig"!
> > >     | ***
> > >     | make[2]: *** [/home/ok/Projects/yocto/build/tmp/work/radxa_zero_3e-poky-linux/u-boot/2024.01/git/scripts/kconfig/Makefile:96:
> > > radxa-zero-3-rk3566_defconfig] Error 1
> > > 
> > > 
> > > And it seems like there is not defconfig for radxa-zero-3 at all:
> > > 
> > > ok@fedora:~/Projects/yocto/build/tmp/work/radxa_zero_3e-poky-linux/u-boot/2024.01/git/configs$
> > > ls -la radxa-
> > >     radxa-cm3-io-rk3566_defconfig  radxa-e25-rk3568_defconfig
> > > radxa-zero2_defconfig          radxa-zero_defconfig
> > 
> > But it is present in the master:
> > 
> > https://source.denx.de/u-boot/u-boot/-/blob/master/configs/radxa-zero-3-rk3566_defconfig?ref_type=heads
> > 
> > 
> > And It seems we need or cherry-pick the patch ( 5d199ad9a6b("board:
> > rockchip: Add Radxa ZERO 3W/3E") ) or switch to newer tag:
> >    git tag --contains 5d199ad9a6b
> >    v2024.10
> >    v2024.10-rc3
> >    v2024.10-rc4
> >    v2024.10-rc5
> >    v2024.10-rc6
> >    v2025.01-rc1
> >    v2025.01-rc2
> >    v2025.01-rc3
> >    v2025.01-rc4
> 
> Sorry for flooding but I think it is needed to note that it is needed for
> scarthgap branch.

These patches are targeting master, not styhead.

> 
> ~ Oleksii
> 
> > 
> > ~ Oleksii
> > 
> > 
> > > 
> > > 
> > > Should I apply something else except the current patch series?
> > > 
> > > 
> > > Best regards,
> > > 
> > >  Oleksii
> > > 
> > 
> > 
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#909):
> > https://lists.yoctoproject.org/g/yocto-patches/message/909
> > Mute This Topic: https://lists.yoctoproject.org/mt/110086429/7609514
> > Group Owner: yocto-patches+owner@lists.yoctoproject.org
> > Unsubscribe: https://lists.yoctoproject.org/g/yocto-patches/leave/13794076/7609514/1776480132/xyzzy
> > [oleksii.kurochko@gmail.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> > 
> > 

Re: [PATCH 2/3] u-boot: use upstream for radxa-zero-3{e|w}

[Trevor Woerner]

On Thu 2024-12-12 @ 02:57:17 PM, Trevor Woerner wrote:
> Upstream U-Boot 2024.10 (the latest release supported by Yocto) has support
> for radxa-zero-3{e|w}. Therefore switch away from the fork where the initial
> U-Boot development for this board had been added.
> 
> Reported-by: Oleksii Kurochko <oleksii.kurochko@gmail.com>
> Signed-off-by: Trevor Woerner <twoerner@gmail.com>
> ---
>  recipes-bsp/u-boot/u-boot_%.bbappend | 4 ----
>  1 file changed, 4 deletions(-)

Applied to meta-rockchip, master branch.

[PATCH 3/3] radxa-zero-3: switch to yocto-dev kernel

[Trevor Woerner]

The radxa-zero-3{e|w} devices are not supported in the current yocto kernel,
but they are supported in the yocto-dev kernel. Switch to yocto-dev until
support is available in the yocto kernel.

Reported-by: Oleksii Kurochko <oleksii.kurochko@gmail.com>
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
 conf/machine/include/radxa-zero-3.inc         |  2 +-
 ...xt_%.bbappend => linux-yocto-dev.bbappend} |  0
 .../linux/linux-torvalds-next_git.bb          | 25 -------------------
 recipes-kernel/linux/linux-yocto-dev.bbappend |  2 ++
 4 files changed, 3 insertions(+), 26 deletions(-)
 rename dynamic-layers/rk-rauc-demo/recipes-kernel/linux/{linux-torvalds-next_%.bbappend => linux-yocto-dev.bbappend} (100%)
 delete mode 100644 recipes-kernel/linux/linux-torvalds-next_git.bb

diff --git a/conf/machine/include/radxa-zero-3.inc b/conf/machine/include/radxa-zero-3.inc
index 1c6f972c1e31..b351afae8c0f 100644
--- a/conf/machine/include/radxa-zero-3.inc
+++ b/conf/machine/include/radxa-zero-3.inc
@@ -2,7 +2,7 @@ MACHINEOVERRIDES =. "radxa-zero-3:"
 
 require conf/machine/include/rk3566.inc
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-torvalds-next"
+PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-dev"
 MACHINE_EXTRA_RRECOMMENDS += "kernel-modules"
 
 UBOOT_MACHINE = "radxa-zero-3-rk3566_defconfig"
diff --git a/dynamic-layers/rk-rauc-demo/recipes-kernel/linux/linux-torvalds-next_%.bbappend b/dynamic-layers/rk-rauc-demo/recipes-kernel/linux/linux-yocto-dev.bbappend
similarity index 100%
rename from dynamic-layers/rk-rauc-demo/recipes-kernel/linux/linux-torvalds-next_%.bbappend
rename to dynamic-layers/rk-rauc-demo/recipes-kernel/linux/linux-yocto-dev.bbappend
diff --git a/recipes-kernel/linux/linux-torvalds-next_git.bb b/recipes-kernel/linux/linux-torvalds-next_git.bb
deleted file mode 100644
index b961b1408f09..000000000000
--- a/recipes-kernel/linux/linux-torvalds-next_git.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/linux-yocto-dev:"
-
-DESCRIPTION = "Linux Kernel"
-SECTION = "kernel"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-
-ERROR_QA:remove = "buildpaths"
-DEFAULT_PREFERENCE = "-1"
-COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE:radxa-zero-3 = "radxa-zero-3"
-
-LINUX_VERSION = "6.11-rc6"
-KERNEL_VERSION_SANITY_SKIP = "1"
-PV = "${LINUX_VERSION}+git${SRCPV}"
-SRC_URI = " \
-	git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git;protocol=https;nobranch=1 \
-	file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta \
-	"
-# this is tag 'next-20240904'
-SRCREV = "fdadd93817f124fd0ea6ef251d4a1068b7feceba"
-
-inherit kernel
-inherit kernel-yocto
-require recipes-kernel/linux/linux-yocto.inc
diff --git a/recipes-kernel/linux/linux-yocto-dev.bbappend b/recipes-kernel/linux/linux-yocto-dev.bbappend
index b6a63d7b7b29..f738d1357d6c 100644
--- a/recipes-kernel/linux/linux-yocto-dev.bbappend
+++ b/recipes-kernel/linux/linux-yocto-dev.bbappend
@@ -1,5 +1,7 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 COMPATIBLE_MACHINE:orangepi-5-plus = "orangepi-5-plus"
+COMPATIBLE_MACHINE:radxa-zero-3 = "radxa-zero-3"
 
 SRC_URI:append:orangepi-5-plus = " file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta"
+SRC_URI:append:radxa-zero-3 = " file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta"
-- 
2.44.0.478.g7774cfed6261

Re: [PATCH 3/3] radxa-zero-3: switch to yocto-dev kernel

[Oleksii Kurochko]

[-- Attachment #1: Type: text/plain, Size: 4530 bytes --]

Hello Trevor,

On 12/12/24 8:57 PM, Trevor Woerner wrote:
> The radxa-zero-3{e|w} devices are not supported in the current yocto kernel,
> but they are supported in the yocto-dev kernel. Switch to yocto-dev until
> support is available in the yocto kernel.
>
> Reported-by: Oleksii Kurochko<oleksii.kurochko@gmail.com>
> Signed-off-by: Trevor Woerner<twoerner@gmail.com>
> ---
>   conf/machine/include/radxa-zero-3.inc         |  2 +-
>   ...xt_%.bbappend => linux-yocto-dev.bbappend} |  0
>   .../linux/linux-torvalds-next_git.bb          | 25 -------------------
>   recipes-kernel/linux/linux-yocto-dev.bbappend |  2 ++
>   4 files changed, 3 insertions(+), 26 deletions(-)
>   rename dynamic-layers/rk-rauc-demo/recipes-kernel/linux/{linux-torvalds-next_%.bbappend => linux-yocto-dev.bbappend} (100%)
>   delete mode 100644 recipes-kernel/linux/linux-torvalds-next_git.bb
>
> diff --git a/conf/machine/include/radxa-zero-3.inc b/conf/machine/include/radxa-zero-3.inc
> index 1c6f972c1e31..b351afae8c0f 100644
> --- a/conf/machine/include/radxa-zero-3.inc
> +++ b/conf/machine/include/radxa-zero-3.inc
> @@ -2,7 +2,7 @@ MACHINEOVERRIDES =. "radxa-zero-3:"
>   
>   require conf/machine/include/rk3566.inc
>   
> -PREFERRED_PROVIDER_virtual/kernel = "linux-torvalds-next"
> +PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-dev"
>   MACHINE_EXTRA_RRECOMMENDS += "kernel-modules"
>   
>   UBOOT_MACHINE = "radxa-zero-3-rk3566_defconfig"
> diff --git a/dynamic-layers/rk-rauc-demo/recipes-kernel/linux/linux-torvalds-next_%.bbappend b/dynamic-layers/rk-rauc-demo/recipes-kernel/linux/linux-yocto-dev.bbappend
> similarity index 100%
> rename from dynamic-layers/rk-rauc-demo/recipes-kernel/linux/linux-torvalds-next_%.bbappend
> rename to dynamic-layers/rk-rauc-demo/recipes-kernel/linux/linux-yocto-dev.bbappend
> diff --git a/recipes-kernel/linux/linux-torvalds-next_git.bb b/recipes-kernel/linux/linux-torvalds-next_git.bb
> deleted file mode 100644
> index b961b1408f09..000000000000
> --- a/recipes-kernel/linux/linux-torvalds-next_git.bb
> +++ /dev/null
> @@ -1,25 +0,0 @@
> -FILESEXTRAPATHS:prepend := "${THISDIR}/linux-yocto-dev:"
> -
> -DESCRIPTION = "Linux Kernel"
> -SECTION = "kernel"
> -LICENSE = "GPL-2.0-only"
> -LIC_FILES_CHKSUM ="file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
> -
> -ERROR_QA:remove = "buildpaths"
> -DEFAULT_PREFERENCE = "-1"
> -COMPATIBLE_MACHINE = "^$"
> -COMPATIBLE_MACHINE:radxa-zero-3 = "radxa-zero-3"
> -
> -LINUX_VERSION = "6.11-rc6"
> -KERNEL_VERSION_SANITY_SKIP = "1"
> -PV = "${LINUX_VERSION}+git${SRCPV}"
> -SRC_URI = " \
> -	git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git;protocol=https;nobranch=1 \
> -	file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta \
> -	"
> -# this is tag 'next-20240904'
> -SRCREV = "fdadd93817f124fd0ea6ef251d4a1068b7feceba"
> -
> -inherit kernel
> -inherit kernel-yocto
> -require recipes-kernel/linux/linux-yocto.inc
> diff --git a/recipes-kernel/linux/linux-yocto-dev.bbappend b/recipes-kernel/linux/linux-yocto-dev.bbappend
> index b6a63d7b7b29..f738d1357d6c 100644
> --- a/recipes-kernel/linux/linux-yocto-dev.bbappend
> +++ b/recipes-kernel/linux/linux-yocto-dev.bbappend
> @@ -1,5 +1,7 @@
>   FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
>   
>   COMPATIBLE_MACHINE:orangepi-5-plus = "orangepi-5-plus"
> +COMPATIBLE_MACHINE:radxa-zero-3 = "radxa-zero-3"
>   
>   SRC_URI:append:orangepi-5-plus =" 
> file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta"
> +SRC_URI:append:radxa-zero-3 = "file://rockchip-kmeta;ty
After applying of this patch series I see the following compilation 
issue for kernel:
     | ERROR: modpost: vmlinux: local symbol 'security_path_rmdir' was 
exported
     | make[2]: *** 
[/home/ok/Projects/yocto/build/tmp/work-shared/radxa-zero-3e/kernel-source/scripts/Makefile.modpost:145: 
vmlinux.symvers] Error 1
     | make[1]: *** 
[/home/ok/Projects/yocto/build/tmp/work-shared/radxa-zero-3e/kernel-source/Makefile:1871: 
modpost] Error 2

     | make: *** 
[/home/ok/Projects/yocto/build/tmp/work-shared/radxa-zero-3e/kernel-source/Makefile:240: 
__sub-make] Error 2


Should I apply something except the patches from these patch series? 
Otherwise I think we should disable some security things ( as a 
workaround ):

CONFIG_SECURITYFS=n CONFIG_SECURITY_NETWORK=y 
CONFIG_SECURITY_NETWORK_XFRM=n CONFIG_SECURITY_PATH=y 
CONFIG_SECURITY_LANDLOCK=y

Best regards,

  Oleksii


> pe=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta"

[-- Attachment #2: Type: text/html, Size: 6372 bytes --]

Re: [PATCH 3/3] radxa-zero-3: switch to yocto-dev kernel

[Trevor Woerner]

Is this also a styhead-specific issue?

On Sun 2024-12-15 @ 04:10:51 PM, Oleksii Kurochko wrote:
> Hello Trevor,
> 
> On 12/12/24 8:57 PM, Trevor Woerner wrote:
> > The radxa-zero-3{e|w} devices are not supported in the current yocto kernel,
> > but they are supported in the yocto-dev kernel. Switch to yocto-dev until
> > support is available in the yocto kernel.
> > 
> > Reported-by: Oleksii Kurochko<oleksii.kurochko@gmail.com>
> > Signed-off-by: Trevor Woerner<twoerner@gmail.com>
> > ---
> >   conf/machine/include/radxa-zero-3.inc         |  2 +-
> >   ...xt_%.bbappend => linux-yocto-dev.bbappend} |  0
> >   .../linux/linux-torvalds-next_git.bb          | 25 -------------------
> >   recipes-kernel/linux/linux-yocto-dev.bbappend |  2 ++
> >   4 files changed, 3 insertions(+), 26 deletions(-)
> >   rename dynamic-layers/rk-rauc-demo/recipes-kernel/linux/{linux-torvalds-next_%.bbappend => linux-yocto-dev.bbappend} (100%)
> >   delete mode 100644 recipes-kernel/linux/linux-torvalds-next_git.bb
> > 
> > diff --git a/conf/machine/include/radxa-zero-3.inc b/conf/machine/include/radxa-zero-3.inc
> > index 1c6f972c1e31..b351afae8c0f 100644
> > --- a/conf/machine/include/radxa-zero-3.inc
> > +++ b/conf/machine/include/radxa-zero-3.inc
> > @@ -2,7 +2,7 @@ MACHINEOVERRIDES =. "radxa-zero-3:"
> >   require conf/machine/include/rk3566.inc
> > -PREFERRED_PROVIDER_virtual/kernel = "linux-torvalds-next"
> > +PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-dev"
> >   MACHINE_EXTRA_RRECOMMENDS += "kernel-modules"
> >   UBOOT_MACHINE = "radxa-zero-3-rk3566_defconfig"
> > diff --git a/dynamic-layers/rk-rauc-demo/recipes-kernel/linux/linux-torvalds-next_%.bbappend b/dynamic-layers/rk-rauc-demo/recipes-kernel/linux/linux-yocto-dev.bbappend
> > similarity index 100%
> > rename from dynamic-layers/rk-rauc-demo/recipes-kernel/linux/linux-torvalds-next_%.bbappend
> > rename to dynamic-layers/rk-rauc-demo/recipes-kernel/linux/linux-yocto-dev.bbappend
> > diff --git a/recipes-kernel/linux/linux-torvalds-next_git.bb b/recipes-kernel/linux/linux-torvalds-next_git.bb
> > deleted file mode 100644
> > index b961b1408f09..000000000000
> > --- a/recipes-kernel/linux/linux-torvalds-next_git.bb
> > +++ /dev/null
> > @@ -1,25 +0,0 @@
> > -FILESEXTRAPATHS:prepend := "${THISDIR}/linux-yocto-dev:"
> > -
> > -DESCRIPTION = "Linux Kernel"
> > -SECTION = "kernel"
> > -LICENSE = "GPL-2.0-only"
> > -LIC_FILES_CHKSUM ="file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
> > -
> > -ERROR_QA:remove = "buildpaths"
> > -DEFAULT_PREFERENCE = "-1"
> > -COMPATIBLE_MACHINE = "^$"
> > -COMPATIBLE_MACHINE:radxa-zero-3 = "radxa-zero-3"
> > -
> > -LINUX_VERSION = "6.11-rc6"
> > -KERNEL_VERSION_SANITY_SKIP = "1"
> > -PV = "${LINUX_VERSION}+git${SRCPV}"
> > -SRC_URI = " \
> > -	git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git;protocol=https;nobranch=1 \
> > -	file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta \
> > -	"
> > -# this is tag 'next-20240904'
> > -SRCREV = "fdadd93817f124fd0ea6ef251d4a1068b7feceba"
> > -
> > -inherit kernel
> > -inherit kernel-yocto
> > -require recipes-kernel/linux/linux-yocto.inc
> > diff --git a/recipes-kernel/linux/linux-yocto-dev.bbappend b/recipes-kernel/linux/linux-yocto-dev.bbappend
> > index b6a63d7b7b29..f738d1357d6c 100644
> > --- a/recipes-kernel/linux/linux-yocto-dev.bbappend
> > +++ b/recipes-kernel/linux/linux-yocto-dev.bbappend
> > @@ -1,5 +1,7 @@
> >   FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
> >   COMPATIBLE_MACHINE:orangepi-5-plus = "orangepi-5-plus"
> > +COMPATIBLE_MACHINE:radxa-zero-3 = "radxa-zero-3"
> >      SRC_URI:append:orangepi-5-plus =" file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta"
> > +SRC_URI:append:radxa-zero-3 = "file://rockchip-kmeta;ty
> After applying of this patch series I see the following compilation issue
> for kernel:
>     | ERROR: modpost: vmlinux: local symbol 'security_path_rmdir' was
> exported
>     | make[2]: *** [/home/ok/Projects/yocto/build/tmp/work-shared/radxa-zero-3e/kernel-source/scripts/Makefile.modpost:145:
> vmlinux.symvers] Error 1
>     | make[1]: *** [/home/ok/Projects/yocto/build/tmp/work-shared/radxa-zero-3e/kernel-source/Makefile:1871:
> modpost] Error 2
> 
>     | make: *** [/home/ok/Projects/yocto/build/tmp/work-shared/radxa-zero-3e/kernel-source/Makefile:240:
> __sub-make] Error 2
> 
> 
> Should I apply something except the patches from these patch series?
> Otherwise I think we should disable some security things ( as a workaround
> ):
> 
> CONFIG_SECURITYFS=n CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_NETWORK_XFRM=n
> CONFIG_SECURITY_PATH=y CONFIG_SECURITY_LANDLOCK=y
> 
> Best regards,
> 
>  Oleksii
> 
> 
> > pe=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta"

Re: [yocto-patches] [PATCH 3/3] radxa-zero-3: switch to yocto-dev kernel

[Oleksii Kurochko]

On 12/15/24 5:10 PM, Trevor Woerner via lists.yoctoproject.org wrote:
> Is this also a styhead-specific issue?

Yes, it is a styhead-specific issue with master there is no such issue.

~ Oleksii


>
> On Sun 2024-12-15 @ 04:10:51 PM, Oleksii Kurochko wrote:
>> Hello Trevor,
>>
>> On 12/12/24 8:57 PM, Trevor Woerner wrote:
>>> The radxa-zero-3{e|w} devices are not supported in the current yocto kernel,
>>> but they are supported in the yocto-dev kernel. Switch to yocto-dev until
>>> support is available in the yocto kernel.
>>>
>>> Reported-by: Oleksii Kurochko<oleksii.kurochko@gmail.com>
>>> Signed-off-by: Trevor Woerner<twoerner@gmail.com>
>>> ---
>>>    conf/machine/include/radxa-zero-3.inc         |  2 +-
>>>    ...xt_%.bbappend => linux-yocto-dev.bbappend} |  0
>>>    .../linux/linux-torvalds-next_git.bb          | 25 -------------------
>>>    recipes-kernel/linux/linux-yocto-dev.bbappend |  2 ++
>>>    4 files changed, 3 insertions(+), 26 deletions(-)
>>>    rename dynamic-layers/rk-rauc-demo/recipes-kernel/linux/{linux-torvalds-next_%.bbappend => linux-yocto-dev.bbappend} (100%)
>>>    delete mode 100644 recipes-kernel/linux/linux-torvalds-next_git.bb
>>>
>>> diff --git a/conf/machine/include/radxa-zero-3.inc b/conf/machine/include/radxa-zero-3.inc
>>> index 1c6f972c1e31..b351afae8c0f 100644
>>> --- a/conf/machine/include/radxa-zero-3.inc
>>> +++ b/conf/machine/include/radxa-zero-3.inc
>>> @@ -2,7 +2,7 @@ MACHINEOVERRIDES =. "radxa-zero-3:"
>>>    require conf/machine/include/rk3566.inc
>>> -PREFERRED_PROVIDER_virtual/kernel = "linux-torvalds-next"
>>> +PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-dev"
>>>    MACHINE_EXTRA_RRECOMMENDS += "kernel-modules"
>>>    UBOOT_MACHINE = "radxa-zero-3-rk3566_defconfig"
>>> diff --git a/dynamic-layers/rk-rauc-demo/recipes-kernel/linux/linux-torvalds-next_%.bbappend b/dynamic-layers/rk-rauc-demo/recipes-kernel/linux/linux-yocto-dev.bbappend
>>> similarity index 100%
>>> rename from dynamic-layers/rk-rauc-demo/recipes-kernel/linux/linux-torvalds-next_%.bbappend
>>> rename to dynamic-layers/rk-rauc-demo/recipes-kernel/linux/linux-yocto-dev.bbappend
>>> diff --git a/recipes-kernel/linux/linux-torvalds-next_git.bb b/recipes-kernel/linux/linux-torvalds-next_git.bb
>>> deleted file mode 100644
>>> index b961b1408f09..000000000000
>>> --- a/recipes-kernel/linux/linux-torvalds-next_git.bb
>>> +++ /dev/null
>>> @@ -1,25 +0,0 @@
>>> -FILESEXTRAPATHS:prepend := "${THISDIR}/linux-yocto-dev:"
>>> -
>>> -DESCRIPTION = "Linux Kernel"
>>> -SECTION = "kernel"
>>> -LICENSE = "GPL-2.0-only"
>>> -LIC_FILES_CHKSUM ="file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
>>> -
>>> -ERROR_QA:remove = "buildpaths"
>>> -DEFAULT_PREFERENCE = "-1"
>>> -COMPATIBLE_MACHINE = "^$"
>>> -COMPATIBLE_MACHINE:radxa-zero-3 = "radxa-zero-3"
>>> -
>>> -LINUX_VERSION = "6.11-rc6"
>>> -KERNEL_VERSION_SANITY_SKIP = "1"
>>> -PV = "${LINUX_VERSION}+git${SRCPV}"
>>> -SRC_URI = " \
>>> -	git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git;protocol=https;nobranch=1 \
>>> -	file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta \
>>> -	"
>>> -# this is tag 'next-20240904'
>>> -SRCREV = "fdadd93817f124fd0ea6ef251d4a1068b7feceba"
>>> -
>>> -inherit kernel
>>> -inherit kernel-yocto
>>> -require recipes-kernel/linux/linux-yocto.inc
>>> diff --git a/recipes-kernel/linux/linux-yocto-dev.bbappend b/recipes-kernel/linux/linux-yocto-dev.bbappend
>>> index b6a63d7b7b29..f738d1357d6c 100644
>>> --- a/recipes-kernel/linux/linux-yocto-dev.bbappend
>>> +++ b/recipes-kernel/linux/linux-yocto-dev.bbappend
>>> @@ -1,5 +1,7 @@
>>>    FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
>>>    COMPATIBLE_MACHINE:orangepi-5-plus = "orangepi-5-plus"
>>> +COMPATIBLE_MACHINE:radxa-zero-3 = "radxa-zero-3"
>>>       SRC_URI:append:orangepi-5-plus =" file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta"
>>> +SRC_URI:append:radxa-zero-3 = "file://rockchip-kmeta;ty
>> After applying of this patch series I see the following compilation issue
>> for kernel:
>>      | ERROR: modpost: vmlinux: local symbol 'security_path_rmdir' was
>> exported
>>      | make[2]: *** [/home/ok/Projects/yocto/build/tmp/work-shared/radxa-zero-3e/kernel-source/scripts/Makefile.modpost:145:
>> vmlinux.symvers] Error 1
>>      | make[1]: *** [/home/ok/Projects/yocto/build/tmp/work-shared/radxa-zero-3e/kernel-source/Makefile:1871:
>> modpost] Error 2
>>
>>      | make: *** [/home/ok/Projects/yocto/build/tmp/work-shared/radxa-zero-3e/kernel-source/Makefile:240:
>> __sub-make] Error 2
>>
>>
>> Should I apply something except the patches from these patch series?
>> Otherwise I think we should disable some security things ( as a workaround
>> ):
>>
>> CONFIG_SECURITYFS=n CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_NETWORK_XFRM=n
>> CONFIG_SECURITY_PATH=y CONFIG_SECURITY_LANDLOCK=y
>>
>> Best regards,
>>
>>   Oleksii
>>
>>
>>> pe=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta"
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#913): https://lists.yoctoproject.org/g/yocto-patches/message/913
> Mute This Topic: https://lists.yoctoproject.org/mt/110086430/7609514
> Group Owner: yocto-patches+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/yocto-patches/leave/13794076/7609514/1776480132/xyzzy [oleksii.kurochko@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>

Re: [PATCH 3/3] radxa-zero-3: switch to yocto-dev kernel

[Trevor Woerner]

On Thu 2024-12-12 @ 02:57:18 PM, Trevor Woerner wrote:
> The radxa-zero-3{e|w} devices are not supported in the current yocto kernel,
> but they are supported in the yocto-dev kernel. Switch to yocto-dev until
> support is available in the yocto kernel.
> 
> Reported-by: Oleksii Kurochko <oleksii.kurochko@gmail.com>
> Signed-off-by: Trevor Woerner <twoerner@gmail.com>
> ---
>  conf/machine/include/radxa-zero-3.inc         |  2 +-
>  ...xt_%.bbappend => linux-yocto-dev.bbappend} |  0
>  .../linux/linux-torvalds-next_git.bb          | 25 -------------------
>  recipes-kernel/linux/linux-yocto-dev.bbappend |  2 ++
>  4 files changed, 3 insertions(+), 26 deletions(-)
>  rename dynamic-layers/rk-rauc-demo/recipes-kernel/linux/{linux-torvalds-next_%.bbappend => linux-yocto-dev.bbappend} (100%)
>  delete mode 100644 recipes-kernel/linux/linux-torvalds-next_git.bb

Added to meta-rockchip, master and styhead branches.

Re: [PATCH 1/3] u-boot: switch to upstream SRCREV for rk-u-boot-env

[Trevor Woerner]

On Thu 2024-12-12 @ 02:57:16 PM, Trevor Woerner wrote:
> When the rk-u-boot-env feature was implemented, in order for it to work the
> build needed a version of U-Boot that was slightly newer than 2024.04 (the
> current release supported by Yocto at that time). Now that 2024.10 is out,
> remove the SRCREV pin since the necessary code is now part of this release.
> 
> Signed-off-by: Trevor Woerner <twoerner@gmail.com>
> ---
>  recipes-bsp/u-boot/u-boot_%.bbappend | 1 -
>  1 file changed, 1 deletion(-)

Applied to meta-rockchip, master and styhead branches.