summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2016-01-20 17:21:27 -0800
committerDmitry Shmidt <dimitrysh@google.com>2016-04-07 12:45:38 -0700
commit4c55fd4205ad8efca2c6e022b3e55e47e1519d6f (patch)
treebc9b84b2321e9fb7ac64192bb9e4d2dd66b11b8b
parentee226ef7bfdd710ef454252899cfe232544b8750 (diff)
downloadhikey-4c55fd4205ad8efca2c6e022b3e55e47e1519d6f.tar.gz
hikey: Change fstab.hikey to handle path changes in 4.4 kernels
With 4.4 kernels the path for block devices changes slightly. So this patch address this so that the initrd can find the various filesystems. This also copies the existing fstab for 4.1 kernels so that folks can still create 4.1 based boot images. Change-Id: I8f2f079d804cd9acf6a2588c3cd628137a2822d3 Signed-off-by: John Stultz <john.stultz@linaro.org> Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
-rw-r--r--fstab.hikey12
-rw-r--r--fstab.hikey-4.111
2 files changed, 17 insertions, 6 deletions
diff --git a/fstab.hikey b/fstab.hikey
index ceab636d..a2458eb6 100644
--- a/fstab.hikey
+++ b/fstab.hikey
@@ -3,9 +3,9 @@
# 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/platform/f723d000.dwmmc0/by-name/system /system ext4 ro wait
-/dev/block/platform/f723d000.dwmmc0/by-name/system /system squashfs 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/platform/f723e000.dwmmc1/mmc_host/mmc* auto auto defaults voldmanaged=sdcard1:auto,encryptable=userdata
-/devices/platform/f72c0000.usb/usb* auto auto defaults voldmanaged=usbdisk:auto,encryptable=userdata
+/dev/block/platform/soc/f723d000.dwmmc0/by-name/system /system ext4 ro wait
+/dev/block/platform/soc/f723d000.dwmmc0/by-name/system /system squashfs ro wait
+/dev/block/platform/soc/f723d000.dwmmc0/by-name/cache /cache ext4 discard,noauto_da_alloc,data=ordered,user_xattr,discard,barrier=1 wait
+/dev/block/platform/soc/f723d000.dwmmc0/by-name/userdata /data ext4 discard,noauto_da_alloc,data=ordered,user_xattr,discard,barrier=1 wait
+/devices/platform/soc/f723e000.dwmmc1/mmc_host/mmc* auto auto defaults voldmanaged=sdcard1:auto,encryptable=userdata
+/devices/platform/soc/f72c0000.usb/usb* auto auto defaults voldmanaged=usbdisk:auto,encryptable=userdata
diff --git a/fstab.hikey-4.1 b/fstab.hikey-4.1
new file mode 100644
index 00000000..ceab636d
--- /dev/null
+++ b/fstab.hikey-4.1
@@ -0,0 +1,11 @@
+# Android fstab file.
+#<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags>
+# 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/platform/f723d000.dwmmc0/by-name/system /system ext4 ro wait
+/dev/block/platform/f723d000.dwmmc0/by-name/system /system squashfs 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/platform/f723e000.dwmmc1/mmc_host/mmc* auto auto defaults voldmanaged=sdcard1:auto,encryptable=userdata
+/devices/platform/f72c0000.usb/usb* auto auto defaults voldmanaged=usbdisk:auto,encryptable=userdata