wayne: Move ramdisk configs to rootdir dir

 * Clean up unused configs

Change-Id: I0aae320468796a67fc2110aef0b31c06da2314e3
Signed-off-by: Isaac Chen <isaacchen@isaacchen.cn>

14 files changed, 60 insertions, 463 deletions

diff --git a/AndroidBoard.mk b/AndroidBoard.mk
index 263548d..cc60e9f 100755
--- a/AndroidBoard.mk
+++ b/AndroidBoard.mk
@@ -35,32 +35,6 @@ include $(TARGET_KERNEL_SOURCE)/AndroidKernel.mk
 $(INSTALLED_KERNEL_TARGET): $(TARGET_PREBUILT_KERNEL) | $(ACP)
 	$(transform-prebuilt-to-target)
 
-#----------------------------------------------------------------------
-# Copy additional target-specific files
-#----------------------------------------------------------------------
-include $(CLEAR_VARS)
-LOCAL_MODULE       := vold.fstab
-LOCAL_MODULE_TAGS  := optional eng
-LOCAL_MODULE_CLASS := ETC
-LOCAL_SRC_FILES    := $(LOCAL_MODULE)
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE       := init.target.rc
-LOCAL_MODULE_TAGS  := optional eng
-LOCAL_MODULE_CLASS := ETC
-LOCAL_SRC_FILES    := $(LOCAL_MODULE)
-LOCAL_MODULE_PATH  := $(TARGET_OUT_VENDOR_ETC)/init/hw
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE       := fstab.qcom
-LOCAL_MODULE_TAGS  := optional eng
-LOCAL_MODULE_CLASS := ETC
-LOCAL_SRC_FILES    := fstab_non_AB_variant.qcom
-LOCAL_MODULE_PATH  := $(TARGET_OUT_VENDOR_ETC)
-include $(BUILD_PREBUILT)
-
 #Create dsp directory
 $(shell mkdir -p $(TARGET_OUT_VENDOR)/lib/dsp)
 
diff --git a/BoardConfig.mk b/BoardConfig.mk
index fbcdfbf..e346e5b 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -43,11 +43,7 @@ BOARD_CACHEIMAGE_PARTITION_SIZE := 268435456
 BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
 #TARGET_RECOVERY_UPDATER_LIBS += librecovery_updater_msm
 
-ifeq ($(ENABLE_VENDOR_IMAGE), true)
-    TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/recovery_non-AB_split_variant.fstab
-else
-    TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/sdm660_64/recovery_non-AB_non-split_variant.fstab
-endif
+TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/rootdir/etc/recovery.fstab
 
 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 3221225472
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 48318382080
diff --git a/device.mk b/device.mk
index 452e9ed..b0f9cba 100644
--- a/device.mk
+++ b/device.mk
@@ -182,6 +182,11 @@ PRODUCT_PACKAGES += android.hardware.camera.provider@2.4-service
 PRODUCT_PACKAGES += \
 	android.hardware.usb@1.0-service
 
+# Ramdisk
+PRODUCT_PACKAGES += \
+    init.target.rc \
+    fstab.qcom
+
 # Sensor features
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.sensor.accelerometer.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.accelerometer.xml \
@@ -204,7 +209,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
 
 # FBE support
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/init.qti.qseecomd.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.qti.qseecomd.sh
+    $(LOCAL_PATH)/rootdir/bin/init.qti.qseecomd.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.qti.qseecomd.sh
 
 # MIDI feature
 PRODUCT_COPY_FILES += frameworks/native/data/etc/android.software.midi.xml:system/etc/permissions/android.software.midi.xml
diff --git a/init.qcom.modem_links.sh b/init.qcom.modem_links.sh
deleted file mode 100755
index 8aba652..0000000
--- a/init.qcom.modem_links.sh
+++ /dev/null
@@ -1,132 +0,0 @@
-#!/system/bin/sh
-# Copyright (c) 2013, The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-#       copyright notice, this list of conditions and the following
-#       disclaimer in the documentation and/or other materials provided
-#       with the distribution.
-#     * Neither the name of The Linux Foundation nor the names of its
-#       contributors may be used to endorse or promote products derived
-#       from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-#
-
-# No path is set up at this point so we have to do it here.
-PATH=/sbin:/system/sbin:/system/bin:/system/xbin
-export PATH
-
-# Check for images and set up symlinks
-cd /firmware/image
-
-# Get the list of files in /firmware/image
-# for which sym links have to be created
-
-fwfiles=`ls modem* adsp* wcnss* mba*`
-
-# Check if the links with similar names
-# have been created in /system/etc/firmware
-
-cd /system/etc/firmware
-linksNeeded=0
-
-# For everyfile in fwfiles check if
-# the corresponding file exists
-for fwfile in $fwfiles; do
-
-   # if (condition) does not seem to work
-   # with the android shell. Therefore
-   # make do with case statements instead.
-   # if a file named $fwfile is present
-   # no need to create links. If the file
-   # with the name $fwfile is not present
-   # need to create links.
-
-   case `ls $fwfile` in
-      $fwfile)
-         continue;;
-      *)
-         # file with $fwfile does not exist
-         # need to create links
-         linksNeeded=1
-         break;;
-   esac
-
-done
-
-# symlinks created for qca6714 firmware
-ln -s /firmware/image/athwlan.bin /system/etc/firmware/athwlan.bin
-ln -s /firmware/image/fakeboar.bin /system/etc/firmware/fakeBoardData_AR6004.bin
-ln -s /firmware/image/otp.bin /system/etc/firmware/otp.bin
-ln -s /firmware/image/utf.bin /system/etc/firmware/utf.bin
-
-case $linksNeeded in
-   1)
-      cd /firmware/image
-
-      case `ls modem.mdt 2>/dev/null` in
-         modem.mdt)
-            for imgfile in modem*; do
-               ln -s /firmware/image/$imgfile /system/etc/firmware/$imgfile 2>/dev/null
-            done
-            ;;
-        *)
-            # trying to log here but nothing will be logged since it is
-            # early in the boot process. Is there a way to log this message?
-            log -p w -t PIL no modem image found;;
-      esac
-
-      case `ls adsp.mdt 2>/dev/null` in
-         adsp.mdt)
-            for imgfile in adsp*; do
-               ln -s /firmware/image/$imgfile /system/etc/firmware/$imgfile 2>/dev/null
-            done
-            ;;
-         *)
-            log -p w -t PIL no adsp image found;;
-      esac
-
-      case `ls wcnss.mdt 2>/dev/null` in
-         wcnss.mdt)
-            for imgfile in wcnss*; do
-               ln -s /firmware/image/$imgfile /system/etc/firmware/$imgfile 2>/dev/null
-            done
-            ;;
-         *)
-            log -p w -t PIL no wcnss image found;;
-      esac
-
-      case `ls mba.mdt 2>/dev/null` in
-         mba.mdt)
-            for imgfile in mba*; do
-               ln -s /firmware/image/$imgfile /system/etc/firmware/$imgfile 2>/dev/null
-            done
-            ;;
-         *)
-            log -p w -t PIL no mba image found;;
-      esac
-
-      ;;
-
-   *)
-      # Nothing to do. No links needed
-      ;;
-esac
-
-cd /
diff --git a/recovery_non-AB_non-split_variant.fstab b/recovery_non-AB_non-split_variant.fstab
deleted file mode 100755
index ece3846..0000000
--- a/recovery_non-AB_non-split_variant.fstab
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright (c) 2017, The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-#       copyright notice, this list of conditions and the following
-#       disclaimer in the documentation and/or other materials provided
-#       with the distribution.
-#     * Neither the name of The Linux Foundation nor the names of its
-#       contributors may be used to endorse or promote products derived
-#       from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Non A/B, non-split(no vendor.img) recovery.fstab variant.
-
-#device         mount point      fstype        [device2] [length=]
-
-/dev/block/bootdevice/by-name/system       /system         ext4    ro,barrier=1                                                    wait,verify
-/dev/block/bootdevice/by-name/cache        /cache          ext4    noatime,nosuid,nodev,barrier=1,data=ordered                     wait,check
-/dev/block/bootdevice/by-name/userdata     /data           ext4    noatime,nosuid,nodev,barrier=1,data=ordered,noauto_da_alloc     wait,check,encryptable=footer
-/dev/block/mmcblk1p1                       /sdcard         vfat    nosuid,nodev                                                    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
diff --git a/recovery_non-AB_split_variant.fstab b/recovery_non-AB_split_variant.fstab
deleted file mode 100755
index 39faee8..0000000
--- a/recovery_non-AB_split_variant.fstab
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright (c) 2017, The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-#       copyright notice, this list of conditions and the following
-#       disclaimer in the documentation and/or other materials provided
-#       with the distribution.
-#     * Neither the name of The Linux Foundation nor the names of its
-#       contributors may be used to endorse or promote products derived
-#       from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Non A/B, split(with vendor.img) recovery.fstab variant.
-
-#device         mount point      fstype        [device2] [length=]
-
-/dev/block/bootdevice/by-name/system       /system         ext4    ro,barrier=1                                                    wait,verify
-/dev/block/bootdevice/by-name/vendor       /vendor         ext4    ro,barrier=1                                                    wait,verify
-/dev/block/bootdevice/by-name/cache        /cache          ext4    noatime,nosuid,nodev,barrier=1,data=ordered                     wait,check
-/dev/block/bootdevice/by-name/userdata     /data           ext4    noatime,nosuid,nodev,barrier=1,data=ordered,noauto_da_alloc     wait,check,encryptable=footer
-/dev/block/mmcblk1p1                       /sdcard         vfat    nosuid,nodev                                                    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
diff --git a/rootdir/Android.mk b/rootdir/Android.mk
new file mode 100755
index 0000000..8b2d12a
--- /dev/null
+++ b/rootdir/Android.mk
@@ -0,0 +1,20 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+# files that live under device/qcom/common/rootdir/etc/
+
+include $(CLEAR_VARS)
+LOCAL_MODULE		:= init.target.rc
+LOCAL_MODULE_TAGS	:= optional eng
+LOCAL_MODULE_CLASS	:= ETC
+LOCAL_SRC_FILES		:= etc/init.target.rc
+LOCAL_MODULE_PATH	:= $(TARGET_OUT_VENDOR_ETC)/init/hw
+include $(BUILD_PREBUILT)
+
+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_OUT_VENDOR_ETC)
+include $(BUILD_PREBUILT)
diff --git a/init.qti.qseecomd.sh b/rootdir/bin/init.qti.qseecomd.sh
index f1c725c..f1c725c 100755
--- a/init.qti.qseecomd.sh
+++ b/rootdir/bin/init.qti.qseecomd.sh
diff --git a/fstab_non_AB_variant.qcom b/rootdir/etc/fstab.qcom
index 8228a1f..0892afe 100755
--- a/fstab_non_AB_variant.qcom
+++ b/rootdir/etc/fstab.qcom
@@ -7,11 +7,12 @@
 
 # Non-A/B fstab.qcom variant
 #<src>                                   <mnt_point>        <type> <mnt_flags and options>                          <fs_mgr_flags>
-/dev/block/bootdevice/by-name/userdata   /data              ext4   nosuid,nodev,barrier=1,noauto_da_alloc,discard,noatime,lazytime   wait,check,forceencrypt=footer,crashcheck,quota
-/devices/soc/c084000.sdhci/mmc_host*     /storage/sdcard1   vfat   nosuid,nodev                                     wait,voldmanaged=sdcard1:auto,encryptable=footer
+/dev/block/bootdevice/by-name/userdata   /data              ext4   nosuid,nodev,barrier=1,noauto_da_alloc,discard,noatime,lazytime,errors=panic   wait,resize,check,forceencrypt=footer,crashcheck,quota
+/dev/block/bootdevice/by-name/cust       /cust              ext4   ro,nosuid,nodev,barrier=1                        wait,check
 /dev/block/bootdevice/by-name/misc       /misc              emmc   defaults                                         defaults
 /dev/block/bootdevice/by-name/modem      /firmware          vfat   ro,shortname=lower,uid=1000,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0 wait
 /dev/block/bootdevice/by-name/bluetooth  /bt_firmware       vfat   ro,shortname=lower,uid=1002,gid=3002,dmask=227,fmask=337,context=u:object_r:bt_firmware_file:s0 wait
-/devices/soc/a800000.ssusb/a800000.dwc3/xhci-hcd.0.auto*     /storage/usbotg    vfat    nosuid,nodev         wait,voldmanaged=usbotg:auto
+/devices/soc/a800000.ssusb/a800000.dwc3/xhci-hcd.0.auto*     /storage/usbotg    vfat    nosuid,nodev                wait,voldmanaged=usbotg:auto
 /dev/block/bootdevice/by-name/dsp        /dsp               ext4   ro,nosuid,nodev,barrier=1                        wait
-/dev/block/bootdevice/by-name/cache      /cache             ext4   nosuid,nodev,noatime,barrier=1                           wait
+/dev/block/bootdevice/by-name/cache      /cache             ext4   nosuid,nodev,noatime,barrier=1                   wait
+/dev/block/bootdevice/by-name/persist    /persist           ext4   nosuid,nodev,barrier=1,noatime                   wait,check
diff --git a/init.target.rc b/rootdir/etc/init.target.rc
index 2213bce..2213bce 100644
--- a/init.target.rc
+++ b/rootdir/etc/init.target.rc
diff --git a/rootdir/etc/recovery.fstab b/rootdir/etc/recovery.fstab
new file mode 100644
index 0000000..e9a36ce
--- /dev/null
+++ b/rootdir/etc/recovery.fstab
@@ -0,0 +1,28 @@
+# 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
+
+# mount point   fstype  device									device2				flags
+/boot		emmc	/dev/block/bootdevice/by-name/boot
+/cache		ext4	/dev/block/bootdevice/by-name/cache
+/data		ext4	/dev/block/bootdevice/by-name/userdata									flags=encryptable=footer
+/misc		emmc	/dev/block/bootdevice/by-name/misc
+/recovery	emmc	/dev/block/bootdevice/by-name/recovery									flags=backup=1
+/system		ext4	/dev/block/bootdevice/by-name/system
+/system_image	emmc	/dev/block/bootdevice/by-name/system
+/vendor		ext4	/dev/block/bootdevice/by-name/vendor									flags=display="vendor";backup=1;wipeingui
+/firmware	vfat	/dev/block/bootdevice/by-name/modem									flags=display="Firmware";mounttodecrypt;fsflags=ro
+/cust		ext4	/dev/block/bootdevice/by-name/cust
+/modem		emmc	/dev/block/bootdevice/by-name/modem									flags=backup=1;display="Modem"
+/bluetooth	emmc	/dev/block/bootdevice/by-name/bluetooth									flags=backup=1;subpartitionof=/modem
+/dsp		emmc	/dev/block/bootdevice/by-name/dsp									flags=backup=1;subpartitionof=/modem
+/efs1		emmc	/dev/block/bootdevice/by-name/modemst1									flags=backup=1;display=EFS
+/efs2		emmc	/dev/block/bootdevice/by-name/modemst2									flags=backup=1;subpartitionof=/efs1
+/efsg           emmc	/dev/block/bootdevice/by-name/fsg                        						flags=backup=1;subpartitionof=/efs1
+/efsc           emmc	/dev/block/bootdevice/by-name/fsc                       					   	flags=backup=1;subpartitionof=/efs1
+
+# Removable storage
+/usb_otg	vfat	/dev/block/sda1								/dev/block/sda			flags=fsflags=utf8;display="USB-OTG";storage;wipeingui;removable
+/external_sd 	vfat    /dev/block/mmcblk1p1 							/dev/block/mmcblk1 		flags=fsflags=utf8;display="SDcard";storage;wipeingui;removable
+
+
diff --git a/usf_post_boot.sh b/usf_post_boot.sh
deleted file mode 100755
index 9a9d8af..0000000
--- a/usf_post_boot.sh
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/system/bin/sh
-# Copyright (c) 2011-2013, The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-#       copyright notice, this list of conditions and the following
-#       disclaimer in the documentation and/or other materials provided
-#       with the distribution.
-#     * Neither the name of The Linux Foundation nor the names of its
-#       contributors may be used to endorse or promote products derived
-#       from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-#
-
-dir0=/data/usf
-pcm_ind_file=$dir0/pcm_inds.txt
-pcm_file=/proc/asound/pcm
-
-tx_rx_patterns=(tx2- rx2-)
-dev_ids=("0" "0")
-cards=("0" "0")
-found_num=0
-
-# Run usf_settings script
-if [ -f /system/etc/usf_settings.sh ]; then
-  /system/bin/sh /system/etc/usf_settings.sh
-fi
-
-while read pcm_entry; do
-    for i in 0 1; do
-        echo $pcm_entry
-        id="${pcm_entry##*"${tx_rx_patterns[$i]}"}"
-        case "$pcm_entry" in
-            "$id")
-            ;;
-
-            *)
-            cards[$i]=${pcm_entry:0:2}
-            dev_ids[$i]=${pcm_entry:3:2}
-            found_num=$(( $found_num + 1))
-            i=2
-            ;;
-        esac
-
-        case $i in
-            2)
-            break
-            ;;
-        esac
-    done
-
-    case $found_num in
-        2)
-        break
-        ;;
-    esac
-
-done < $pcm_file
-
-echo ${dev_ids[0]}" "${dev_ids[1]}" "${cards[0]}" "${cards[1]}>$pcm_ind_file
-chmod 0644 $pcm_ind_file
-
-# Post-boot start of selected USF based calculators
-for i in $(cat $dir0/auto_start.txt); do
-   start $i
-done
diff --git a/usf_settings.sh b/usf_settings.sh
deleted file mode 100755
index 8a47089..0000000
--- a/usf_settings.sh
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/system/bin/sh
-# Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-#       copyright notice, this list of conditions and the following
-#       disclaimer in the documentation and/or other materials provided
-#       with the distribution.
-#     * Neither the name of The Linux Foundation nor the names of its
-#       contributors may be used to endorse or promote products derived
-#       from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-#
-
-clean_copy_dir=/system/etc/usf
-dir0=/data/usf
-h_dir=$dir0/hovering
-g_dir=$dir0/gesture
-sg_dir=$dir0/sync_gesture
-t_dir=$dir0/tester
-e_dir=$dir0/epos
-p2p_dir=$dir0/p2p
-prox_dir=$dir0/proximity
-pairing_dir=$dir0/pairing
-sw_calib_dir=$dir0/sw_calib
-ucm_dir=$dir0/ucm
-mixer_dir=/persist/usf/mixer
-epos_dir=/persist/usf/epos
-
-trigger_file=$dir0/form_factor.cfg
-
-if [ ! -e $trigger_file ]; then
-   # Configurations select upon the current platform
-   platform=`cat /sys/devices/soc0/hw_platform`
-   type=""
-
-   case $platform in
-       "Liquid")
-           type="liquid"
-       ;;
-       "Fluid")
-           type="fluid"
-       ;;
-       "MTP")
-           type="mtp"
-       ;;
-       "Dragon")
-           type="dragon"
-       ;;
-   esac
-
-   cp -r $clean_copy_dir $dir0
-
-   ln -s $dir0/form_factor_"$type".cfg $dir0/form_factor.cfg
-   ln -s $t_dir/cfg_"$type" $t_dir/cfg
-   ln -s $e_dir/cfg_"$type" $e_dir/cfg
-   ln -s $h_dir/cfg_"$type" $h_dir/cfg
-   ln -s $p2p_dir/cfg_"$type" $p2p_dir/cfg
-   ln -s $g_dir/cfg_"$type" $g_dir/cfg
-   ln -s $sg_dir/cfg_"$type" $sg_dir/cfg
-   ln -s $prox_dir/cfg_"$type" $prox_dir/cfg
-   ln -s $pairing_dir/cfg_"$type" $pairing_dir/cfg
-   ln -s $sw_calib_dir/cfg_"$type" $sw_calib_dir/cfg
-
-   ln -s $e_dir/cfg/usf_epos_"$type".cfg $e_dir/usf_epos.cfg
-   ln -s $t_dir/cfg/usf_tester_epos_"$type".cfg $t_dir/usf_tester.cfg
-   ln -s $h_dir/cfg/usf_hovering_"$type".cfg $h_dir/usf_hovering.cfg
-   ln -s $p2p_dir/cfg/usf_p2p_"$type".cfg $p2p_dir/usf_p2p.cfg
-   ln -s $g_dir/cfg/usf_gesture_"$type".cfg $g_dir/usf_gesture.cfg
-   ln -s $sg_dir/cfg/usf_sync_gesture_"$type".cfg $sg_dir/usf_sync_gesture.cfg
-   ln -s $prox_dir/cfg/usf_proximity_"$type".cfg $prox_dir/usf_proximity.cfg
-   ln -s $pairing_dir/cfg/usf_pairing_"$type".cfg $pairing_dir/usf_pairing.cfg
-   ln -s $sw_calib_dir/cfg/usf_sw_calib_"$type".cfg $sw_calib_dir/usf_sw_calib.cfg
-
-   ln -s $e_dir/cfg/service_settings_"$type".xml $e_dir/service_settings.xml
-
-   ln -s $mixer_dir/mixer_paths_"$type".xml $mixer_dir/mixer_paths.xml
-
-   ln -s $epos_dir/product_calib_"$type".dat $epos_dir/product_calib.dat
-   ln -s $epos_dir/unit_calib_"$type".dat $epos_dir/unit_calib.dat
-
-   # The USF based calculators have system permissions
-   chown system $dir0
-   chown system $dir0/*
-   chown system $dir0/*/*
-   chown system $dir0/*/*/*
-fi
-
-chown system /dev/usf1
-
-# Set enabled properties for daemon
-setprop ro.qc.sdk.us.digitalpen 1
diff --git a/vold.fstab b/vold.fstab
deleted file mode 100755
index 635e586..0000000
--- a/vold.fstab
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (c) 2013, The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-#       copyright notice, this list of conditions and the following
-#       disclaimer in the documentation and/or other materials provided
-#       with the distribution.
-#     * Neither the name of The Linux Foundation nor the names of its
-#       contributors may be used to endorse or promote products derived
-#       from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-dev_mount sdcard /storage/sdcard1 auto /devices/msm_sdcc.2/mmc_host