| -rw-r--r-- | fstab.AB.amlogic | 4 | ||||
| -rw-r--r-- | fstab.AB.verity.amlogic | 4 | ||||
| -rw-r--r-- | fstab.amlogic | 4 | ||||
| -rw-r--r-- | fstab.verity.amlogic | 4 | ||||
| -rw-r--r-- | manifest.xml | 2 | ||||
| -rw-r--r-- | upgrade/aml_sdc_burn.ini | 4 |
6 files changed, 10 insertions, 12 deletions
diff --git a/fstab.AB.amlogic b/fstab.AB.amlogic index 5208ca2..b4b4b48 100644 --- a/fstab.AB.amlogic +++ b/fstab.AB.amlogic @@ -4,7 +4,7 @@ # specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK /dev/block/platform/d0074000.emmc/misc /misc emmc defaults defaults -/dev/block/data /data ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic wait,check,encryptable=footer,quota,formattable +/dev/block/data /data ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic wait,check,fileencryption=aes-256-xts,quota,formattable /devices/*.sd/mmc_host/sd* auto vfat defaults voldmanaged=sdcard1:auto,noemulatedsd /devices/*dwc3/xhci-hcd.0.auto/usb?/*/host*/target*/block/sd* auto vfat defaults voldmanaged=udisk0:auto /devices/*dwc3/xhci-hcd.0.auto/usb?/*/host*/target*/block/sd* auto vfat defaults voldmanaged=udisk1:auto @@ -12,4 +12,4 @@ /dev/block/loop auto loop defaults voldmanaged=loop:auto # Add for zram. zramsize can be in numeric (byte) , in percent /dev/block/zram0 /swap_zram0 swap defaults wait,zramsize=524288000 -/dev/block/tee /tee ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic wait,check,formattable
\ No newline at end of file +/dev/block/tee /tee ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic wait,check,formattable diff --git a/fstab.AB.verity.amlogic b/fstab.AB.verity.amlogic index 5208ca2..b4b4b48 100644 --- a/fstab.AB.verity.amlogic +++ b/fstab.AB.verity.amlogic @@ -4,7 +4,7 @@ # specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK /dev/block/platform/d0074000.emmc/misc /misc emmc defaults defaults -/dev/block/data /data ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic wait,check,encryptable=footer,quota,formattable +/dev/block/data /data ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic wait,check,fileencryption=aes-256-xts,quota,formattable /devices/*.sd/mmc_host/sd* auto vfat defaults voldmanaged=sdcard1:auto,noemulatedsd /devices/*dwc3/xhci-hcd.0.auto/usb?/*/host*/target*/block/sd* auto vfat defaults voldmanaged=udisk0:auto /devices/*dwc3/xhci-hcd.0.auto/usb?/*/host*/target*/block/sd* auto vfat defaults voldmanaged=udisk1:auto @@ -12,4 +12,4 @@ /dev/block/loop auto loop defaults voldmanaged=loop:auto # Add for zram. zramsize can be in numeric (byte) , in percent /dev/block/zram0 /swap_zram0 swap defaults wait,zramsize=524288000 -/dev/block/tee /tee ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic wait,check,formattable
\ No newline at end of file +/dev/block/tee /tee ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic wait,check,formattable diff --git a/fstab.amlogic b/fstab.amlogic index 01d6aae..c862886 100644 --- a/fstab.amlogic +++ b/fstab.amlogic @@ -4,7 +4,7 @@ # specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK /dev/block/misc /misc emmc defaults defaults -/dev/block/data /data ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic wait,check,encryptable=footer,quota,formattable +/dev/block/data /data ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic wait,check,fileencryption=aes-256-xts,quota,formattable /dev/block/cache /cache ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic wait,check,formattable /devices/*.sd/mmc_host/sd* auto vfat defaults voldmanaged=sdcard1:auto,noemulatedsd /devices/*dwc3/xhci-hcd.0.auto/usb?/*/host*/target*/block/sd* auto vfat defaults voldmanaged=udisk0:auto @@ -13,4 +13,4 @@ /dev/block/loop auto loop defaults voldmanaged=loop:auto # Add for zram. zramsize can be in numeric (byte) , in percent /dev/block/zram0 /swap_zram0 swap defaults wait,zramsize=524288000 -/dev/block/tee /tee ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic wait,check,formattable
\ No newline at end of file +/dev/block/tee /tee ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic wait,check,formattable diff --git a/fstab.verity.amlogic b/fstab.verity.amlogic index 01d6aae..c862886 100644 --- a/fstab.verity.amlogic +++ b/fstab.verity.amlogic @@ -4,7 +4,7 @@ # specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK /dev/block/misc /misc emmc defaults defaults -/dev/block/data /data ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic wait,check,encryptable=footer,quota,formattable +/dev/block/data /data ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic wait,check,fileencryption=aes-256-xts,quota,formattable /dev/block/cache /cache ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic wait,check,formattable /devices/*.sd/mmc_host/sd* auto vfat defaults voldmanaged=sdcard1:auto,noemulatedsd /devices/*dwc3/xhci-hcd.0.auto/usb?/*/host*/target*/block/sd* auto vfat defaults voldmanaged=udisk0:auto @@ -13,4 +13,4 @@ /dev/block/loop auto loop defaults voldmanaged=loop:auto # Add for zram. zramsize can be in numeric (byte) , in percent /dev/block/zram0 /swap_zram0 swap defaults wait,zramsize=524288000 -/dev/block/tee /tee ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic wait,check,formattable
\ No newline at end of file +/dev/block/tee /tee ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic wait,check,formattable diff --git a/manifest.xml b/manifest.xml index 34d4b47..8a0b727 100644 --- a/manifest.xml +++ b/manifest.xml @@ -136,10 +136,12 @@ <interface> <name>ICryptoFactory</name> <instance>default</instance> + <instance>widevine</instance> </interface> <interface> <name>IDrmFactory</name> <instance>default</instance> + <instance>widevine</instance> </interface> </hal> <hal format="hidl"> diff --git a/upgrade/aml_sdc_burn.ini b/upgrade/aml_sdc_burn.ini index abd7d5b..b36fda3 100644 --- a/upgrade/aml_sdc_burn.ini +++ b/upgrade/aml_sdc_burn.ini @@ -3,10 +3,6 @@ ;This card burning script support both dos and unix file format, but don't edit in windows if not dos format ;Except comment, all must readable ASCII letters ; -;Amlogic sdcard 烧录镜像脚本 -;本脚本支持dos和unix两种格式的方便，但是推荐保一直保存为dos格式的 -;如果是非dos格式的，请不在windows下使用记事本编辑，否则编辑后会变成不可解析 -;除注释行外的字符必须是可识别的ASCII [common] erase_bootloader = 1 |