| Message ID | 20241212195718.25203-2-twoerner@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/3] u-boot: switch to upstream SRCREV for rk-u-boot-env | expand |
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
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 >
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] > -=-=-=-=-=-=-=-=-=-=-=- > >
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] > > -=-=-=-=-=-=-=-=-=-=-=- > > > >
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.
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"
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(-)