From deb22a36e7bdc5c53e4fa306587a8908864a9eec Mon Sep 17 00:00:00 2001 From: SGCMarkus Date: Thu, 17 Feb 2022 19:29:57 +0100 Subject: [PATCH] sm8250-common: build vendor ramdisk image also use rootdir/etc/fstab.qcom for recovery and add recovery.wipe --- BoardConfigCommon.mk | 5 ++++- recovery/recovery.wipe | 12 ++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 recovery/recovery.wipe diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index b76428c..bdd0d3e 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -170,10 +170,12 @@ BOARD_PRODUCTIMAGE_EXTFS_INODE_COUNT := -1 BOARD_SYSTEMIMAGE_EXTFS_INODE_COUNT := -1 BOARD_SYSTEM_EXTIMAGE_EXTFS_INODE_COUNT := -1 endif +BOARD_BUILD_VENDOR_RAMDISK_IMAGE := true BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4 BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := ext4 BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := ext4 BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4 +BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE := f2fs BOARD_MOT_DP_PARTITION_LIST := product system system_ext vendor BOARD_SUPER_PARTITION_GROUPS := mot_dp BOARD_FLASH_BLOCK_SIZE := 262144 # (BOARD_KERNEL_PAGESIZE * 64) @@ -194,7 +196,8 @@ TARGET_NO_RECOVERY := true TARGET_RECOVERY_PIXEL_FORMAT := RGBX_8888 TARGET_USERIMAGES_USE_EXT4 := true TARGET_USERIMAGES_USE_F2FS := true -TARGET_RECOVERY_FSTAB := $(COMMON_PATH)/recovery/fstab.qcom +TARGET_RECOVERY_FSTAB := $(COMMON_PATH)/rootdir/etc/fstab.qcom +TARGET_RECOVERY_WIPE := $(COMMON_PATH)/recovery/recovery.wipe # RIL ENABLE_VENDOR_RIL_SERVICE := true diff --git a/recovery/recovery.wipe b/recovery/recovery.wipe new file mode 100644 index 0000000..20bae8d --- /dev/null +++ b/recovery/recovery.wipe @@ -0,0 +1,12 @@ +# All the partitions to be wiped (in order) under recovery. +/dev/block/bootdevice/by-name/system_a +/dev/block/bootdevice/by-name/system_b +/dev/block/bootdevice/by-name/product_a +/dev/block/bootdevice/by-name/product_b +/dev/block/bootdevice/by-name/vendor_a +/dev/block/bootdevice/by-name/vendor_b +/dev/block/bootdevice/by-name/userdata +# Wipe the boot partitions last so that all partitions will be wiped +# correctly even if the wiping process gets interrupted by a force boot. +/dev/block/bootdevice/by-name/boot_a +/dev/block/bootdevice/by-name/boot_b \ No newline at end of file