drop jailhouse

This allows us to reduce maintenance and testing effort. If necessary, it can be added at the customer's factory. Signed-off-by: Jose Quaresma <[email protected]>
foundriesio · Sep 23, 2024 · 34a5e5e · 34a5e5e
1 parent 0388588
commit 34a5e5e
Show file tree

Hide file tree

Showing 34 changed files with 2 additions and 2,831 deletions.
diff --git a/meta-lmp-base/conf/distro/include/lmp.inc b/meta-lmp-base/conf/distro/include/lmp.inc
@@ -135,10 +135,9 @@ BBMASK += " \
     /meta-st-stm32mp/recipes-graphics/drm/libdrm_2.4.115.bbappend \
     /meta-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.6.bb \
 "
-# meta-ti-bsp: mask optee and jailhouse related recipes as they are provided by lmp
+# meta-ti-bsp: mask optee related recipes as they are provided by lmp
 BBMASK += " \
     /meta-ti/meta-ti-bsp/recipes-security/optee \
-    /meta-ti/meta-ti-extras/recipes-ti/jailhouse \
 "
 
 # disable xsct tarball by default (xilinx)

diff --git a/meta-lmp-base/conf/distro/include/non-clangable.inc b/meta-lmp-base/conf/distro/include/non-clangable.inc
@@ -119,11 +119,6 @@ STRIP:pn-linux-tegra:toolchain-clang = "${HOST_PREFIX}strip"
 OBJCOPY:pn-linux-tegra-rt:toolchain-clang = "${HOST_PREFIX}objcopy"
 STRIP:pn-linux-tegra-rt:toolchain-clang = "${HOST_PREFIX}strip"
 
-# jailhouse (includes kernel module)
-# | warning: the compiler differs from the one used to build the kernel
-TOOLCHAIN:pn-jailhouse = "gcc"
-TOOLCHAIN:pn-jailhouse-imx = "gcc"
-
 # use gcc for now as it fail with clang with some compile errors:
 # error: passing 'unsigned int *' to parameter of type 'int *' converts between pointers to integer types with different sign [-Werror,-Wpointer-sign]
 # error: fields must have a constant size: 'variable length array in structure' extension will never be supported

diff --git a/meta-lmp-base/recipes-kernel/jailhouse/jailhouse-arch.inc b/meta-lmp-base/recipes-kernel/jailhouse/jailhouse-arch.inc
diff --git a/meta-lmp-base/recipes-kernel/jailhouse/jailhouse_git.bb b/meta-lmp-base/recipes-kernel/jailhouse/jailhouse_git.bb
diff --git a/meta-lmp-base/recipes-kernel/linux/linux-lmp.inc b/meta-lmp-base/recipes-kernel/linux/linux-lmp.inc
@@ -2,8 +2,6 @@ DESCRIPTION = "Common Foundries.io Linux microPlatform Kernel"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
-KERNEL_FEATURES += "${@bb.utils.contains('MACHINE_FEATURES', 'jailhouse', ' features/jailhouse/jailhouse.scc', '', d)}"
-
 DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
 DEPENDS += "openssl-native util-linux-native"
 

diff --git a/meta-lmp-base/recipes-samples/images/lmp-base-console-image.bb b/meta-lmp-base/recipes-samples/images/lmp-base-console-image.bb
@@ -17,7 +17,6 @@ require ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'lmp-feature-optee.inc
 require ${@bb.utils.contains('MACHINE_FEATURES', 'se05x', 'lmp-feature-se05x.inc', '', d)}
 require ${@bb.utils.contains('MACHINE_FEATURES', 'tpm2', 'lmp-feature-tpm2.inc', '', d)}
 require ${@bb.utils.contains('MACHINE_FEATURES', 'efi', 'lmp-feature-efi.inc', '', d)}
-require ${@bb.utils.contains('MACHINE_FEATURES', 'jailhouse', 'lmp-feature-jailhouse.inc', '', d)}
 require ${@bb.utils.contains('DISTRO_FEATURES', 'ima', 'lmp-feature-ima.inc', '', d)}
 require ${@bb.utils.contains('DISTRO_FEATURES', 'lmpdebug', 'lmp-feature-debug.inc', '', d)}
 

diff --git a/meta-lmp-base/recipes-samples/images/lmp-feature-jailhouse.inc b/meta-lmp-base/recipes-samples/images/lmp-feature-jailhouse.inc
diff --git a/meta-lmp-bsp/conf/machine/include/lmp-machine-custom.inc b/meta-lmp-bsp/conf/machine/include/lmp-machine-custom.inc
@@ -702,7 +702,7 @@ UBOOT_SIGN_KEYDIR:k3 ?= "${TOPDIR}/conf/keys"
 FIT_HASH_ALG:sota:k3 ?= "sha256"
 FIT_SIGN_ALG:sota:k3 ?= "rsa2048"
 KERNEL_IMAGETYPE:sota:k3 = "fitImage"
-KERNEL_IMAGETYPES:sota:k3 = "${KERNEL_IMAGETYPE} ${@bb.utils.contains('MACHINE_FEATURES', 'jailhouse', 'Image', '', d)}"
+KERNEL_IMAGETYPES:sota:k3 = "${KERNEL_IMAGETYPE}"
 PREFERRED_PROVIDER_virtual/kernel:k3 ?= "linux-lmp-ti-staging"
 WKS_FILE_DEPENDS:append:k3 = " virtual/bootloader"
 OSTREE_DEPLOY_USR_OSTREE_BOOT:k3 = "${@bb.utils.contains('DISTRO_FEATURES', 'luks', '1', '0', d)}"
@@ -726,8 +726,6 @@ LMP_BOOT_FIRMWARE_FILES:am62xx = "tispl.bin u-boot.img tiboot3-am62x-gp-evm.bin
 LMP_BOOT_FIRMWARE_FILES:append:sota:am62xx = " boot.itb"
 ## am62xx-evm
 SOTA_CLIENT_FEATURES:append:am62xx-evm = " ubootenv"
-KERNEL_DEVICETREE:append:am62xx-evm = " ${@bb.utils.contains('MACHINE_FEATURES', 'jailhouse', 'ti/k3-am625-base-board-jailhouse.dtbo', '', d)}"
-KERNEL_MODULE_AUTOLOAD:append:am62xx-evm = " ${@bb.utils.contains('MACHINE_FEATURES', 'jailhouse', 'jailhouse uio_ivshmem', '', d)}"
 ## beagleplay
 SOTA_CLIENT_FEATURES:append:beagleplay = " ubootenv"
 KERNEL_DEVICETREE:beagleplay = "ti/k3-am625-beagleplay.dtb ti/k3-am625-beagleplay-csi2-ov5640.dtbo ti/k3-am625-beagleplay-csi2-tevi-ov5640.dtbo"

diff --git a/meta-lmp-bsp/dynamic-layers/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging.inc b/meta-lmp-bsp/dynamic-layers/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging.inc
@@ -1,7 +1,6 @@
 include recipes-bsp/u-boot/u-boot-lmp-common.inc
 
 SRC_URI:append = " \
-    ${@bb.utils.contains('MACHINE_FEATURES', 'jailhouse', 'file://0003-HACK-lib-lmb-Allow-re-reserving-post-relocation-U-Bo.patch', '', d)} \
     file://lib-zlib-Fix-a-bug-when-getting-a-gzip-header-extra-field.patch \
     file://k3-accept-filesystem-path-to-the-RoT-key.patch \
     file://k3-set-env-variable-device_type.patch \

diff --git a/.../u-boot/u-boot-ti-staging/0003-HACK-lib-lmb-Allow-re-reserving-post-relocation-U-Bo.patch b/.../u-boot/u-boot-ti-staging/0003-HACK-lib-lmb-Allow-re-reserving-post-relocation-U-Bo.patch
diff --git a/...ti-bsp/recipes-kernel/linux/linux-lmp-ti-staging/0001-uio-Enable-read-only-mappings.patch b/...ti-bsp/recipes-kernel/linux/linux-lmp-ti-staging/0001-uio-Enable-read-only-mappings.patch