[dunfell/master][PATCH v2 1/2] packagegroups: remove jailhouse package for k3 platforms

[dunfell/master][PATCH v2 1/2] packagegroups: remove jailhouse package for k3 platforms

[Gowtham Tammana]

jailhouse is not yet updated for kernel 5.10, remove the package for all
k3 platforms for now.

Signed-off-by: Gowtham Tammana <g-tammana@ti.com>
---
v2:
  - remove it from the sdk-host package as well for tisdk-core-bundle image

 .../packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb    | 1 -
 .../packagegroups/packagegroup-arago-tisdk-addons.bb             | 1 -
 2 files changed, 2 deletions(-)

diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb
index 46817f99..34cb619e 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb
@@ -37,7 +37,6 @@ UTILS_append_k2g = " \
 "
 
 UTILS_append_k3 = " \
-    jailhouse-src \
     ti-sci-fw-source \
     trusted-firmware-a-src \
 "
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
index f92367d0..287cba63 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
@@ -59,7 +59,6 @@ UTILS_append_omap-a15 = " mmc-utils \
 UTILS_append_k3 = " mmc-utils \
                     switch-config \
                     irqbalance \
-                    jailhouse \
                     ti-rpmsg-char \
                     ti-rpmsg-char-examples \
                     statcol \
-- 
2.31.1

[dunfell/master][PATCH v2 2/2] ti-tisdk-makefile: remove jailhouse target

[Gowtham Tammana]

jailhouse is not yet ready for kernel 5.10, remove it from the sdk
makefile targets for now.

Signed-off-by: Gowtham Tammana <g-tammana@ti.com>
---
v2: no change

 .../ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb           | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb
index 48ed961e..d2201675 100644
--- a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb
+++ b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb
@@ -53,11 +53,10 @@ SRC_URI = "\
     file://Makefile_pdm-anomaly-detection \
     file://Makefile_tiovx-app-host \
     file://Makefile_ti-ipc \
-    file://Makefile_jailhouse \
     file://Makefile_ti-img-rogue-driver \
 "
 
-PR = "r104"
+PR = "r105"
 
 MAKEFILES_MATRIX_GUI = "matrix-gui-browser \
                         refresh-screen \
@@ -187,7 +186,6 @@ MAKEFILES_append_k3 = " u-boot-spl \
                         cryptodev \
                         sysfw-image \
                         ti-ipc \
-                        jailhouse \
 "
 
 MAKEFILES_append_am65xx = " \
@@ -254,10 +252,6 @@ IPC_TOOLS_PATHS_append_omap-a15 = " ${IPC_TOOLS_PATHS_C66} ${IPC_TOOLS_PATHS_M4}
 IPC_TOOLS_PATHS_append_omapl138 = " ${IPC_TOOLS_PATHS_C674}"
 IPC_TOOLS_PATHS_append_k3 = "${IPC_TOOLS_PATHS_R5F}"
 
-# Populate Jailhouse config header
-JH_PLATFORM = "${MACHINE}"
-JH_PLATFORM_k3 = "k3"
-
 # If it's not defined at all, like for zImage case
 UBOOT_LOADADDRESS ?= "0"
 
@@ -323,7 +317,6 @@ do_install () {
     sed -i -e "s/__BOOT_MONITOR_MAKE_TARGET__/${BOOT_MONITOR_MAKE_TARGET}/g" ${D}/Makefile
     sed -i -e "s/__PRU_ICSS_INSTALL_TARGET__/${PRU_ICSS_INSTALL_TARGET}/g" ${D}/Makefile
     sed -i -e "s/__IPC_TOOLS_PATHS__/${IPC_TOOLS_PATHS}/g" ${D}/Makefile
-    sed -i -e "s/__JH_PLATFORM__/${JH_PLATFORM}/" ${D}/Makefile
     sed -i -e "s/__TISDK_VERSION__/${TISDK_VERSION}/g" ${D}/Makefile
 
     cat ${D}/Makefile | grep "__DTB_DEPEND__" > /dev/null
-- 
2.31.1