diff --git a/BoardConfig.mk b/BoardConfig.mk index cdf33b64d14ddfcc06e1187f52a64aca2ad30feb..5675bea2d2babb98c151a5194907cd55d0545c2d 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -29,9 +29,6 @@ TARGET_USES_64_BIT_BINDER := true # Audio USE_XML_AUDIO_POLICY_CONF := 1 -# Avb -BOARD_AVB_ENABLE := false - # Bluetooth BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(DEVICE_PATH)/bluetooth/include @@ -39,27 +36,30 @@ BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(DEVICE_PATH)/bluetooth/include TARGET_BOARD_PLATFORM := mt6763 TARGET_BOOTLOADER_BOARD_NAME := mt6763 TARGET_NO_BOOTLOADER := true -TARGET_NO_BOOTIMAGE := true # Kernel -BOARD_KERNEL_CMDLINE := bootopt=64S3,32N2,64N2 androidboot.selinux=permissive +BOARD_KERNEL_CMDLINE := bootopt=64S3,32N2,64N2 +TARGET_PREBUILT_KERNEL := $(DEVICE_PATH)/prebuilt/Image.gz-dtb +TARGET_PREBUILT_DTB := $(DEVICE_PATH)/prebuilt/dtb.img +BOARD_PREBUILT_DTBOIMAGE := $(DEVICE_PATH)/prebuilt/dtbo.img +BOARD_BOOTIMG_HEADER_VERSION := 2 BOARD_KERNEL_BASE := 0x40078000 BOARD_KERNEL_PAGESIZE := 2048 -BOARD_HASH_TYPE := sha1 +BOARD_DTB_OFFSET := 0x13f88000 BOARD_KERNEL_OFFSET := 0x00008000 BOARD_RAMDISK_OFFSET := 0x14f88000 BOARD_SECOND_OFFSET := 0x00e88000 -BOARD_KERNEL_TAGS_OFFSET := 0x13f88000 -BOARD_KERNEL_IMAGE_NAME := kernel -TARGET_PREBUILT_KERNEL := $(DEVICE_PATH)/kernel -BOARD_MKBOOTIMG_ARGS := --ramdisk_offset $(BOARD_RAMDISK_OFFSET) -BOARD_MKBOOTIMG_ARGS += --tags_offset $(BOARD_KERNEL_TAGS_OFFSET) +BOARD_TAGS_OFFSET := 0x13f88000 +BOARD_CUSTOM_BOOTIMG := true +BOARD_CUSTOM_BOOTIMG_MK := $(DEVICE_PATH)/mkbootimg.mk +BOARD_MKBOOTIMG_ARGS := --dtb_offset $(BOARD_DTB_OFFSET) BOARD_MKBOOTIMG_ARGS += --kernel_offset $(BOARD_KERNEL_OFFSET) +BOARD_MKBOOTIMG_ARGS += --ramdisk_offset $(BOARD_RAMDISK_OFFSET) BOARD_MKBOOTIMG_ARGS += --second_offset $(BOARD_SECOND_OFFSET) -BOARD_MKBOOTIMG_ARGS += --base $(BOARD_KERNEL_BASE) -BOARD_MKBOOTIMG_ARGS += --pagesize $(BOARD_KERNEL_PAGESIZE) --board "" +BOARD_MKBOOTIMG_ARGS += --tags_offset $(BOARD_TAGS_OFFSET) +BOARD_MKBOOTIMG_ARGS += --dtb $(TARGET_PREBUILT_DTB) +BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOTIMG_HEADER_VERSION) -BOARD_PACK_BOOTIMAGE := $(DEVICE_PATH)/kernel # Netd BUILD_BROKEN_DUP_RULES := true BUILD_BROKEN_PHONY_TARGETS := true @@ -67,11 +67,11 @@ BUILD_BROKEN_PHONY_TARGETS := true # Partitions BOARD_FLASH_BLOCK_SIZE := 131072 BOARD_BOOTIMAGE_PARTITION_SIZE := 33554432 +BOARD_DTBOIMG_PARTITION_SIZE:= 8388608 BOARD_RECOVERYIMAGE_PARTITION_SIZE := 33554432 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 3221225472 BOARD_USERDATAIMAGE_PARTITION_SIZE := 119878418432 BOARD_CACHEIMAGE_PARTITION_SIZE := 218103808 -BOARD_BUILD_SYSTEM_ROOT_IMAGE := true BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := ext4 BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4 BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4 @@ -81,14 +81,11 @@ BUILD_WITHOUT_VENDOR := true # Properties BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true -include $(DEVICE_PATH)/kernel.mk - - # Recovery -BOARD_USES_RECOVERY_AS_BOOT := false -TARGET_NO_RECOVERY := false +BOARD_INCLUDE_RECOVERY_DTBO := true +BOARD_PREBUILT_RECOVERY_DTBOIMAGE := $(DEVICE_PATH)/prebuilt/recovery_dtbo.img TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/rootdir/etc/fstab.mt6763 -BOARD_PACK_IMAGES := recovery.img:recovery + # Releasetools TARGET_RELEASETOOLS_EXTENSIONS := $(DEVICE_PATH)/releasetools @@ -103,3 +100,9 @@ BOARD_VNDK_VERSION := current PRODUCT_TARGET_VNDK_VERSION := current TARGET_SYSTEM_PROP += $(DEVICE_PATH)/system.prop + +# Verified Boot +BOARD_AVB_ENABLE := true +BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --set_hashtree_disabled_flag +BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --flags 2 +BOARD_PREBUILT_VBMETAIMAGE := $(DEVICE_PATH)/prebuilt/vbmeta.img diff --git a/device.mk b/device.mk index 2700222008c9b4f4ba411531b07776ef3af8f581..c78b8265adcb10a8f755f18042f4ce8716457070 100644 --- a/device.mk +++ b/device.mk @@ -30,11 +30,14 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ Snap -# Init cripts +# Init PRODUCT_PACKAGES += \ init.mt6763.rc \ fstab.mt6763 +PRODUCT_COPY_FILES += \ + $(LOCAL_PATH)/rootdir/etc/fstab.mt6763:$(TARGET_COPY_OUT_RAMDISK)/fstab.mt6763 + # Keylayouts PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/idc/mtk-kpd.idc:$(TARGET_COPY_OUT_SYSTEM)/usr/idc/mtk-kpd.idc \ diff --git a/dt.img b/dt.img deleted file mode 100644 index 69e3771f35e5583a12a96a7af5b1bf50c892a402..0000000000000000000000000000000000000000 --- a/dt.img +++ /dev/null @@ -1 +0,0 @@ -׷ \ No newline at end of file diff --git a/extract-files.sh b/extract-files.sh old mode 100644 new mode 100755 index c08b48fb66fe2617d56947ccd89a4b35995832b8..d32b1424eb24a863889ee52e9630be40c4f595fe --- a/extract-files.sh +++ b/extract-files.sh @@ -17,8 +17,9 @@ set -e -DEVICE=yggdrasil -VENDOR=volla +# Required! +export DEVICE=GS290 +export VENDOR=gigaset # Load extract_utils and do some sanity checks MY_DIR="${BASH_SOURCE%/*}" @@ -33,11 +34,6 @@ if [ ! -f "${HELPER}" ]; then fi source "${HELPER}" -function blob_fixup() { - case "${1}" in - esac -} - # Default to sanitizing the vendor folder before extraction CLEAN_VENDOR=true @@ -67,22 +63,11 @@ if [ -z "${SRC}" ]; then SRC="adb" fi -# Initialize the helper for common device -setup_vendor "${DEVICE}" "${VENDOR}" "${LINEAGE_ROOT}" true "${CLEAN_VENDOR}" - -extract "${MY_DIR}/proprietary-files.txt" "${SRC}" \ - "${KANG}" --section "${SECTION}" +# Initialize the helper +setup_vendor "${DEVICE}" "${VENDOR}" "${LINEAGE_ROOT}" false "${CLEAN_VENDOR}" -COMMON_BLOB_ROOT="${LINEAGE_ROOT}/vendor/${VENDOR}/${DEVICE}/proprietary" - -if [ -s "${MY_DIR}/../${DEVICE}/proprietary-files.txt" ]; then - # Reinitialize the helper for device - setup_vendor "${DEVICE}" "${VENDOR}" "${LINEAGE_ROOT}" false "$CLEAN_VENDOR}" - - extract "${MY_DIR}/../${DEVICE}/proprietary-files.txt" "${SRC}" \ - "${KANG}" --section "${SECTION}" -fi +extract "${MY_DIR}/proprietary-files.txt" "${SRC}" "${KANG}" --section "${SECTION}" -BLOB_ROOT="${LINEAGE_ROOT}/vendor/${VENDOR}/${DEVICE}/proprietary" +DEVICE_BLOB_ROOT="${LINEAGE_ROOT}/vendor/${VENDOR}/${DEVICE}/proprietary" -source "${MY_DIR}/setup-makefiles.sh" +"${MY_DIR}/setup-makefiles.sh" diff --git a/kernel.mk b/kernel.mk deleted file mode 100644 index b83577fe3a8521f71f369f4e0e48ae95e64d70bb..0000000000000000000000000000000000000000 --- a/kernel.mk +++ /dev/null @@ -1,22 +0,0 @@ -# -# Copyright (C) 2018 The TwrpBuilder Open-Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# Kernel -TARGET_PREBUILT_KERNEL := $(DEVICE_PATH)/kernel -BOARD_KERNEL_CMDLINE := bootopt=64S3,32N2,64N2 buildvariant=user androidboot.selinux=permissive -BOARD_KERNEL_BASE := 0x40078000 -BOARD_KERNEL_PAGESIZE := 2048 -BOARD_MKBOOTIMG_ARGS := --ramdisk_offset 0x14f88000 --tags_offset 0x13f88000 --dtb $(DEVICE_PATH)/dt.img diff --git a/mkbootimg.mk b/mkbootimg.mk new file mode 100644 index 0000000000000000000000000000000000000000..48ae9067c762590aafc73ab8a66bdcca03473da7 --- /dev/null +++ b/mkbootimg.mk @@ -0,0 +1,39 @@ +# Copyright (C) 2020 The LineageOS Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +LOCAL_PATH := $(call my-dir) + +$(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTIMG) $(AVBTOOL) $(INTERNAL_BOOTIMAGE_FILES) $(BOOTIMAGE_EXTRA_DEPS) $(BOARD_AVB_BOOT_KEY_PATH) $(BOARD_PREBUILT_VBMETAIMAGE) + $(call pretty,"Target boot image: $@") + $(hide) $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_ARGS) $(INTERNAL_MKBOOTIMG_VERSION_ARGS) $(BOARD_MKBOOTIMG_ARGS) --output $@ + $(hide) $(call assert-max-image-size,$@,$(BOARD_BOOTIMAGE_PARTITION_SIZE),raw) + $(hide) $(AVBTOOL) add_hash_footer \ + --image $@ \ + --partition_size $(BOARD_BOOTIMAGE_PARTITION_SIZE) \ + --partition_name boot $(INTERNAL_AVB_BOOT_SIGNING_ARGS) \ + $(BOARD_AVB_BOOT_ADD_HASH_FOOTER_ARGS) + $(hide) $(AVBTOOL) append_vbmeta_image --image $@ --partition_size $(BOARD_BOOTIMAGE_PARTITION_SIZE) --vbmeta_image $(BOARD_PREBUILT_VBMETAIMAGE) + @echo "Made boot image: $@" + +$(INSTALLED_RECOVERYIMAGE_TARGET): $(MKBOOTIMG) $(AVBTOOL) $(recovery_ramdisk) $(recovery_kernel) $(RECOVERYIMAGE_EXTRA_DEPS) $(BOARD_AVB_BOOT_KEY_PATH) $(BOARD_PREBUILT_VBMETAIMAGE) + @echo "----- Making recovery image ------" + $(hide) $(MKBOOTIMG) $(INTERNAL_RECOVERYIMAGE_ARGS) $(INTERNAL_MKBOOTIMG_VERSION_ARGS) $(BOARD_MKBOOTIMG_ARGS) --output $@ --id > $(RECOVERYIMAGE_ID_FILE) + $(hide) $(call assert-max-image-size,$@,$(BOARD_RECOVERYIMAGE_PARTITION_SIZE),raw) + $(hide) $(AVBTOOL) add_hash_footer \ + --image $@ \ + --partition_size $(BOARD_RECOVERYIMAGE_PARTITION_SIZE) \ + --partition_name recovery $(INTERNAL_AVB_RECOVERY_SIGNING_ARGS) \ + $(BOARD_AVB_RECOVERY_ADD_HASH_FOOTER_ARGS) + $(hide) $(AVBTOOL) append_vbmeta_image --image $@ --partition_size $(BOARD_RECOVERYIMAGE_PARTITION_SIZE) --vbmeta_image $(BOARD_PREBUILT_VBMETAIMAGE) + @echo "Made recovery image: $@" diff --git a/kernel b/prebuilt/Image.gz-dtb similarity index 53% rename from kernel rename to prebuilt/Image.gz-dtb index 8ba8a24d4b0c5a772c41ede8c804eeddfabb6875..011015404379ffeeba7b891b3f623ea6de23a5eb 100644 Binary files a/kernel and b/prebuilt/Image.gz-dtb differ diff --git a/prebuilt/dtb.img b/prebuilt/dtb.img new file mode 100644 index 0000000000000000000000000000000000000000..d59b8ed981d57d588e11b34592fd73721e4869ee Binary files /dev/null and b/prebuilt/dtb.img differ diff --git a/prebuilt/dtbo.img b/prebuilt/dtbo.img new file mode 100644 index 0000000000000000000000000000000000000000..aa5c61f542a95afb18244249e8ec3fb55ef49c10 Binary files /dev/null and b/prebuilt/dtbo.img differ diff --git a/prebuilt/recovery_dtbo.img b/prebuilt/recovery_dtbo.img new file mode 100644 index 0000000000000000000000000000000000000000..7d47f5f5a54d91d2ce963ce7fd2cd5354a9316a4 Binary files /dev/null and b/prebuilt/recovery_dtbo.img differ diff --git a/prebuilt/vbmeta.img b/prebuilt/vbmeta.img new file mode 100644 index 0000000000000000000000000000000000000000..880230f55b616b77ec3ff3ee84496eb21e17ae0d Binary files /dev/null and b/prebuilt/vbmeta.img differ diff --git a/proprietary-files.txt b/proprietary-files.txt index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..3e2dba3c2cdf807a3d0967752ac6bb1ea028387c 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -0,0 +1,43 @@ +# MTK-IMS +bin/vtservice +etc/init/init.vtservice.rc +-framework/mediatek-common.jar +-framework/mediatek-framework.jar +-framework/mediatek-ims-base.jar +-framework/mediatek-ims-common.jar +framework/mediatek-ims-extension-plugin.jar +framework/mediatek-ims-legacy.jar +-framework/mediatek-telecom-common.jar +-framework/mediatek-telephony-base.jar +-framework/mediatek-telephony-common.jar +lib64/libmtkaudio_utils.so +lib64/libmtkavenhancements.so +lib64/libmtklimiter.so +lib64/libmtkperf_client.so +lib64/libmtkshifter.so +lib64/libmtk_vt_wrapper.so +lib64/libvcodec_capenc.so +lib64/libvcodec_cap.so +lib64/vendor.mediatek.hardware.videotelephony@1.0.so +lib/libcomutils.so +lib/libimsma_adapt.so +lib/libimsma_rtp.so +lib/libimsma.so +lib/libimsma_socketwrapper.so +lib/libmtkaudio_utils.so +lib/libmtkavenhancements.so +lib/libmtklimiter.so +lib/libmtkperf_client.so +lib/libmtkshifter.so +lib/libmtk_vt_service.so +lib/libmtk_vt_wrapper.so +lib/libsignal.so +lib/libsink.so +lib/libsource.so +lib/libvcodec_capenc.so +lib/libvcodec_cap.so +lib/libvt_avsync.so +lib/vendor.mediatek.hardware.videotelephony@1.0.so + +# MTK-IMS (ImsService) - Patched to not fail on mMtkImsCallSessionProxy +-priv-app/ImsService/ImsService.apk|1bb78a0aac8de7ecbce5d0ee9432b3f701678601 diff --git a/recovery/root/init.recovery.mt6763.rc b/recovery/root/init.recovery.mt6763.rc index 2fda6021d3c7041f52840f5ce2b82f086cb3d9f7..01a1258139a2bd818e697fd4ccee34725ad9d5a6 100644 --- a/recovery/root/init.recovery.mt6763.rc +++ b/recovery/root/init.recovery.mt6763.rc @@ -13,6 +13,10 @@ on init mkdir /config/usb_gadget/g1/functions/ffs.adb setprop sys.usb.ffs.aio_compat 1 + # Allow writing to preloader partitions + write /sys/block/mmcblk0boot0/force_ro 0 + write /sys/block/mmcblk0boot1/force_ro 0 + on property:ro.debuggable=0 # distinguish USB shoulde connect or not, i.e. CDP vs SDP write /sys/class/udc/musb-hdrc/device/cmode 2 diff --git a/releasetools/releasetools.py b/releasetools/releasetools.py new file mode 100644 index 0000000000000000000000000000000000000000..ae0c23469b9d7c9718530a71262be6b0144e0322 --- /dev/null +++ b/releasetools/releasetools.py @@ -0,0 +1,59 @@ +# +# Copyright (C) 2019 The LineageOS Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import common + +def FullOTA_InstallEnd(info): + OTA_InstallEnd(info, False) + +def IncrementalOTA_InstallEnd(info): + OTA_InstallEnd(info, True) + +def AddImage(info, basename, dest, incremental): + name = basename + if incremental: + input_zip = info.source_zip + else: + input_zip = info.input_zip + data = input_zip.read("IMAGES/" + basename) + common.ZipWriteStr(info.output_zip, name, data) + info.script.AppendExtra('package_extract_file("%s", "%s");' % (name, dest)) + +def AddFirmware(info, basename, dest, dest_second, incremental): + name = basename + if incremental: + input_zip = info.source_zip + else: + input_zip = info.input_zip + data = input_zip.read("RADIO/" + basename) + common.ZipWriteStr(info.output_zip, name, data) + info.script.AppendExtra('package_extract_file("%s", "%s");' % (name, dest)) + if dest_second: + info.script.AppendExtra('package_extract_file("%s", "%s");' % (name, dest_second)) + +def OTA_InstallEnd(info, incremental): + info.script.Print("Patching vendor image...") + AddImage(info, "vendor.img", "/dev/block/by-name/vendor", incremental) + info.script.Print("Patching device-tree image...") + AddImage(info, "dtbo.img", "/dev/block/by-name/dtbo", incremental) + info.script.Print("Patching firmware images...") + AddFirmware(info, "md1dsp.img", "/dev/block/by-name/md1dsp", False, incremental) + AddFirmware(info, "md1img.img", "/dev/block/by-name/md1img", False, incremental) + AddFirmware(info, "spmfw.img", "/dev/block/by-name/spmfw", False, incremental) + AddFirmware(info, "lk.img", "/dev/block/by-name/lk", "/dev/block/by-name/lk2", incremental) + AddFirmware(info, "sspm.img", "/dev/block/by-name/sspm_1", "/dev/block/by-name/sspm_2", incremental) + AddFirmware(info, "tee.img", "/dev/block/by-name/tee1", "/dev/block/by-name/tee2", incremental) + AddFirmware(info, "preloader.img", "/dev/block/mmcblk0boot0", "/dev/block/mmcblk0boot1", incremental) + AddImage(info, "recovery.img", "/dev/block/by-name/recovery", incremental) diff --git a/rootdir/Android.mk b/rootdir/Android.mk index e6e6b05c32831b9e77c4a54a648c15a7722a3b3d..676d98bc698c71668a4371f662229bdc9b9c4c0d 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -9,7 +9,6 @@ LOCAL_SRC_FILES := etc/init.mt6763.rc LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/init include $(BUILD_PREBUILT) - include $(CLEAR_VARS) LOCAL_MODULE := fstab.mt6763 LOCAL_MODULE_TAGS := optional diff --git a/rootdir/etc/fstab.mt6763 b/rootdir/etc/fstab.mt6763 index c3d4d32ba999d43611d0b7e705a28b2e14be4fac..ed7a80793591e7ab4633852ddd0819ed7cd8dda5 100644 --- a/rootdir/etc/fstab.mt6763 +++ b/rootdir/etc/fstab.mt6763 @@ -1,28 +1,33 @@ -# 1 "vendor/mediatek/proprietary/hardware/fstab/mt6763/fstab.in" -# 1 "" -# 1 "" -# 1 "/usr/include/stdc-predef.h" 1 3 4 -# 1 "" 2 -# 1 "vendor/mediatek/proprietary/hardware/fstab/mt6763/fstab.in" -# 105 "vendor/mediatek/proprietary/hardware/fstab/mt6763/fstab.in" -/dev/block/platform/bootdevice/by-name/system / ext4 ro wait,recoveryonly +# 1 "vendor/mediatek/proprietary/hardware/fstab/mt6763/fstab.in.mt6763" +# 1 "" 1 +# 1 "" 3 +# 350 "" 3 +# 1 "" 1 +# 1 "" 2 +# 1 "vendor/mediatek/proprietary/hardware/fstab/mt6763/fstab.in.mt6763" 2 +# 138 "vendor/mediatek/proprietary/hardware/fstab/mt6763/fstab.in.mt6763" +/dev/block/platform/bootdevice/by-name/system /system ext4 ro wait,,avb=boot,first_stage_mount -/dev/block/platform/bootdevice/by-name/vendor /vendor ext4 ro wait,recoveryonly +/dev/block/platform/bootdevice/by-name/vendor /vendor ext4 ro wait,,avb,first_stage_mount +# 154 "vendor/mediatek/proprietary/hardware/fstab/mt6763/fstab.in.mt6763" +/dev/block/platform/bootdevice/by-name/userdata /data ext4 noatime,nosuid,nodev,noauto_da_alloc,errors=panic wait,check,formattable,quota,reservedsize=128m,formattable,resize,forcefdeorfbe=/dev/block/platform/bootdevice/by-name/metadata - - -/dev/block/platform/bootdevice/by-name/userdata /data ext4 noatime,nosuid,nodev,noauto_da_alloc,errors=panic wait,check,formattable,quota,resize,reservedsize=128m,encryptable=/dev/block/platform/bootdevice/by-name/metadata - /dev/block/platform/bootdevice/by-name/cache /cache ext4 noatime,nosuid,nodev,noauto_da_alloc,discard wait,check,formattable + /dev/block/platform/bootdevice/by-name/protect1 /mnt/vendor/protect_f ext4 noatime,nosuid,nodev,noauto_da_alloc,commit=1,nodelalloc wait,check,formattable /dev/block/platform/bootdevice/by-name/protect2 /mnt/vendor/protect_s ext4 noatime,nosuid,nodev,noauto_da_alloc,commit=1,nodelalloc wait,check,formattable -/dev/block/platform/bootdevice/by-name/nvdata /mnt/vendor/nvdata ext4 noatime,nosuid,nodev,noauto_da_alloc,discard wait,check,formattable +/dev/block/platform/bootdevice/by-name/nvdata /mnt/vendor/nvdata ext4 noatime,nosuid,nodev,noauto_da_alloc,commit=1,nodelalloc wait,check,formattable /dev/block/platform/bootdevice/by-name/nvcfg /mnt/vendor/nvcfg ext4 noatime,nosuid,nodev,noauto_da_alloc,commit=1,nodelalloc wait,check,formattable -# 122 "vendor/mediatek/proprietary/hardware/fstab/mt6763/fstab.in" + + +/dev/block/platform/bootdevice/by-name/persist /mnt/vendor/persist ext4 noatime,nosuid,nodev,noauto_da_alloc,commit=1,nodelalloc wait,check,formattable + + +/devices/bootdevice* auto vfat defaults voldmanaged=sdcard0:auto /devices/platform/externdevice* auto auto defaults voldmanaged=sdcard1:auto,encryptable=userdata -/devices/platform/11200000.usb3_xhci* auto vfat defaults voldmanaged=usbotg:auto +/devices/platform/mt_usb* auto vfat defaults voldmanaged=usbotg:auto /dev/block/platform/bootdevice/by-name/frp /persistent emmc defaults defaults @@ -31,8 +36,12 @@ /dev/block/platform/bootdevice/by-name/lk /bootloader emmc defaults defaults /dev/block/platform/bootdevice/by-name/lk2 /bootloader2 emmc defaults defaults /dev/block/platform/bootdevice/by-name/para /misc emmc defaults defaults -/dev/block/platform/bootdevice/by-name/boot /boot emmc defaults defaults -/dev/block/platform/bootdevice/by-name/recovery /recovery emmc defaults defaults + + +/dev/block/platform/bootdevice/by-name/recovery /recovery emmc defaults first_stage_mount,nofail, + +/dev/block/platform/bootdevice/by-name/boot /boot emmc defaults first_stage_mount,nofail, +# 193 "vendor/mediatek/proprietary/hardware/fstab/mt6763/fstab.in.mt6763" /dev/block/platform/bootdevice/by-name/logo /logo emmc defaults defaults /dev/block/platform/bootdevice/by-name/expdb /expdb emmc defaults defaults /dev/block/platform/bootdevice/by-name/seccfg /seccfg emmc defaults defaults @@ -41,8 +50,8 @@ /dev/block/platform/bootdevice/by-name/tee2 /tee2 emmc defaults defaults -/dev/block/platform/bootdevice/by-name/scp1 /scp1 emmc defaults defaults -/dev/block/platform/bootdevice/by-name/scp2 /scp2 emmc defaults defaults + + /dev/block/platform/bootdevice/by-name/sspm_1 /sspm_1 emmc defaults defaults @@ -56,9 +65,9 @@ /dev/block/platform/bootdevice/by-name/md1arm7 /md1arm7 emmc defaults defaults /dev/block/platform/bootdevice/by-name/md3img /md3img emmc defaults defaults -/dev/block/platform/bootdevice/by-name/cam_vpu1 /cam_vpu1 emmc defaults defaults -/dev/block/platform/bootdevice/by-name/cam_vpu2 /cam_vpu2 emmc defaults defaults -/dev/block/platform/bootdevice/by-name/cam_vpu3 /cam_vpu3 emmc defaults defaults + + + /dev/block/platform/bootdevice/by-name/gz1 /gz1 emmc defaults defaults /dev/block/platform/bootdevice/by-name/gz2 /gz2 emmc defaults defaults @@ -71,4 +80,7 @@ /dev/block/platform/bootdevice/by-name/dtbo /dtbo emmc defaults defaults -/dev/block/platform/bootdevice/by-name/otp /otp emmc defaults defaults + + + +/dev/block/platform/bootdevice/by-name/vbmeta /vbmeta emmc defaults defaults diff --git a/setup-makefiles.sh b/setup-makefiles.sh old mode 100644 new mode 100755 index 74862fabdbbe7a362b4869f2022e51de855c7608..4b061ce7350954b5cb45caa76ab3bc9fade0239b --- a/setup-makefiles.sh +++ b/setup-makefiles.sh @@ -17,9 +17,11 @@ set -e -DEVICE=volla -VENDOR=yggdrasil -INITIAL_COPYRIGHT_YEAR=2020 +# Required! +export DEVICE=GS290 +export VENDOR=gigaset + +export INITIAL_COPYRIGHT_YEAR=2020 # Load extract_utils and do some sanity checks MY_DIR="${BASH_SOURCE%/*}" @@ -34,13 +36,13 @@ if [ ! -f "${HELPER}" ]; then fi source "${HELPER}" -# Initialize the helper for common -setup_vendor "${DEVICE}" "${VENDOR}" "${LINEAGE_ROOT}" true +# Initialize the helper +setup_vendor "${DEVICE}" "${VENDOR}" "${LINEAGE_ROOT}" false # Copyright headers and guards -write_headers "yggdrasil" +write_headers "GS290" -# The standard common blobs +# The standard device blobs write_makefiles "${MY_DIR}/proprietary-files.txt" true # Finish