From e4697fa5d009b5cda48fd12dccda5674cbdeaa34 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 7 May 2021 08:31:44 -0700 Subject: [PATCH] opensbi-starfive: Rename to opensbi_starfive-0.8.0.bb This makes the main recipe PN same as the one in core, but gives it starfive flavor in PV, this then becomes nice to include it via PREFERRED_VERSION mechanism. Additionally, this also means that it gets picked up in world builds for beaglev and OE-Core recipe is not preferred, as of now, it tries to build both, since they are seen as different packages by bitbake due to different PN Signed-off-by: Khem Raj --- conf/machine/beaglev-starlight-jh7100.conf | 5 +++-- .../{opensbi-starfive_0.8.0.bb => opensbi_starfive-0.8.0.bb} | 0 2 files changed, 3 insertions(+), 2 deletions(-) rename recipes-bsp/opensbi/{opensbi-starfive_0.8.0.bb => opensbi_starfive-0.8.0.bb} (100%) diff --git a/conf/machine/beaglev-starlight-jh7100.conf b/conf/machine/beaglev-starlight-jh7100.conf index 1ea9055..86637bf 100644 --- a/conf/machine/beaglev-starlight-jh7100.conf +++ b/conf/machine/beaglev-starlight-jh7100.conf @@ -16,8 +16,9 @@ PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-starfive" PREFERRED_VERSION_openocd-native = "riscv" PREFERRED_VERSION_openocd = "riscv" +PREFERRED_VERSION_opensbi = "starfive-0.8.0" -EXTRA_IMAGEDEPENDS += "opensbi-starfive" +EXTRA_IMAGEDEPENDS += "opensbi" RISCV_SBI_PLAT = "starfive/vic7100" ## This sets u-boot as the default OpenSBI payload @@ -43,7 +44,7 @@ UBOOT_DTB_LOADADDRESS = "0x82200000" ## wic default support WKS_FILE_DEPENDS ?= " \ - opensbi-starfive \ + opensbi \ e2fsprogs-native \ bmap-tools-native \ " diff --git a/recipes-bsp/opensbi/opensbi-starfive_0.8.0.bb b/recipes-bsp/opensbi/opensbi_starfive-0.8.0.bb similarity index 100% rename from recipes-bsp/opensbi/opensbi-starfive_0.8.0.bb rename to recipes-bsp/opensbi/opensbi_starfive-0.8.0.bb