Skip to contentSkip to conversation

u-boot: make rock-pi-e patches only for rock-pi-e

PATCH In review Trevor Woerner 2 participants 3 messages Jan 24, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 u-boot: make rock-pi-e patches only for rock-pi-e

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")
---
 recipes-bsp/u-boot/u-boot%.bbappend | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-bsp/u-boot/u-boot%.bbappend +1 -1
index 292530c5ad40..f8378d91ce68 100644
@@ -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 \
 	"
Signature · 1 line
2.43.0.76.g1a87c842ece3
Reviewed-by on v1 1/1
#1 lore raw

Hi Trevor,

Quoted 5 lines · Trevor Woerner via lists.yoctoproject.org

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")

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

#2 lore raw
Quoted 9 lines · Quentin Schulz

Hi Trevor,

Quoted 5 lines · Trevor Woerner via lists.yoctoproject.org

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")
Quoted 7 lines

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.

Quoted 2 lines

Cheers,
Quentin