Merge branch 'SIDDK24:android-12.1' into android-12.1

PitchBlackRecoveryProject · Sep 12, 2024 · 8f13ceb · 8f13ceb
2 parents 724386b + 1d567e8
commit 8f13ceb
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 5 deletions.
diff --git a/BoardConfig.mk b/BoardConfig.mk
@@ -17,7 +17,6 @@
 DEVICE_PATH := device/xiaomi/nabu
 
 # For building with minimal manifest
-
 ALLOW_MISSING_DEPENDENCIES := true
 BUILD_BROKEN_DUP_RULES := true
 BUILD_BROKEN_USES_BUILD_COPY_HEADERS := true
@@ -101,9 +100,9 @@ BOARD_MKBOOTIMG_ARGS += --kernel_offset $(BOARD_KERNEL_OFFSET)
 BOARD_MKBOOTIMG_ARGS += --second_offset $(BOARD_KERNEL_SECOND_OFFSET)
 TARGET_PREBUILT_KERNEL := $(DEVICE_PATH)/prebuilt/kernel
 BOARD_PREBUILT_DTBOIMAGE := $(DEVICE_PATH)/prebuilt/dtbo.img
-BOARD_PREBUILT_DTBIMAGE_DIR := $(DEVICE_PATH)/prebuilt/dtbs
+TARGET_PREBUILT_DTB := $(DEVICE_PATH)/prebuilt/dtb.img
 BOARD_INCLUDE_RECOVERY_DTBO := true
-BOARD_INCLUDE_DTB_IN_BOOTIMG := true
+#BOARD_INCLUDE_DTB_IN_BOOTIMG := true
 endif
 
 # Metadata

diff --git a/prebuilt/dtb.img b/prebuilt/dtb.img
diff --git a/prebuilt/dtbo.img b/prebuilt/dtbo.img
diff --git a/prebuilt/dtbs/sm8150-v2.dtb b/prebuilt/dtbs/sm8150-v2.dtb
diff --git a/prebuilt/dtbs/sm8150.dtb b/prebuilt/dtbs/sm8150.dtb
diff --git a/prebuilt/dtbs/sm8150p-v2.dtb b/prebuilt/dtbs/sm8150p-v2.dtb
diff --git a/prebuilt/dtbs/sm8150p.dtb b/prebuilt/dtbs/sm8150p.dtb
diff --git a/prebuilt/kernel b/prebuilt/kernel
diff --git a/recovery/root/system/etc/recovery.fstab b/recovery/root/system/etc/recovery.fstab
@@ -7,3 +7,10 @@ mi_ext /mnt/vendor/mi_ext
 /dev/block/by-name/metadata /metadata ext4 noatime,nosuid,nodev,discard wait,check,formattable,wrappedkey,first_stage_mount
 /dev/block/bootdevice/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065,fsync_mode=nobarrier,inlinecrypt latemount,wait,check,formattable,fileencryption=aes-256-xts:aes-256-cts:v2+inlinecrypt_optimized+wrappedkey_v0,metadata_encryption=aes-256-xts:wrappedkey_v0,keydirectory=/metadata/vold/metadata_encryption,quota,reservedsize=128M,checkpoint=fs
 /dev/block/bootdevice/by-name/misc /misc emmc defaults defaults
+
+## EROFS
+system /system erofs ro wait,slotselect,logical,first_stage_mount
+system_ext /system_ext erofs ro wait,slotselect,logical,first_stage_mount
+product /product erofs ro wait,slotselect,logical,first_stage_mount
+vendor /vendor erofs ro wait,slotselect,logical,first_stage_mount
+odm /odm erofs ro wait,slotselect,logical,first_stage_mount
diff --git a/recovery/root/system/etc/twrp.flags b/recovery/root/system/etc/twrp.flags
@@ -4,8 +4,6 @@
 
 # mount point fstype device device2 flags
 
-/metadata ext4 /dev/block/bootdevice/by-name/metadata flags=display="Metadata";wrappedkey
-#/data f2fs /dev/block/bootdevice/by-name/userdata flags=fileencryption=aes-256-xts:aes-256-cts:v2+inlinecrypt_optimized+wrappedkey_v0,metadata_encryption=aes-256-xts:wrappedkey_v0,keydirectory=/metadata/vold/metadata_encryption
 /boot emmc /dev/block/bootdevice/by-name/boot flags=backup=1;flashimg=1;slotselect
 /dtbo emmc /dev/block/bootdevice/by-name/dtbo flags=backup=1;display="Dtbo";flashimg=1;slotselect
 /firmware vfat /dev/block/bootdevice/by-name/modem flags=display="Firmware";slotselect;mounttodecrypt;fsflags=ro