Re: [yocto] [meta-rockchip][PATCH] u-boot: make rock-pi-e patches only for rock-pi-e

Re: [yocto] [meta-rockchip][PATCH] u-boot: make rock-pi-e patches only for rock-pi-e

[Trevor Woerner]

On Wed 2024-01-24 @ 12:51:13 PM, Trevor Woerner via lists.yoctoproject.org wrote:
> The U-Boot patches that were added recently are only for the rock-pi-e
> MACHINE, therefore only apply them when building for rock-pi-e.
> 
> Fixes: b5bba3a01197 ("rock-pi-e: apply upstream PHY fix")
Reviewed-by: Quentin Schulz <foss+yocto@0leil.net>
> Signed-off-by: Trevor Woerner <twoerner@gmail.com>
> ---
>  recipes-bsp/u-boot/u-boot%.bbappend | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied to meta-rockchip, master branch.

[meta-rockchip][PATCH] u-boot: make rock-pi-e patches only for rock-pi-e

[Trevor Woerner]

The U-Boot patches that were added recently are only for the rock-pi-e
MACHINE, therefore only apply them when building for rock-pi-e.

Fixes: b5bba3a01197 ("rock-pi-e: apply upstream PHY fix")
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
 recipes-bsp/u-boot/u-boot%.bbappend | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-bsp/u-boot/u-boot%.bbappend b/recipes-bsp/u-boot/u-boot%.bbappend
index 292530c5ad40..f8378d91ce68 100644
--- a/recipes-bsp/u-boot/u-boot%.bbappend
+++ b/recipes-bsp/u-boot/u-boot%.bbappend
@@ -1,5 +1,5 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
-SRC_URI += " \
+SRC_URI:append:rock-pi-e = " \
 	file://PATCH_1-2_net_designware_Reset_eth_phy_before_phy_connect.patch \
 	file://PATCH_2-2_rockchip_rk3328-rock-pi-e_Enable_DM_ETH_PHY_and_PHY_REALTEK.patch \
 	"
-- 
2.43.0.76.g1a87c842ece3

Re: [yocto] [meta-rockchip][PATCH] u-boot: make rock-pi-e patches only for rock-pi-e

[Quentin Schulz]

Hi Trevor,

On 1/24/24 18:51, Trevor Woerner via lists.yoctoproject.org wrote:
> The U-Boot patches that were added recently are only for the rock-pi-e
> MACHINE, therefore only apply them when building for rock-pi-e.
> 
> Fixes: b5bba3a01197 ("rock-pi-e: apply upstream PHY fix")
> Signed-off-by: Trevor Woerner <twoerner@gmail.com>

Reviewed-by: Quentin Schulz <foss+yocto@0leil.net>

What a nice timing, got "bothered" by this a few hours ago but got 
sidetracked :)

I **think** this would make more sense in a u-boot_2024.01.bbappend 
though, since it'll likely only apply on top of that version :)

Cheers,
Quentin

Re: [yocto] [meta-rockchip][PATCH] u-boot: make rock-pi-e patches only for rock-pi-e

[Trevor Woerner]

On Wed 2024-01-24 @ 06:56:01 PM, Quentin Schulz wrote:
> Hi Trevor,
> 
> On 1/24/24 18:51, Trevor Woerner via lists.yoctoproject.org wrote:
> > The U-Boot patches that were added recently are only for the rock-pi-e
> > MACHINE, therefore only apply them when building for rock-pi-e.
> > 
> > Fixes: b5bba3a01197 ("rock-pi-e: apply upstream PHY fix")
> > Signed-off-by: Trevor Woerner <twoerner@gmail.com>
> 
> Reviewed-by: Quentin Schulz <foss+yocto@0leil.net>
> 
> What a nice timing, got "bothered" by this a few hours ago but got
> sidetracked :)
> 
> I **think** this would make more sense in a u-boot_2024.01.bbappend though,
> since it'll likely only apply on top of that version :)

Hopefully these patches go upstream soon, when it does my nightly build will
fail, and I can remove it the next day. But if the patches don't get into the
next release then rock-pi-e's second ethernet will stop working again if we
make it version-specific.

> Cheers,
> Quentin