| author | Xindong Xu <xindong.xu@amlogic.com> | 2018-03-07 10:48:10 (GMT) |
|---|---|---|
| committer | Xindong Xu <xindong.xu@amlogic.com> | 2018-03-07 11:21:35 (GMT) |
| commit | daf947aa008e4776e0eb0bb18d8e23440de742cb (patch) | |
| tree | 49b862a3e238802020d989a88d5bd685cc39b756 | |
| parent | a74033af01692140bda7466935d143702ba64689 (diff) | |
| download | braun-daf947aa008e4776e0eb0bb18d8e23440de742cb.zip braun-daf947aa008e4776e0eb0bb18d8e23440de742cb.tar.gz braun-daf947aa008e4776e0eb0bb18d8e23440de742cb.tar.bz2 | |
braun: update code 20180307
1. delete code for supporting 3.14 kernel
2. Enable FDE force encryption for adoptable usb
Change-Id: I334dd0e1214e3bf81b00f71b5d8a399ff7c58def
| -rw-r--r-- | BoardConfig.mk | 4 | ||||
| -rw-r--r-- | braun.mk | 14 | ||||
| -rw-r--r--[-rwxr-xr-x] | files/media_codecs_performance.xml | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | files/pq.db | 0 | ||||
| -rw-r--r-- | fstab.amlogic | 2 |
5 files changed, 2 insertions, 18 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk index 3dff17f..63a5825 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -67,7 +67,6 @@ BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1946157056 BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800 BOARD_FLASH_BLOCK_SIZE := 4096 -ifneq ($(BOARD_OLD_PARTITION),true) BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4 BOARD_VENDORIMAGE_PARTITION_SIZE := 268435456 BOARD_USES_VENDORIMAGE := true @@ -77,9 +76,6 @@ BOARD_ROOT_EXTRA_FOLDERS := odm BOARD_ODMIMAGE_FILE_SYSTEM_TYPE := ext4 BOARD_ODMIMAGE_PARTITION_SIZE := 268435456 BOARD_USES_ODMIMAGE := true -else -GPU_MODS_OUT?=system/vendor/lib -endif TARGET_SUPPORT_USB_BURNING_V2 := true @@ -63,26 +63,16 @@ AB_OTA_UPDATER :=true ifeq ($(AB_OTA_UPDATER),true) AB_OTA_PARTITIONS := \ boot \ - system - -ifneq ($(BOARD_OLD_PARTITION),true) -AB_OTA_PARTITIONS += \ + system \ vendor \ odm -endif TARGET_BOOTLOADER_CONTROL_BLOCK := true TARGET_NO_RECOVERY := true TARGET_PARTITION_DTSI := partition_mbox_ab.dtsi else TARGET_NO_RECOVERY := false - -ifneq ($(BOARD_OLD_PARTITION),true) TARGET_PARTITION_DTSI := partition_mbox_normal.dtsi -else -TARGET_PARTITION_DTSI := partition_mbox_old.dtsi -endif - BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016 BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4 endif @@ -140,7 +130,6 @@ PRODUCT_PACKAGES += \ fs_mgr \ slideshow endif -ifneq ($(BOARD_OLD_PARTITION),true) ifneq ($(BOARD_USES_RECOVERY_AS_BOOT), true) ifeq ($(AB_OTA_UPDATER),true) ifeq ($(BUILD_WITH_DM_VERITY), true) @@ -178,7 +167,6 @@ PRODUCT_COPY_FILES += \ endif endif endif -endif ######################################################################### # diff --git a/files/media_codecs_performance.xml b/files/media_codecs_performance.xml index 58cf154..58cf154 100755..100644 --- a/files/media_codecs_performance.xml +++ b/files/media_codecs_performance.xml diff --git a/files/pq.db b/files/pq.db index 578af5e..578af5e 100755..100644 --- a/files/pq.db +++ b/files/pq.db diff --git a/fstab.amlogic b/fstab.amlogic index c862886..67464d3 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,fileencryption=aes-256-xts,quota,formattable +/dev/block/data /data ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic wait,check,forceencrypt=footer,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 |