| author | Xindong Xu <xindong.xu@amlogic.com> | 2020-11-17 02:32:44 (GMT) |
|---|---|---|
| committer | Xindong Xu <xindong.xu@amlogic.com> | 2020-11-17 08:29:46 (GMT) |
| commit | 45887c1671db5eeb2f7d3e6b8c0dc2a53c873d87 (patch) | |
| tree | a988472b695f371d4436b1aeda2219b0390afa09 | |
| parent | ddbb3a71a6d67935d057f44025089d58c1e2dcd1 (diff) | |
| download | common-45887c1671db5eeb2f7d3e6b8c0dc2a53c873d87.zip common-45887c1671db5eeb2f7d3e6b8c0dc2a53c873d87.tar.gz common-45887c1671db5eeb2f7d3e6b8c0dc2a53c873d87.tar.bz2 | |
recovery: fix 5.4 GKI factory reset error [1/5]
PD#SWPL-36719
Problem:
there are factory reset error in 5.4 GKI
Solution:
do not need cache in recovery.fstab when 5.4 GKI
change data to userdata in 5.4 GKI
Verify:
newton
Change-Id: Ib5af6d87ec428a189ca66fac0c2251da64f895a0
Signed-off-by: Xindong Xu <xindong.xu@amlogic.com>
| -rw-r--r--[-rwxr-xr-x] | core_amlogic.mk | 6 | ||||
| -rw-r--r-- | recovery/recovery.fstab | 30 | ||||
| -rw-r--r-- | recovery/recovery_5.4.fstab | 29 |
3 files changed, 65 insertions, 0 deletions
diff --git a/core_amlogic.mk b/core_amlogic.mk index 11f7025..d8b754f 100755..100644 --- a/core_amlogic.mk +++ b/core_amlogic.mk @@ -47,6 +47,12 @@ PRODUCT_PACKAGES += \ LauncherCustomization endif +ifneq ($(TARGET_BUILD_KERNEL_4_9), true) +TARGET_RECOVERY_FSTAB := device/amlogic/common/recovery/recovery_5.4.fstab +else +TARGET_RECOVERY_FSTAB := device/amlogic/common/recovery/recovery.fstab +endif + TARGET_RELEASETOOLS_EXTENSIONS := device/amlogic/common/scripts TARGET_RECOVERY_PIXEL_FORMAT := BGRA_8888 TARGET_RECOVERY_UI_LIB += libamlogic_ui librecovery_amlogic diff --git a/recovery/recovery.fstab b/recovery/recovery.fstab new file mode 100644 index 0000000..8757ad9 --- a/dev/null +++ b/recovery/recovery.fstab @@ -0,0 +1,30 @@ +#device mountpoint fstype options flags? (fstab version 2) +/dev/block/bootloader /bootloader emmc defaults defaults +/dev/block/logo /logo emmc defaults defaults +/dev/block/vbmeta /vbmeta emmc defaults defaults +/dev/block/recovery /recovery emmc defaults defaults +/dev/block/boot /boot emmc defaults defaults +/dev/block/misc /misc emmc defaults defaults +/dev/block/system /system ext4 defaults defaults +/dev/block/vendor /vendor ext4 defaults defaults +/dev/block/odm /odm ext4 defaults defaults +/dev/block/param /param ext4 defaults defaults +/dev/block/product /product ext4 defaults defaults +/dev/block/metadata /metadata ext4 defaults defaults +/dev/block/tee /tee ext4 defaults defaults +/dev/block/cache /cache ext4 defaults defaults +/dev/block/data /data ext4 defaults encryptable=footer +/dev/block/mmcblk1p1 /sdcard vfat defaults defaults +/dev/block/mmcblk1p2 /sdcard vfat defaults defaults +/dev/block/mmcblk1p3 /sdcard vfat defaults defaults +/dev/block/mmcblk1p4 /sdcard vfat defaults defaults +/dev/block/mmcblk1p5 /sdcard vfat defaults defaults +/dev/block/mmcblk1p6 /sdcard vfat defaults defaults +/dev/block/mmcblk2p1 /sdcard vfat defaults defaults +/dev/block/mmcblk2p2 /sdcard vfat defaults defaults +/dev/block/mmcblk2p3 /sdcard vfat defaults defaults +/dev/block/mmcblk2p4 /sdcard vfat defaults defaults +/dev/block/mmcblk2p5 /sdcard vfat defaults defaults +/dev/block/mmcblk2p6 /sdcard vfat defaults defaults +/dev/block/mmcblk /sdcard vfat defaults defaults +/dev/block/sd## /udisk auto defaults defaults diff --git a/recovery/recovery_5.4.fstab b/recovery/recovery_5.4.fstab new file mode 100644 index 0000000..5fb9aea --- a/dev/null +++ b/recovery/recovery_5.4.fstab @@ -0,0 +1,29 @@ +#device mountpoint fstype options flags? (fstab version 2) +/dev/block/bootloader /bootloader emmc defaults defaults +/dev/block/logo /logo emmc defaults defaults +/dev/block/vbmeta /vbmeta emmc defaults defaults +/dev/block/recovery /recovery emmc defaults defaults +/dev/block/boot /boot emmc defaults defaults +/dev/block/misc /misc emmc defaults defaults +/dev/block/system / ext4 defaults defaults +/dev/block/vendor /vendor ext4 defaults defaults +/dev/block/odm /odm ext4 defaults defaults +/dev/block/param /param ext4 defaults defaults +/dev/block/product /product ext4 defaults defaults +/dev/block/metadata /metadata ext4 defaults defaults +/dev/block/tee /tee ext4 defaults defaults +/dev/block/userdata /data ext4 defaults encryptable=footer +/dev/block/mmcblk1p1 /sdcard vfat defaults defaults +/dev/block/mmcblk1p2 /sdcard vfat defaults defaults +/dev/block/mmcblk1p3 /sdcard vfat defaults defaults +/dev/block/mmcblk1p4 /sdcard vfat defaults defaults +/dev/block/mmcblk1p5 /sdcard vfat defaults defaults +/dev/block/mmcblk1p6 /sdcard vfat defaults defaults +/dev/block/mmcblk2p1 /sdcard vfat defaults defaults +/dev/block/mmcblk2p2 /sdcard vfat defaults defaults +/dev/block/mmcblk2p3 /sdcard vfat defaults defaults +/dev/block/mmcblk2p4 /sdcard vfat defaults defaults +/dev/block/mmcblk2p5 /sdcard vfat defaults defaults +/dev/block/mmcblk2p6 /sdcard vfat defaults defaults +/dev/block/mmcblk /sdcard vfat defaults defaults +/dev/block/sd## /udisk auto defaults defaults |