summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVinay Verma <vvinay@codeaurora.org>2018-04-30 22:23:13 +0530
committerTingyiChen <tingyi364@gmail.com>2019-08-13 11:52:42 +0200
commit74c16d5cfc1ac79d526d933e4f811d3b76c742cb (patch)
tree3de45c8e9b6b29559fa1bf671596355fbf390518
parenta1ec7da91ca8577b232c85a17c25bdedd263505a (diff)
wayne-common: Mount dsp and firmware in vendor
Change fstab to mount dsp and firmware to /vendor/dsp and /vendor/firmware_mnt. Add classpath for firmware loading /vendor/firmware_mnt/image in kernel command line. Change-Id: I2dd2e7ea6334fb979ad8ff8c755648748de93ab4
-rw-r--r--BoardConfigCommon.mk1
-rw-r--r--rootdir/etc/fstab.qcom4
-rw-r--r--rootdir/etc/fstab_AB.qcom4
3 files changed, 5 insertions, 4 deletions
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 8829ae9..43c0298 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -54,6 +54,7 @@ TARGET_USES_64_BIT_BINDER := true
# Kernel
BOARD_KERNEL_CMDLINE := console=ttyMSM0,115200,n8 androidboot.console=ttyMSM0 earlycon=msm_serial_dm,0xc170000 androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x37 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 sched_enable_hmp=1 sched_enable_power_aware=1 service_locator.enable=1 swiotlb=1 androidboot.configfs=true androidboot.usbcontroller=a800000.dwc3
+BOARD_KERNEL_CMDLINE += firmware_class.path=/vendor/firmware_mnt/image
BOARD_KERNEL_BASE := 0x00000000
BOARD_KERNEL_PAGESIZE := 4096
BOARD_KERNEL_TAGS_OFFSET := 0x00000100
diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.qcom
index 7f36ed2..1ccda28 100644
--- a/rootdir/etc/fstab.qcom
+++ b/rootdir/etc/fstab.qcom
@@ -13,10 +13,10 @@
#<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,errors=panic wait,resize,check,encryptable=footer,crashcheck,quota
/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/modem /vendor/firmware_mnt vfat ro,shortname=lower,uid=0,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0 wait
/dev/block/bootdevice/by-name/bluetooth /vendor/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
-/dev/block/bootdevice/by-name/dsp /dsp ext4 ro,nosuid,nodev,barrier=1 wait
+/dev/block/bootdevice/by-name/dsp /vendor/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/persist /mnt/vendor/persist ext4 nosuid,nodev,barrier=1,noatime wait,check
diff --git a/rootdir/etc/fstab_AB.qcom b/rootdir/etc/fstab_AB.qcom
index d058d51..2a16f53 100644
--- a/rootdir/etc/fstab_AB.qcom
+++ b/rootdir/etc/fstab_AB.qcom
@@ -10,8 +10,8 @@
/dev/block/bootdevice/by-name/system / ext4 ro,barrier=1,discard wait,slotselect
/dev/block/bootdevice/by-name/userdata /data ext4 nosuid,nodev,barrier=0,noauto_da_alloc,discard,noatime,lazytime wait,resize,check,crashcheck,quota,encryptable=footer
/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,slotselect
+/dev/block/bootdevice/by-name/modem /vendor/firmware_mnt vfat ro,shortname=lower,uid=1000,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0 wait,slotselect
/dev/block/bootdevice/by-name/bluetooth /vendor/bt_firmware vfat ro,shortname=lower,uid=1002,gid=3002,dmask=227,fmask=337,context=u:object_r:bt_firmware_file:s0 wait,slotselect
/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,slotselect
+/dev/block/bootdevice/by-name/dsp /vendor/dsp ext4 ro,nosuid,nodev,barrier=1 wait,slotselect
/dev/block/bootdevice/by-name/persist /mnt/vendor/persist ext4 nosuid,nodev,barrier=1,noatime wait,check