diff --git a/AndroidProducts.mk b/AndroidProducts.mk index e571391..012a45b 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -16,3 +16,5 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/omni_wayne.mk + +COMMON_LUNCH_CHOICES := omni_wayne-eng \ No newline at end of file diff --git a/BoardConfig.mk b/BoardConfig.mk index d6b154c..cc383c4 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -39,13 +39,13 @@ TARGET_ARCH := arm64 TARGET_ARCH_VARIANT := armv8-a TARGET_CPU_ABI := arm64-v8a TARGET_CPU_ABI2 := -TARGET_CPU_VARIANT := kryo +TARGET_CPU_VARIANT := cortex-a73 TARGET_2ND_ARCH := arm TARGET_2ND_ARCH_VARIANT := armv8-a TARGET_2ND_CPU_ABI := armeabi-v7a TARGET_2ND_CPU_ABI2 := armeabi -TARGET_2ND_CPU_VARIANT := cortex-a53 +TARGET_2ND_CPU_VARIANT := cortex-a73 # Crypto TW_INCLUDE_CRYPTO := true @@ -57,11 +57,10 @@ PLATFORM_SECURITY_PATCH := 2099-12-31 # Kernel TARGET_KERNEL_ARCH := arm64 TARGET_KERNEL_HEADER_ARCH := arm64 -BOARD_KERNEL_CMDLINE := androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x37 ehci-hcd.park=3 -BOARD_KERNEL_CMDLINE += lpm_levels.sleep_disabled=1 sched_enable_hmp=1 sched_enable_power_aware=1 -BOARD_KERNEL_CMDLINE += service_locator.enable=1 swiotlb=1 androidboot.configfs=true -BOARD_KERNEL_CMDLINE += androidboot.usbcontroller=a800000.dwc3 +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 += loop.max_part=7 BOARD_KERNEL_CMDLINE += androidboot.selinux=permissive +BOARD_KERNEL_IMAGE_NAME := Image.gz-dtb BOARD_KERNEL_BASE := 0x00000000 BOARD_KERNEL_PAGESIZE := 4096 BOARD_KERNEL_TAGS_OFFSET := 0x00000100 @@ -75,11 +74,11 @@ BOARD_FLASH_BLOCK_SIZE := 131072 # (BOARD_KERNEL_PAGESIZE * 64) BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4 TARGET_COPY_OUT_VENDOR := vendor BOARD_SUPPRESS_SECURE_ERASE := true + +# File systems TARGET_USERIMAGES_USE_EXT4 := true TARGET_USERIMAGES_USE_F2FS := true -BOARD_HAS_NO_SELECT_BUTTON := true - # TWRP Configuration BOARD_HAS_NO_REAL_SDCARD := true TW_THEME := portrait_hdpi @@ -94,6 +93,6 @@ TW_INPUT_BLACKLIST := "hbtp_vm" TW_SCREEN_BLANK_ON_BOOT := true TW_INCLUDE_REPACKTOOLS := true TW_USE_TOOLBOX := true -TW_EXCLUDE_TWRPAPP := truemm +TW_EXCLUDE_TWRPAPP := true TARGET_USES_LOGD := true TWRP_INCLUDE_LOGCAT := true \ No newline at end of file diff --git a/Image.gz-dtb b/Image.gz-dtb index feace55..9de8019 100644 Binary files a/Image.gz-dtb and b/Image.gz-dtb differ diff --git a/omni_wayne.mk b/omni_wayne.mk index 14a94ab..c0bf51a 100644 --- a/omni_wayne.mk +++ b/omni_wayne.mk @@ -17,7 +17,7 @@ # Release name PRODUCT_RELEASE_NAME := wayne -$(call inherit-product, build/target/product/embedded.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base.mk) # Inherit from our custom product configuration $(call inherit-product, vendor/omni/config/common.mk) diff --git a/recovery.fstab b/recovery.fstab deleted file mode 100644 index 6c2b199..0000000 --- a/recovery.fstab +++ /dev/null @@ -1,22 +0,0 @@ -# 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 - -# mount point fstype device device2 flags -/boot emmc /dev/block/bootdevice/by-name/boot -/cache ext4 /dev/block/bootdevice/by-name/cache -/data ext4 /dev/block/bootdevice/by-name/userdata flags=fileencryption=ice -/persist ext4 /dev/block/bootdevice/by-name/persist flags=display="Persist" -/misc emmc /dev/block/bootdevice/by-name/misc -/recovery emmc /dev/block/bootdevice/by-name/recovery flags=backup=1 -/system ext4 /dev/block/bootdevice/by-name/system -/system_image emmc /dev/block/bootdevice/by-name/system -/vendor ext4 /dev/block/bootdevice/by-name/vendor -/vendor_image emmc /dev/block/bootdevice/by-name/vendor -/efs1 emmc /dev/block/bootdevice/by-name/modemst1 flags=backup=1;display=EFS -/efs2 emmc /dev/block/bootdevice/by-name/modemst2 flags=backup=1;subpartitionof=/efs1 -/efsg emmc /dev/block/bootdevice/by-name/fsg flags=backup=1;subpartitionof=/efs1 -/efsc emmc /dev/block/bootdevice/by-name/fsc flags=backup=1;subpartitionof=/efs1 - -# Removable storage -/usb_otg vfat /dev/block/sda1 /dev/block/sda flags=display="USB-OTG";storage;wipeingui;removable diff --git a/recovery/root/system/etc/recovery.fstab b/recovery/root/system/etc/recovery.fstab new file mode 100644 index 0000000..2458f82 --- /dev/null +++ b/recovery/root/system/etc/recovery.fstab @@ -0,0 +1,26 @@ +# 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 + +# NOTE: /system and /vendor partitions are now early-mounted and the fstab entry is specified in device tree (duplicated below for recovery image purposes only): +# /proc/device-tree/firmware/android/fstab/system +# /proc/device-tree/firmware/android/fstab/vendor + +#TODO: Add 'check' as fs_mgr_flags with data partition. +# Currently we dont have e2fsck compiled. So fs check would failed. + +# Non-A/B fstab.qcom variant +# +/dev/block/bootdevice/by-name/userdata /data f2fs nosuid,nodev,noatime,discard,background_gc=off,fsync_mode=nobarrier wait,quota,encryptable=footer +/dev/block/bootdevice/by-name/userdata /data ext4 nosuid,nodev,barrier=1,noauto_da_alloc,discard,noatime,lazytime,errors=panic wait,check,encryptable=footer,quota +/dev/block/bootdevice/by-name/misc /misc emmc defaults defaults +/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 +/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 /vendor/dsp ext4 ro,nosuid,nodev,barrier=1 wait +/dev/block/bootdevice/by-name/cache /cache f2fs nosuid,nodev,noatime,discard,background_gc=off,fsync_mode=nobarrier wait,quota +/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 +/dev/block/bootdevice/by-name/system /system ext4 ro,barrier=1 wait,recoveryonly +/dev/block/bootdevice/by-name/vendor /vendor ext4 ro,barrier=1 wait,recoveryonly +/dev/block/bootdevice/by-name/boot /boot emmc defaults defaults \ No newline at end of file diff --git a/recovery/root/system/etc/twrp.flags b/recovery/root/system/etc/twrp.flags new file mode 100644 index 0000000..80d2337 --- /dev/null +++ b/recovery/root/system/etc/twrp.flags @@ -0,0 +1,18 @@ +# mount point fstype device device2 flags +/data ext4 /dev/block/bootdevice/by-name/userdata flags=fileencryption=ice +/data f2fs /dev/block/bootdevice/by-name/userdata flags=fileencryption=ice +/misc emmc /dev/block/bootdevice/by-name/misc +/modem emmc /dev/block/bootdevice/by-name/modem flags=backup=1;display="Modem" +/bluetooth emmc /dev/block/bootdevice/by-name/bluetooth flags=backup=1;subpartitionof=/modem +/dsp emmc /dev/block/bootdevice/by-name/dsp flags=backup=1;subpartitionof=/modem +/cache ext4 /dev/block/bootdevice/by-name/cache +/cache f2fs /dev/block/bootdevice/by-name/cache +/persist ext4 /dev/block/bootdevice/by-name/persist flags=display="Persist" +/persist_image emmc /dev/block/bootdevice/by-name/persist flags=display="Persist";flashimg=1 +/system_root ext4 /dev/block/bootdevice/by-name/system flags=display="System" +/recovery emmc /dev/block/bootdevice/by-name/recovery flags=backup=1 +/vendor ext4 /dev/block/bootdevice/by-name/vendor flags=display="Vendor" +/boot emmc /dev/block/bootdevice/by-name/boot + +# Removable storage +/usb_otg vfat /dev/block/sda1 /dev/block/sda flags=display="USB-OTG";storage;wipeingui;removable \ No newline at end of file diff --git a/recovery/root/system/etc/twrp.wipe b/recovery/root/system/etc/twrp.wipe new file mode 100644 index 0000000..869f70b --- /dev/null +++ b/recovery/root/system/etc/twrp.wipe @@ -0,0 +1,7 @@ +# All the partitions to be wiped (in order) under recovery. +/dev/block/bootdevice/by-name/system +/dev/block/bootdevice/by-name/vendor +/dev/block/bootdevice/by-name/userdata +# Wipe the boot partitions last so that all partitions will be wiped +# correctly even if the wiping process gets interrupted by a force boot. +/dev/block/bootdevice/by-name/boot \ No newline at end of file