From 871c96922033a43acabf472b5d65bfb6cd901b6f Mon Sep 17 00:00:00 2001 From: Thierry Strudel Date: Tue, 9 May 2017 12:17:32 -0700 Subject: [PATCH] move fstab and BOARD_AVB_ENABLE to wahoo Change-Id: Ide7f7d4dcd6d4d67f209943e2ce2048015e1a010 Signed-off-by: Thierry Strudel --- BoardConfig.mk | 1 - device.mk | 4 ---- fstab.hardware | 9 --------- 3 files changed, 14 deletions(-) delete mode 100644 fstab.hardware diff --git a/BoardConfig.mk b/BoardConfig.mk index 13342ef..f8b1b71 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -20,7 +20,6 @@ DEFAULT_LOW_PERSISTENCE_MODE_BRIGHTNESS := 0x00000056 BOARD_KERNEL_CMDLINE += console=ttyMSM0,115200,n8 earlycon=msm_serial_dm,0xc1b0000 BOARD_KERNEL_CMDLINE += androidboot.selinux=permissive -TARGET_RECOVERY_FSTAB := device/google/taimen/fstab.hardware include device/google/wahoo/BoardConfig.mk BOARD_BOOTIMAGE_PARTITION_SIZE := 41943040 diff --git a/device.mk b/device.mk index 310596c..e0b3ac3 100644 --- a/device.mk +++ b/device.mk @@ -49,10 +49,6 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/taimen/nfc/libnfc-nxp.taimen.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nxp.conf -# TODO: move this to wahoo. -PRODUCT_COPY_FILES += \ - device/google/taimen/fstab.hardware:root/fstab.$(PRODUCT_HARDWARE) - PRODUCT_COPY_FILES += \ device/google/taimen/thermal-engine.conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermal-engine.conf \ device/google/taimen/thermal-engine.conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermal-engine-vr.conf diff --git a/fstab.hardware b/fstab.hardware deleted file mode 100644 index 64a1620..0000000 --- a/fstab.hardware +++ /dev/null @@ -1,9 +0,0 @@ -# Android fstab file. - -# -/dev/block/platform/soc/1da4000.ufshc/by-name/system / ext4 ro,barrier=1 wait,slotselect,avb -/dev/block/platform/soc/1da4000.ufshc/by-name/metadata /metadata ext4 noatime,nosuid,nodev,barrier=1 wait,check,formattable -/dev/block/platform/soc/1da4000.ufshc/by-name/userdata /data ext4 noatime,nosuid,nodev,barrier=1,noauto_da_alloc latemount,wait,check,formattable,fileencryption=ice:aes-256-heh,keydirectory=/metadata -/dev/block/platform/soc/1da4000.ufshc/by-name/misc /misc emmc defaults defaults -/dev/block/platform/soc/1da4000.ufshc/by-name/modem /firmware vfat ro,shortname=lower,uid=1000,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0 wait,slotselect -/devices/soc/a800000.ssusb/a800000.dwc3* auto vfat defaults voldmanaged=usb:auto