diff --git a/a20/BoardConfig.mk b/a20/BoardConfig.mk index 7fcf84c..881a24e 100644 --- a/a20/BoardConfig.mk +++ b/a20/BoardConfig.mk @@ -3,9 +3,6 @@ DEVICE_PATH := device/samsung/a20 # Asserts TARGET_OTA_ASSERT_DEVICE := a20,a20dd -# Keymaster -TARGET_KEYMASTER_VARIANT := samsung - # Kernel TARGET_KERNEL_CONFIG := exynos7885-a20_enforcing_defconfig @@ -16,11 +13,5 @@ TARGET_SCREEN_DENSITY := 411 BOARD_RECOVERYIMAGE_PARTITION_SIZE := 55574528 # 55MB BOARD_SYSTEMIMAGE_PARTITION_SIZE := 4320133120 #4.02GB -# Recovery -TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/recovery/recovery.fstab - -# Sepolicy -BOARD_SEPOLICY_TEE_FLAVOR := teegris - # Inherit common board flags include device/samsung/universal7885-common/BoardConfigCommon.mk diff --git a/a20e/BoardConfig.mk b/a20e/BoardConfig.mk index ae229a6..7647316 100644 --- a/a20e/BoardConfig.mk +++ b/a20e/BoardConfig.mk @@ -3,9 +3,6 @@ DEVICE_PATH := device/samsung/a20e # Asserts TARGET_OTA_ASSERT_DEVICE := a20e,a20edd -# Keymaster -TARGET_KEYMASTER_VARIANT := samsung - # Kernel TARGET_KERNEL_CONFIG := exynos7885-a20e_enforcing_defconfig @@ -16,11 +13,5 @@ TARGET_SCREEN_DENSITY := 320 BOARD_RECOVERYIMAGE_PARTITION_SIZE := 55574528 # 55MB BOARD_SYSTEMIMAGE_PARTITION_SIZE := 4320133120 #4.02GB -# Recovery -TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/recovery/recovery.fstab - -# Sepolicy -BOARD_SEPOLICY_TEE_FLAVOR := teegris - # Inherit common board flags include device/samsung/universal7885-common/BoardConfigCommon.mk diff --git a/universal7885-common/BoardConfigCommon.mk b/universal7885-common/BoardConfigCommon.mk index 5a8106d..198a78e 100644 --- a/universal7885-common/BoardConfigCommon.mk +++ b/universal7885-common/BoardConfigCommon.mk @@ -54,6 +54,9 @@ BOARD_MKBOOTIMG_ARGS := --kernel_offset 0x00008000 --ramdisk_offset 0x01000000 - TARGET_KERNEL_SOURCE := kernel/samsung/exynos7885 TARGET_KERNEL_CLANG_COMPILE := true +# Keymaster +TARGET_KEYMASTER_VARIANT := samsung + # HIDL DEVICE_MANIFEST_FILE := $(COMMON_PATH)/manifest.xml DEVICE_MATRIX_FILE := $(COMMON_PATH)/compatibility_matrix.xml @@ -78,6 +81,7 @@ TARGET_VENDOR_PROP += $(COMMON_PATH)/vendor.prop # Recovery BOARD_HAS_DOWNLOAD_MODE := true +TARGET_RECOVERY_FSTAB := $(COMMON_PATH)/recovery/recovery.fstab # RIL ENABLE_VENDOR_RIL_SERVICE := true diff --git a/universal7885-common/rootdir/etc/fstab.exynos7884B b/universal7885-common/rootdir/etc/fstab.exynos7884B new file mode 100644 index 0000000..f7b5ad9 --- /dev/null +++ b/universal7885-common/rootdir/etc/fstab.exynos7884B @@ -0,0 +1,16 @@ +# Android fstab file. +# +# 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 + +# system and vendor partition will be early-mounted by kernel +# /dev/block/platform/13500000.dwmmc0/by-name/system /system ext4 ro wait +/dev/block/platform/13500000.dwmmc0/by-name/cache /cache ext4 noatime,nosuid,nodev,noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic wait,check +/dev/block/platform/13500000.dwmmc0/by-name/userdata /data ext4 noatime,nosuid,nodev,noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic wait,check,encryptable=footer,quota,reservedsize=128M,length=-20480 +/dev/block/platform/13500000.dwmmc0/by-name/efs /mnt/vendor/efs ext4 noatime,nosuid,nodev,noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic wait,check +/dev/block/platform/13500000.dwmmc0/by-name/misc /misc emmc defaults defaults + +# VOLD :: fstab.a20e +/dev/block/platform/13500000.dwmmc0/by-name/hidden /preload ext4 noatime,nosuid,nodev,noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic voldmanaged=preload:auto,check +/devices/platform/13550000.dwmmc2/mmc_host/mmc1* auto vfat defaults voldmanaged=sdcard:auto +/devices/platform/13600000.usb/13600000.dwc3* auto auto defaults voldmanaged=usb:auto diff --git a/universal7885-common/rootdir/etc/init.baseband.rc b/universal7885-common/rootdir/etc/init.baseband.rc new file mode 100644 index 0000000..6409208 --- /dev/null +++ b/universal7885-common/rootdir/etc/init.baseband.rc @@ -0,0 +1,92 @@ +on early-init + mkdir /mnt/vendor/cpefs 0771 radio system + +on init + symlink /dev/block/platform/13500000.dwmmc0/by-name/radio /dev/mbin0 + restorecon /dev/mbin0 + + write /proc/sys/net/core/netdev_max_backlog 5000 + + write /sys/class/net/rmnet0/queues/rx-0/rps_cpus 6 + write /sys/class/net/rmnet1/queues/rx-0/rps_cpus 6 + write /sys/class/net/rmnet2/queues/rx-0/rps_cpus 6 + write /sys/class/net/rmnet3/queues/rx-0/rps_cpus 6 + write /sys/class/net/rmnet4/queues/rx-0/rps_cpus 6 + write /sys/class/net/rmnet5/queues/rx-0/rps_cpus 6 + write /sys/class/net/rmnet6/queues/rx-0/rps_cpus 6 + write /sys/class/net/rmnet7/queues/rx-0/rps_cpus 6 + +on fs && property:ro.boot.cpefs_wp=0 + wait /dev/block/platform/13500000.dwmmc0/by-name/cpefs + mount ext4 /dev/block/platform/13500000.dwmmc0/by-name/cpefs /mnt/vendor/cpefs nosuid nodev noatime noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic + mount none /mnt/vendor/cpefs /cpefs bind + restorecon_recursive /mnt/vendor/cpefs + chown radio system /mnt/vendor/cpefs + chmod 0771 /mnt/vendor/cpefs + +on fs && property:ro.boot.cpefs_wp=1 + wait /dev/block/platform/13500000.dwmmc0/by-name/cpefs + mount ext4 /dev/block/platform/13500000.dwmmc0/by-name/cpefs /mnt/vendor/cpefs ro nosuid nodev noatime noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic + mount none /mnt/vendor/cpefs /cpefs bind + restorecon_recursive /mnt/vendor/cpefs + chown radio system /mnt/vendor/cpefs + chmod 0771 /mnt/vendor/cpefs + +on post-fs-data + chown radio radio sys/devices/virtual/misc/multipdp/waketime + chmod 0660 /sys/devices/virtual/misc/umts_dm0/dm_state + chown radio system /sys/devices/virtual/misc/umts_dm0/dm_state + + # /efs/factory.prop for Dual / Single SIM settings + chown radio radio /mnt/vendor/efs/factory.prop + chmod 0600 /mnt/vendor/efs/factory.prop + +# Modem boot daemon +service cpboot-daemon /vendor/bin/cbd -d -tss310 -bm -mm -P platform/13500000.dwmmc0/by-name/radio + class main + user root + group radio cache inet misc audio sdcard_rw log sdcard_r shell system + seclabel u:r:cbd:s0 + +on property:ril.clatd.v4-rmnet0=up + write /sys/class/net/rmnet0/queues/rx-0/rps_cpus 4 + write /sys/class/net/v4-rmnet0/queues/rx-0/rps_cpus 2 + +on property:ril.clatd.v4-rmnet1=up + write /sys/class/net/rmnet1/queues/rx-0/rps_cpus 4 + write /sys/class/net/v4-rmnet1/queues/rx-0/rps_cpus 2 + +on property:ril.clatd.v4-rmnet2=up + write /sys/class/net/rmnet2/queues/rx-0/rps_cpus 4 + write /sys/class/net/v4-rmnet2/queues/rx-0/rps_cpus 2 + +on property:ril.clatd.v4-rmnet3=up + write /sys/class/net/rmnet3/queues/rx-0/rps_cpus 4 + write /sys/class/net/v4-rmnet3/queues/rx-0/rps_cpus 2 + +on property:ril.clatd.v4-rmnet4=up + write /sys/class/net/rmnet4/queues/rx-0/rps_cpus 4 + write /sys/class/net/v4-rmnet4/queues/rx-0/rps_cpus 2 + +on property:ril.clatd.v4-rmnet5=up + write /sys/class/net/rmnet5/queues/rx-0/rps_cpus 4 + write /sys/class/net/v4-rmnet5/queues/rx-0/rps_cpus 2 + +on property:ril.clatd.v4-rmnet6=up + write /sys/class/net/rmnet6/queues/rx-0/rps_cpus 4 + write /sys/class/net/v4-rmnet6/queues/rx-0/rps_cpus 2 + +on property:ril.clatd.v4-rmnet7=up + write /sys/class/net/rmnet7/queues/rx-0/rps_cpus 4 + write /sys/class/net/v4-rmnet7/queues/rx-0/rps_cpus 2 + +# SS/DS configuration +on property:ro.vendor.multisim.simslotcount=* + write /sys/module/modem_ctrl_ss310ap/parameters/ds_detect ${ro.vendor.multisim.simslotcount} + +on property:ro.vendor.multisim.simslotcount=1 + setprop persist.radio.multisim.config ss + +on property:ro.vendor.multisim.simslotcount=2 + setprop persist.radio.multisim.config dsds + diff --git a/universal7885-common/rootdir/etc/init.target.rc b/universal7885-common/rootdir/etc/init.target.rc new file mode 100644 index 0000000..fc40b91 --- /dev/null +++ b/universal7885-common/rootdir/etc/init.target.rc @@ -0,0 +1,10 @@ +on init + # Reactivation Lock + symlink /dev/block/platform/13500000.dwmmc0/by-name/steady /dev/block/steady + + # Google FRP solution + symlink /dev/block/platform/13500000.dwmmc0/by-name/persistent /dev/block/persistent + +on boot + # Permissions for NAD + symlink /dev/block/platform/13500000.dwmmc0/by-name/nad_refer /dev/block/nad_refer diff --git a/universal7885-common/universal7885-common.mk b/universal7885-common/universal7885-common.mk index 4417be8..e0e0910 100644 --- a/universal7885-common/universal7885-common.mk +++ b/universal7885-common/universal7885-common.mk @@ -124,9 +124,6 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ android.hardware.keymaster@4.0-service.samsung \ libkeymaster4_1support.vendor - -PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/configs/android.hardware.keymaster@4.0-service.samsung.xml:$(TARGET_COPY_OUT_VENDOR)/etc/vintf/manifest/android.hardware.keymaster@4.0-service.samsung.xml # Light PRODUCT_PACKAGES += \