From 1bfc29627b23ac147baadd6dc8d4b35d0493af3f Mon Sep 17 00:00:00 2001
From: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
Date: Fri, 12 May 2017 15:45:45 +0200
Subject: disable TEE-related HALs and services

Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
---
 device.mk            |  7 -------
 rootdir/init.tuna.rc | 31 -------------------------------
 2 files changed, 38 deletions(-)

diff --git a/device.mk b/device.mk
index ab6a915..5eae40b 100755
--- a/device.mk
+++ b/device.mk
@@ -56,13 +56,6 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PROPERTY_OVERRIDES += \
 	media.aac_51_output_enabled=true
 
-# SMC
-PRODUCT_PACKAGES += \
-	keystore.tuna
-
- PRODUCT_COPY_FILES += \
-	$(DEVICE_FOLDER)/tee-fs-setup.sh:system/vendor/bin/tee-fs-setup.sh
-
 # Init files
 PRODUCT_COPY_FILES += \
 	$(DEVICE_FOLDER)/rootdir/init.tuna.rc:root/init.tuna.rc \
diff --git a/rootdir/init.tuna.rc b/rootdir/init.tuna.rc
index b6a66dc..11ad919 100755
--- a/rootdir/init.tuna.rc
+++ b/rootdir/init.tuna.rc
@@ -54,8 +54,6 @@ on fs
     restorecon_recursive /factory
     mount ext4 /dev/block/platform/omap/omap_hsmmc.0/by-name/efs /factory rw remount
 
-    start tee_fs_setup
-
     # read only 1 page at a time
     write /proc/sys/vm/page-cluster 0
 
@@ -138,23 +136,6 @@ service setup_fs /system/bin/setup_fs \
         seclabel u:r:fs_setup:s0
         oneshot
 
-service tf_daemon /system/bin/tf_daemon \
-        -d -c /vendor/etc/smc_normal_world_android_cfg.ini
-        class core
-        user drmrpc
-        group drmrpc
-        disabled
-
-service smc_pa_wvdrm /system/bin/smc_pa_ctrl \
-        -c /vendor/etc/smc_normal_world_android_cfg.ini \
-        start /vendor/firmware/smc_pa_wvdrm.ift
-        class core
-        user drmrpc
-        group drmrpc
-        seclabel u:r:smc_pa_ctrl:s0
-        oneshot
-        disabled
-
 service fuse_usbdisk /system/bin/sdcard -u 1023 -g 1023 /mnt/media_rw/usbdisk /storage/usbdisk
     class late_start
     disabled
@@ -234,18 +215,6 @@ service battery_charger /sbin/healthd -c
     critical
     seclabel u:r:healthd:s0
 
-service tee_fs_setup /system/vendor/bin/tee-fs-setup.sh
-    class core
-    user root
-    group root
-    seclabel u:r:recovery:s0
-    disabled
-    oneshot
-
-on property:init.tee_fs.ready=true
-    start smc_pa_wvdrm
-    start tf_daemon
-
 # Allow writing to the kernel trace log. Enabling tracing still requires root.
 on property:ro.debuggable=1
     chmod 0222 /sys/kernel/debug/tracing/trace_marker
-- 
cgit v1.2.3