Merge "meta-qti-bsp: Changes for 6.12 LTS"

conf/machine/trustedvm-v4.conf

@@ -71,10 +71,10 @@ KERNEL_DTB_NAMES = "canoe-vm-*.dtb canoe-oemvm-*.dtb"
 MACHINE_FSCONFIG_CONF = "trustedvm-fsconfig.conf"
 MACHINE_SUPPORTS_USB = "False"
 MACHINE_SUPPORTS_ANDROID_PROPERTIES = "False"
-MACHINE_SUPPORTS_DISPLAY = "True"
+MACHINE_SUPPORTS_DISPLAY = "False"
 MACHINE_SUPPORTS_MINK = "True"
 MACHINE_SUPPORTS_SECUREMSM = "True"
-MACHINE_SUPPORTS_TOUCH = "True"
+MACHINE_SUPPORTS_TOUCH = "False"
 MACHINE_SUPPORTS_OEMVM = "True"
 MACHINE_MNT_POINTS = " "
 ENABLE_ADB = "False"
@@ -102,7 +102,7 @@ CMDLINE_OFFSET_OEMVM = "0x2100000"
 # Ramdisk size is 8 MB
 RAMDISK_SIZE = "10388608"
 
-SYSTEM_SIZE_EXT4 ?= "255000000"
+SYSTEM_SIZE_EXT4 ?= "250000000"
 USERDATA_SIZE_EXT4 ?= "25000000"
 PERSIST_IMAGE_ROOTFS_SIZE = "119000000"
 PERSIST_OEMVM_IMAGE_ROOTFS_SIZE = "70000000"
@@ -127,4 +127,4 @@ UFS_BSG_DEV_USAGE = "True"
 MACHINE_FEATURES += " gh-loader "
 
 # ZRAM
-SWAP_MEMTOTAL_PCT = "200"
+SWAP_MEMTOTAL_PCT = "0"

recipes-core/packagegroups/packagegroup-qti-debug-tools.bb

@@ -13,7 +13,7 @@ PACKAGES =  "\
 RDEPENDS:packagegroup-qti-debug-tools = " \
             gdbserver \
             strace \
-            valgrind \
+            ${@bb.utils.contains_any('MACHINE', 'trustedvm-v4', '', 'valgrind', d)} \
             systemd-analyze \
             procrank \
             ${@bb.utils.contains_any('MACHINE', 'trustedvm-v4 trustedvm-v3', '', 'perf', d)} \

recipes-core/systemd/systemd-conf_%.bbappend

@@ -29,7 +29,7 @@ do_install:append() {
    fi
 
    if ${@bb.utils.contains_any('MACHINE_FEATURES', 'qti-vm qti-vm-guest', 'true', 'false', d)}; then
-      sed -i -e 's/.*RuntimeMaxUse.*/RuntimeMaxUse=5M/' ${D}${systemd_unitdir}/journald.conf.d/00-${PN}.conf
+      sed -i -e 's/.*RuntimeMaxUse.*/RuntimeMaxUse=1M/' ${D}${systemd_unitdir}/journald.conf.d/00-${PN}.conf
    fi
 }