From 5e5f213fc3901466efe900764d0ca45ad599a1d9 Mon Sep 17 00:00:00 2001 From: Arian Date: Fri, 10 Sep 2021 12:12:13 +0200 Subject: [PATCH 1/2] msmnile: Remove no recovery configuration We do have a recovery partition and don't have recovery in boot. When building abl, after commit [1] these flags break booting to recovery. [1] https://source.codeaurora.org/quic/la/abl/tianocore/edk2/commit/?h=LA.UM.9.1.r1-11100-SMxxx0.0&id=70ad7f4ab713334a7c1d822c6daf58e5847b830f Change-Id: Ib3b569403cf6e88aedba036e2026f49f6820af01 --- BoardConfig.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/BoardConfig.mk b/BoardConfig.mk index 219e0f0..7e3f0bf 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -12,8 +12,6 @@ BOARD_VENDORIMAGE_PARTITION_SIZE := 1073741824 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 3221225472 #BOARD_ODMIMAGE_PARTITION_SIZE := 67108864 BOARD_BUILD_SYSTEM_ROOT_IMAGE := true -TARGET_NO_RECOVERY := true -BOARD_USES_RECOVERY_AS_BOOT := true else # Define the Dynamic Partition sizes and groups. ifeq ($(ENABLE_VIRTUAL_AB), true) From 385b0333c75acde9482d273c104f048a22092b55 Mon Sep 17 00:00:00 2001 From: Arian Date: Fri, 10 Sep 2021 22:00:13 +0200 Subject: [PATCH 2/2] msmnile: Setup f2fs userdata flags When building ABL, the BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE flag is used to decide what fastboot erase userdata does. Since we use f2fs on userdata, we want userdata to be formatted as f2fs. Change-Id: I58b3e438160323057d40f66379f4788f76169a3e --- BoardConfig.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/BoardConfig.mk b/BoardConfig.mk index 7e3f0bf..7b1867b 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -106,6 +106,8 @@ BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4 TARGET_COPY_OUT_VENDOR := vendor BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true TARGET_USERIMAGES_USE_EXT4 := true +TARGET_USERIMAGES_USE_F2FS := true +BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE := f2fs else TARGET_RECOVERY_FSTAB := device/qcom/msmnile/recovery.fstab endif