Merge pull request #1636 from MrCry0/master-jailhouse

jailhouse: separate imx version

2 files changed, 6 insertions, 0 deletions

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 1a1b7c50..93fc16fa 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -456,6 +456,7 @@ MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'q
 MACHINE_EXTRA_RRECOMMENDS += "udev-rules-imx"
 
 # Jailhouse
+PREFERRED_PROVIDER_jailhouse:imx-nxp-bsp ?= "jailhouse-imx"
 MACHINE_EXTRA_RRECOMMENDS += " \
     ${@bb.utils.filter('COMBINED_FEATURES', 'jailhouse', d)} \
 "
diff --git a/recipes-extended/jailhouse/jailhouse_git.bb b/recipes-extended/jailhouse/jailhouse-imx_git.bb
index 2caca91c..c0f1b27d 100644
--- a/recipes-extended/jailhouse/jailhouse_git.bb
+++ b/recipes-extended/jailhouse/jailhouse-imx_git.bb
@@ -13,6 +13,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9fa7f895f96bde2d47fd5b7d95b6ba4d \
                  file://driver/jailhouse.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3 \
 "
 
+PROVIDES = "jailhouse"
+RPROVIDES:${PN} += "jailhouse"
+
 SRCBRANCH = "lf-6.1.22_2.0.0"
 SRCREV = "e090abc70bb395f705f85659ad92bdafbe407628"
 
@@ -36,6 +39,8 @@ CELL_DIR ?= "${JH_DATADIR}/cells"
 CELLCONF_DIR ?= "${JH_DATADIR}/configs"
 INMATES_DIR ?= "${JH_DATADIR}/inmates"
 
+TUNE_CCARGS:remove:mx93-nxp-bsp = "-mcpu=cortex-a55"
+
 do_configure() {
    if [ -d ${STAGING_DIR_HOST}/${CELLCONF_DIR} ];
    then