cleanup

buddi56 · Jul 29, 2020 · 238a29e · 238a29e
1 parent 1afe97f
commit 238a29e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 33 deletions.
diff --git a/BoardConfig.mk b/BoardConfig.mk
@@ -106,7 +106,7 @@ TARGET_USERIMAGES_USE_EXT4 := true
 
 # Recovery
 
-# Colors: RGBA_8888, ABGR_8888, BGRA_8888=yellow, RGBX_8888
+# Colors: RGBA_8888 = Blue, ABGR_8888, BGRA_8888=yellow, RGBX_8888 = Blue
 TARGET_RECOVERY_PIXEL_FORMAT := "RGBX_8888"
 TARGET_RECOVERY_FSTAB := $(LOCAL_PATH)/recovery.fstab
 BOARD_HAS_NO_SELECT_BUTTON := true

diff --git a/recovery.fstab b/recovery.fstab
@@ -1,23 +1,23 @@
 # mount point     fstype             device                             device2              flags
-/recovery	      emmc      /dev/block/platform/bootdevice/by-name/recovery      flags=display="Recovery"
-/boot		        emmc      /dev/block/platform/bootdevice/by-name/boot          flags=backup=1;display="Boot" 
-/system_root	  ext4      /dev/block/platform/bootdevice/by-name/system	       flags=display="System";wipeingui;backup=0
-/system_image   emmc      /dev/block/by-name/system				                     flags=backup=1;flashimg=1
-/cache		      ext4      /dev/block/platform/bootdevice/by-name/cache
-/data		        ext4      /dev/block/platform/bootdevice/by-name/userdata      flags=encryptable=/dev/block/platform/bootdevice/by-name/metadata
-/vendor         ext4      /dev/block/platform/bootdevice/by-name/vendor		     flags=backup=0;display="Vendor";wipeingui
-/vendor_image	  emmc      /dev/block/by-name/vendor				                     flags=backup=1;flashimg=1
+/recovery	 emmc      /dev/block/platform/bootdevice/by-name/recovery      flags=display="Recovery"
+/boot		 emmc      /dev/block/platform/bootdevice/by-name/boot          flags=backup=1;display="Boot" 
+/system_root	 ext4      /dev/block/platform/bootdevice/by-name/system	  flags=display="System";wipeingui;backup=0
+/system_image   emmc      /dev/block/by-name/system				   flags=backup=1;flashimg=1
+/cache		 ext4      /dev/block/platform/bootdevice/by-name/cache
+/data		 ext4      /dev/block/platform/bootdevice/by-name/userdata      flags=encryptable=/dev/block/platform/bootdevice/by-name/metadata
+/vendor         ext4      /dev/block/platform/bootdevice/by-name/vendor	   flags=backup=0;display="Vendor";wipeingui
+/vendor_image	emmc      /dev/block/by-name/vendor				   flags=backup=1;flashimg=1
 /logo           emmc      /dev/block/platform/bootdevice/by-name/logo          flags=display="logo";backup=1;flashimg=1
-/persist        ext4      /dev/block/platform/bootdevice/by-name/persist       flags=display="Persist";backup=1
+/persist        ext4      /dev/block/platform/bootdevice/by-name/persist       flags=display="Persist"
 /persist_image  emmc      /dev/block/platform/bootdevice/by-name/persist       flags=display="Persist Image";backup=1
 /bootloader     emmc      /dev/block/platform/bootdevice/by-name/lk            flags=display="Bootloader (lk)";backup=1;flashimg=1
 /bootloader2    emmc      /dev/block/platform/bootdevice/by-name/lk2           flags=display="Bootloader2 (lk2)";backup=1;flashimg=1
-/persistent	    emmc      /dev/block/platform/bootdevice/by-name/frp
-/misc		        emmc      /dev/block/platform/bootdevice/by-name/misc
+/persistent	 emmc      /dev/block/platform/bootdevice/by-name/frp
+/misc		 emmc      /dev/block/platform/bootdevice/by-name/misc
 /metadata       emmc      /dev/block/platform/bootdevice/by-name/metadata
-/boot_para 	    emmc      /dev/block/platform/bootdevice/by-name/boot_para
-/dtbo 		      emmc      /dev/block/platform/bootdevice/by-name/dtbo
-/odmdtbo 	      emmc      /dev/block/platform/bootdevice/by-name/odmdtbo
+/boot_para 	emmc      /dev/block/platform/bootdevice/by-name/boot_para
+/dtbo 		emmc      /dev/block/platform/bootdevice/by-name/dtbo
+/odmdtbo 	emmc      /dev/block/platform/bootdevice/by-name/odmdtbo
 /tee1           emmc      /dev/block/platform/bootdevice/by-name/tee1          flags=display="trustzone1";backup=1
 /tee2           emmc      /dev/block/platform/bootdevice/by-name/tee2          flags=display="trustzone2";backup=1
 /nvram          emmc      /dev/block/platform/bootdevice/by-name/nvram         flags=backup=1;display="Nvram";flashimg=1
@@ -26,5 +26,5 @@
 /protect_f      emmc      /dev/block/platform/bootdevice/by-name/protect1      flags=backup=1;display="protect_f";flashimg=1
 /protect_s      emmc      /dev/block/platform/bootdevice/by-name/protect2      flags=backup=1;display="protect_s";flashimg=1
 
-/external_sd    auto      /dev/block/mmcblk1p1	   /dev/block/mmcblk1          flags=display="Micro SD card";storage;wipeingui;removable
-/usb_otg	      vfat      /dev/block/sda1          /dev/block/sda              flags=display="Usb-Otg";storage;removable;wipeingui
+/external_sd    auto      /dev/block/mmcblk1p1	   /dev/block/mmcblk1    flags=display="Micro SD card";storage;wipeingui;removable
+/usb_otg	 vfat      /dev/block/sda1          /dev/block/sda        flags=display="Usb-Otg";storage;removable;wipeingui
diff --git a/recovery/root/init.recovery.mt6771.rc b/recovery/root/init.recovery.mt6771.rc
@@ -46,7 +46,6 @@ on init
     start hwservicemanager
     start servicemanager
     start vendor.keymaster-3-0
-    setprop crypto.ready 1
 
 service hwservicemanager /sbin/hwservicemanager
     user root
@@ -67,21 +66,6 @@ service vendor.keymaster-3-0 /sbin/android.hardware.keymaster@3.0-service
     disabled
     seclabel u:r:recovery:s0
 
-on property:crypto.ready=0
-    stop vendor.keymaster-3-0
-    stop servicemanager
-
-on property:vendor.sys.listeners.registered=true
-    start vendor.keymaster-3-0
-    start servicemanager
-
-on property:recovery.reload.persist=trigger_reload_persist
-    load_persist_props
-
-on property:recovery.fde.service=trigger_restart_service
-    restart hwservicemanager
-    restart vendor.keymaster-3-0
-
 on property:ro.mtk_emmc_support=1
     # Support A/B feature for emmc boot region
     symlink /dev/block/mmcblk0boot0 /dev/block/platform/bootdevice/by-name/preloader_a