summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--conf/machine/include/imx-base.inc1
-rw-r--r--recipes-extended/jailhouse/jailhouse-imx_git.bb (renamed from recipes-extended/jailhouse/jailhouse_git.bb)5
2 files changed, 6 insertions, 0 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 236e3210..e575d7d4 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
456MACHINE_EXTRA_RRECOMMENDS += "udev-rules-imx" 456MACHINE_EXTRA_RRECOMMENDS += "udev-rules-imx"
457 457
458# Jailhouse 458# Jailhouse
459PREFERRED_PROVIDER_jailhouse:imx-nxp-bsp ?= "jailhouse-imx"
459MACHINE_EXTRA_RRECOMMENDS += " \ 460MACHINE_EXTRA_RRECOMMENDS += " \
460 ${@bb.utils.filter('COMBINED_FEATURES', 'jailhouse', d)} \ 461 ${@bb.utils.filter('COMBINED_FEATURES', 'jailhouse', d)} \
461" 462"
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 \
13 file://driver/jailhouse.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3 \ 13 file://driver/jailhouse.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3 \
14" 14"
15 15
16PROVIDES = "jailhouse"
17RPROVIDES:${PN} += "jailhouse"
18
16SRCBRANCH = "lf-6.1.22_2.0.0" 19SRCBRANCH = "lf-6.1.22_2.0.0"
17SRCREV = "e090abc70bb395f705f85659ad92bdafbe407628" 20SRCREV = "e090abc70bb395f705f85659ad92bdafbe407628"
18 21
@@ -36,6 +39,8 @@ CELL_DIR ?= "${JH_DATADIR}/cells"
36CELLCONF_DIR ?= "${JH_DATADIR}/configs" 39CELLCONF_DIR ?= "${JH_DATADIR}/configs"
37INMATES_DIR ?= "${JH_DATADIR}/inmates" 40INMATES_DIR ?= "${JH_DATADIR}/inmates"
38 41
42TUNE_CCARGS:remove:mx93-nxp-bsp = "-mcpu=cortex-a55"
43
39do_configure() { 44do_configure() {
40 if [ -d ${STAGING_DIR_HOST}/${CELLCONF_DIR} ]; 45 if [ -d ${STAGING_DIR_HOST}/${CELLCONF_DIR} ];
41 then 46 then