From 7c4c9819d5731ac608fe7d70d23e7d0e998121bf Mon Sep 17 00:00:00 2001
From: "Howard M. Harte" <hharte@cyngn.com>
Date: Tue, 21 Jul 2015 12:07:17 -0700
Subject: [PATCH] crackling: Move fstab.qcom into device tree

Issue-Id: CRACKLING-437

Change-Id: I6f095f195fb701d3cf782d799c8c88ea576fafe9
---
 BoardConfig.mk         |  1 +
 device.mk              |  1 +
 rootdir/Android.mk     | 10 +++++++++-
 rootdir/etc/fstab.qcom | 15 +++++++++++++++
 4 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 rootdir/etc/fstab.qcom

diff --git a/BoardConfig.mk b/BoardConfig.mk
index ae54c88..d0634a2 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -64,6 +64,7 @@ BOARD_USERDATAIMAGE_PARTITION_SIZE := 13295385600
 
 # Recovery
 TARGET_OTA_ASSERT_DEVICE := crackling,vixen
+TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/rootdir/etc/fstab.qcom
 
 # Wifi - EAP-SIM
 CONFIG_EAP_PROXY := qmi
diff --git a/device.mk b/device.mk
index 4112a36..95c2d17 100644
--- a/device.mk
+++ b/device.mk
@@ -92,6 +92,7 @@ PRODUCT_PACKAGES += \
 
 # Ramdisk
 PRODUCT_PACKAGES += \
+    fstab.qcom \
     init.target.rc
 
 # Recovery
diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index 018462a..bd64b4c 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -1,6 +1,14 @@
 LOCAL_PATH:= $(call my-dir)
 
-# Configuration scripts
+# Init scripts
+
+include $(CLEAR_VARS)
+LOCAL_MODULE       := fstab.qcom
+LOCAL_MODULE_TAGS  := optional eng
+LOCAL_MODULE_CLASS := ETC
+LOCAL_SRC_FILES    := etc/fstab.qcom
+LOCAL_MODULE_PATH  := $(TARGET_ROOT_OUT)
+include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE       := init.target.rc
diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.qcom
new file mode 100644
index 0000000..72f94cf
--- /dev/null
+++ b/rootdir/etc/fstab.qcom
@@ -0,0 +1,15 @@
+# Android fstab file.
+# The filesystem that contains the filesystem checker binary (typically /system) cannot
+# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
+
+/dev/block/bootdevice/by-name/system         /system      ext4    ro,barrier=1                                                wait
+/dev/block/bootdevice/by-name/userdata       /data        ext4    noatime,nosuid,nodev,barrier=1,noauto_da_alloc              wait,check,encryptable=footer,length=-16384
+/dev/block/bootdevice/by-name/cache          /cache       ext4    noatime,nosuid,nodev,barrier=1,noauto_da_alloc              wait,check
+/dev/block/bootdevice/by-name/persist        /persist     ext4    noatime,nosuid,nodev,barrier=1,noauto_da_alloc              wait
+/dev/block/bootdevice/by-name/boot           /boot        emmc    defaults                                                    defaults
+/dev/block/bootdevice/by-name/recovery       /recovery    emmc    defaults                                                    defaults
+/dev/block/bootdevice/by-name/misc           /misc        emmc    defaults                                                    defaults
+/dev/block/bootdevice/by-name/modem          /firmware    vfat    ro,shortname=lower,uid=1000,gid=1026,dmask=227,fmask=337,context=u:object_r:firmware_file:s0    wait
+
+/devices/soc.0/7864900.sdhci/mmc_host        auto         auto    defaults                                                    voldmanaged=sdcard1:auto,noemulatedsd
+/devices/platform/msm_hsusb                  auto         auto    defaults                                                    voldmanaged=usbdisk:auto