add sdcard and usb mass storage support
Change-Id: I96f5d4f4ba665f43dc8f52ec984acc63e004eb94
Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
diff --git a/fstab.hikey b/fstab.hikey
index 07d8462..5ec4c35 100644
--- a/fstab.hikey
+++ b/fstab.hikey
@@ -6,5 +6,5 @@
/dev/block/platform/f723d000.dwmmc0/by-name/system /system ext4 ro wait
/dev/block/platform/f723d000.dwmmc0/by-name/cache /cache ext4 discard,noauto_da_alloc,data=ordered,user_xattr,discard,barrier=1 wait
/dev/block/platform/f723d000.dwmmc0/by-name/userdata /data ext4 discard,noauto_da_alloc,data=ordered,user_xattr,discard,barrier=1 wait
-/devices/f723e000.dwmmc1/mmc_host auto auto defaults voldmanaged=sdcard1:auto,encryptable=userdata
-/devices/f72c0000.usb/usb1 auto auto defaults voldmanaged=usbdisk:auto,encryptable=userdata
+/devices/f723e000.dwmmc1/mmc_host/mmc* auto auto defaults voldmanaged=sdcard1:auto,encryptable=userdata
+/devices/f72c0000.usb/usb* auto auto defaults voldmanaged=usbdisk:auto,encryptable=userdata
diff --git a/overlay/frameworks/base/core/res/res/xml/storage_list.xml b/overlay/frameworks/base/core/res/res/xml/storage_list.xml
deleted file mode 100644
index 45ac503..0000000
--- a/overlay/frameworks/base/core/res/res/xml/storage_list.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2011, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License")
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- The <device> element should contain one or more <storage> elements.
- Exactly one of these should have the attribute primary="true".
- This storage will be the primary external storage and should have path="/mnt/sdcard".
- Each storage should have both a path and description attribute set.
- The following boolean attributes are optional:
-
- primary: this storage is the primary external storage
- removable: this is removable storage (for example, a real SD card)
- emulated: the storage is emulated via the FUSE sdcard daemon
- mtp-reserve: number of megabytes of storage MTP should reserve for free storage
- (used for emulated storage that is shared with system's data partition)
-
- A storage should not have both emulated and removable set to true
--->
-
-<StorageList xmlns:android="http://schemas.android.com/apk/res/android">
-<storage
- android:storageDescription="@string/storage_internal"
- android:emulated="true"
- android:mtpReserve="100" />
-<storage
- android:mountPoint="/storage/sdcard1"
- android:storageDescription="@string/storage_sd_card"
- android:removable="true"
- android:maxFileSize="4096" />
-
-<storage android:mountPoint="/storage/usbdisk"
- android:storageDescription="@string/storage_usb"
- android:primary="false"
- android:removable="true" />
-
-</StorageList>
