[meta-rockchip][PATCH 1/2] allow user-provided WKS_FILE

[meta-rockchip][PATCH 1/2] allow user-provided WKS_FILE

[Trevor Woerner]

Allow the user to provide their own WKS_FILE in situations where they want a
different layout (e.g. to support A/B updates).

Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
 conf/machine/include/rockchip-wic.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/machine/include/rockchip-wic.inc b/conf/machine/include/rockchip-wic.inc
index b1ca27cdd0a2..67a8310f7d6a 100644
--- a/conf/machine/include/rockchip-wic.inc
+++ b/conf/machine/include/rockchip-wic.inc
@@ -3,7 +3,7 @@
 SPL_BINARY ?= "idbloader.img"
 
 IMAGE_FSTYPES += "wic wic.bmap"
-WKS_FILE = "rockchip.wks"
+WKS_FILE ?= "rockchip.wks"
 WKS_FILE_DEPENDS ?= " \
 	mtools-native \
 	dosfstools-native \
-- 
2.43.0.76.g1a87c842ece3

[meta-rockchip][PATCH 2/2] rename u-boot bbappend

[Trevor Woerner]

The bbappend provided in this layer only needs to apply to the
u-boot_<version> file itself and not all u-boot files in oe-core.

Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
 recipes-bsp/u-boot/{u-boot%.bbappend => u-boot_%.bbappend} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename recipes-bsp/u-boot/{u-boot%.bbappend => u-boot_%.bbappend} (100%)

diff --git a/recipes-bsp/u-boot/u-boot%.bbappend b/recipes-bsp/u-boot/u-boot_%.bbappend
similarity index 100%
rename from recipes-bsp/u-boot/u-boot%.bbappend
rename to recipes-bsp/u-boot/u-boot_%.bbappend
-- 
2.43.0.76.g1a87c842ece3

Re: [yocto] [meta-rockchip][PATCH 2/2] rename u-boot bbappend

[Trevor Woerner]

On Sun 2024-01-28 @ 08:29:20 PM, Trevor Woerner via lists.yoctoproject.org wrote:
> The bbappend provided in this layer only needs to apply to the
> u-boot_<version> file itself and not all u-boot files in oe-core.
> 
> Signed-off-by: Trevor Woerner <twoerner@gmail.com>
> ---
>  recipes-bsp/u-boot/{u-boot%.bbappend => u-boot_%.bbappend} | 0
>  1 file changed, 0 insertions(+), 0 deletions(-)
>  rename recipes-bsp/u-boot/{u-boot%.bbappend => u-boot_%.bbappend} (100%)

Applied to meta-rockchip, master branch.

Re: [yocto] [meta-rockchip][PATCH 2/2] rename u-boot bbappend

[Quentin Schulz]

Hi Trevor,

On 1/29/24 02:29, Trevor Woerner via lists.yoctoproject.org wrote:
> The bbappend provided in this layer only needs to apply to the
> u-boot_<version> file itself and not all u-boot files in oe-core.
> 

Well.... We need BL31 and ROCKCHIP_TPL environment variables set, as 
well as the proper dependencies set, and that, for all U-Boot recipes. 
So now I'll have to copy those in my own U-Boot recipe(s) :)

I'm not against the change, just that some parts inside that bbappend 
made sense to apply to more than just u-boot_% recipes :).

Cheers,
Quentin