gta4xl-common: Support changing readonly filesystem type with a flag
Change-Id: Ie9c749a37b3d42844b1824ab1cdb7a2fa51a186b
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 005f93a..4dabd01 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -72,6 +72,7 @@
odm
ifneq ($(WITH_GMS),true)
+ifneq ($(TARGET_RO_FILE_SYSTEM_TYPE),erofs)
BOARD_PRODUCTIMAGE_PARTITION_RESERVED_SIZE := 1258291200
BOARD_PRODUCTIMAGE_EXTFS_INODE_COUNT := -1
BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 1258291200
@@ -79,6 +80,7 @@
BOARD_SYSTEM_EXTIMAGE_PARTITION_RESERVED_SIZE := 1258291200
BOARD_SYSTEM_EXTIMAGE_EXTFS_INODE_COUNT := -1
endif
+endif
## DTB
BOARD_DTB_CFG := $(COMMON_PATH)/configs/kernel/exynos9611.cfg
@@ -91,8 +93,16 @@
BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
BOARD_ODMIMAGE_FILE_SYSTEM_TYPE := erofs
BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4
+BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := ext4
BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := ext4
BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := erofs
+ifneq ($(TARGET_RO_FILE_SYSTEM_TYPE),)
+BOARD_ODMIMAGE_FILE_SYSTEM_TYPE := $(TARGET_RO_FILE_SYSTEM_TYPE)
+BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := $(TARGET_RO_FILE_SYSTEM_TYPE)
+BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := $(TARGET_RO_FILE_SYSTEM_TYPE)
+BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := $(TARGET_RO_FILE_SYSTEM_TYPE)
+BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := $(TARGET_RO_FILE_SYSTEM_TYPE)
+endif
TARGET_COPY_OUT_ODM := odm
TARGET_COPY_OUT_PRODUCT := product
TARGET_COPY_OUT_SYSTEM_EXT := system_ext
diff --git a/configs/init/fstab.exynos9611 b/configs/init/fstab.exynos9611
index 256c3ef..0a5c2ce 100644
--- a/configs/init/fstab.exynos9611
+++ b/configs/init/fstab.exynos9611
@@ -1,7 +1,12 @@
system /system ext4 ro,barrier=1 wait,logical,first_stage_mount
+system /system erofs ro wait,logical,first_stage_mount
system_ext /system_ext ext4 ro,barrier=1 wait,logical,first_stage_mount
+system_ext /system_ext erofs ro wait,logical,first_stage_mount
+vendor /vendor ext4 ro,barrier=1 wait,logical,first_stage_mount
vendor /vendor erofs ro wait,logical,first_stage_mount
product /product ext4 ro,errors=panic wait,logical,first_stage_mount
+product /product erofs ro wait,logical,first_stage_mount
+odm /odm ext4 ro,errors=panic wait,logical,first_stage_mount
odm /odm erofs ro wait,logical,first_stage_mount
/dev/block/platform/13520000.ufs/by-name/metadata /metadata ext4 noatime,nosuid,nodev,noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic wait,first_stage_mount,formattable,check