aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHashcode <hashcode0f@gmail.com>2014-12-23 12:08:23 -0800
committerHashcode <hashcode0f@gmail.com>2014-12-23 12:10:25 -0800
commitb17c6a248b7c8072323416d1ef2f8cb8d808c5db (patch)
tree0d094f04dac9a785db0e07c4137cdbaef48e23e9
parent10ce283a1e5aef784f385a8a62c9343d2a1ec6e4 (diff)
otterx: update TWRP setup
Change-Id: I0810204afdb4e6517525c953164cfa8597c7269e
-rw-r--r--BoardConfig.mk4
-rw-r--r--device.mk10
-rw-r--r--recovery/root/etc/twrp.fstab8
-rw-r--r--twrp.fstab9
4 files changed, 14 insertions, 17 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 3067924..8d35107 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -31,11 +31,7 @@ TARGET_KERNEL_SOURCE := kernel/amazon/otter-common
TARGET_KERNEL_CONFIG := otterx_android_defconfig
# Filesystem
-ifeq ($(RECOVERY_VARIANT),twrp)
-TARGET_RECOVERY_FSTAB = $(DEVICE_FOLDER)/twrp.fstab
-else
TARGET_RECOVERY_FSTAB = $(DEVICE_FOLDER)/fstab.otterx
-endif
RECOVERY_FSTAB_VERSION = 2
BOARD_BOOTIMAGE_PARTITION_SIZE := 10485760
BOARD_RECOVERYIMAGE_PARTITION_SIZE := 16777216
diff --git a/device.mk b/device.mk
index d41bfff..01b1a5d 100644
--- a/device.mk
+++ b/device.mk
@@ -43,16 +43,18 @@ PRODUCT_COPY_FILES += \
PRODUCT_COPY_FILES += \
$(DEVICE_FOLDER)/prebuilt/etc/firmware/ducati-m3.512MB.bin:/system/etc/firmware/ducati-m3.512MB.bin
-# Recovery
-PRODUCT_COPY_FILES += \
- $(DEVICE_FOLDER)/twrp.fstab:recovery/root/etc/twrp.fstab
-
# Misc
PRODUCT_PACKAGES += \
sdcard \
charger_res_images \
setup_fs
+# Recovery USB
+PRODUCT_PROPERTY_OVERRIDES += \
+ usb.vendor=1949 \
+ usb.product.adb=0006 \
+ usb.product.mtpadb=0006
+
# F2FS
PRODUCT_PACKAGES += \
mkfs.f2fs \
diff --git a/recovery/root/etc/twrp.fstab b/recovery/root/etc/twrp.fstab
new file mode 100644
index 0000000..424f91f
--- /dev/null
+++ b/recovery/root/etc/twrp.fstab
@@ -0,0 +1,8 @@
+# mount point fstype device flags
+/data f2fs /dev/block/mmcblk0p12 flags=length=-16384;fsflags="inline_xattr"
+/cache ext4 /dev/block/mmcblk0p11
+/system ext4 /dev/block/mmcblk0p9
+/boot emmc /dev/block/mmcblk0p7
+/recovery emmc /dev/block/mmcblk0p5
+/bootloader emmc /dev/block/mmcblk0p2
+
diff --git a/twrp.fstab b/twrp.fstab
deleted file mode 100644
index a8272cb..0000000
--- a/twrp.fstab
+++ /dev/null
@@ -1,9 +0,0 @@
-# mount point fstype device flags
-
-/data f2fs /dev/block/mmcblk0p12 flags=fsflags="inline_xattr"
-/cache ext4 /dev/block/mmcblk0p11
-/system ext4 /dev/block/mmcblk0p9
-/boot emmc /dev/block/mmcblk0p7
-/recovery emmc /dev/block/mmcblk0p5
-/bootloader emmc /dev/block/mmcblk0p2
-