Splitting repositories for EEA / TEE support

Android.mk

@@ -1,6 +1,6 @@
-ifneq ($(filter Atom_XL,$(TARGET_DEVICE)),)
+ifneq ($(filter Atom_XL_EEA ,$(TARGET_DEVICE)),)
 
-LOCAL_PATH := device/Unihertz/Atom_XL
+LOCAL_PATH := device/Unihertz/Atom_LXL
 
 include $(call all-makefiles-under,$(LOCAL_PATH))
 

AndroidProducts.mk

@@ -1,3 +1,3 @@
-LOCAL_PATH := device/Unihertz/Atom_XL
+LOCAL_PATH := device/Unihertz/Atom_XL_EEA
 
-PRODUCT_MAKEFILES := $(LOCAL_PATH)/omni_Atom_XL.mk
+PRODUCT_MAKEFILES := $(LOCAL_PATH)/omni_Atom_XL_EEA.mk

BoardConfig.mk

@@ -1,148 +1,17 @@
-LOCAL_PATH := device/Unihertz/Atom_XL
+# Copyright (C) 2020 The LineageOS Project
+#
+# SPDX-License-Identifier: Apache-2.0
+#
 
-# For building with minimal manifest
-ALLOW_MISSING_DEPENDENCIES := true
+-include device/Unihertz/Atom_LXL/BoardConfigCommon.mk
 
-# Architecture
-TARGET_ARCH := arm64
-TARGET_ARCH_VARIANT := armv8-a
-TARGET_CPU_ABI := arm64-v8a
-TARGET_CPU_ABI2 :=
-TARGET_CPU_VARIANT := generic
-
-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 := generic
-
-TARGET_CPU_ABI_LIST_64_BIT := $(TARGET_CPU_ABI)
-TARGET_CPU_ABI_LIST_32_BIT := $(TARGET_2ND_CPU_ABI),$(TARGET_2ND_CPU_ABI2)
-TARGET_CPU_ABI_LIST := $(TARGET_CPU_ABI_LIST_64_BIT),$(TARGET_CPU_ABI_LIST_32_BIT)
-
-TARGET_BOARD_SUFFIX := _64
-TARGET_USES_64_BIT_BINDER := true
-TARGET_SUPPORTS_64_BIT_APPS := true
-
-# Platform
-TARGET_BOARD_PLATFORM := mt6771
+DEVICE_REGION_PATH := device/Unihertz/Atom_XL_EEA
 
 # Bootloader
 TARGET_BOOTLOADER_BOARD_NAME := g63v71c2k_dfl_seea
-TARGET_NO_BOOTLOADER := true
-
-# These are for MTK Chipsets only
-BOARD_USES_MTK_HARDWARE := true
-BOARD_HAS_MTK_HARDWARE := true
-MTK_HARDWARE := true
-
-# File systems and partitions
-BOARD_HAS_LARGE_FILESYSTEM := true
-BOARD_BOOTIMAGE_PARTITION_SIZE := 33554432
-BOARD_RECOVERYIMAGE_PARTITION_SIZE := 33554432
-BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
-BOARD_CACHEIMAGE_PARTITION_SIZE := 452984832
-BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
-BOARD_USERDATAIMAGE_PARTITION_SIZE := 3221225472
-
-BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := ext4
-BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
-
-BOARD_FLASH_BLOCK_SIZE := 131072
-TARGET_COPY_OUT_VENDOR := vendor
-
-# Dynamic Partition
-BOARD_SUPER_PARTITION_SIZE := 4831838208
-BOARD_SUPER_PARTITION_GROUPS := qti_dynamic_partitions
-BOARD_QTI_DYNAMIC_PARTITIONS_SIZE := 4831838208
-BOARD_QTI_DYNAMIC_PARTITIONS_PARTITION_LIST := product vendor system
-
-# System as root
-#BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
-BOARD_SUPPRESS_SECURE_ERASE := true
 
 # Kernel
-BOARD_KERNEL_CMDLINE := bootopt=64S3,32N2,64N2 buildvariant=$(TARGET_BUILD_VARIANT) androidboot.selinux=permissive
-BOARD_KERNEL_BASE := 0x40078000
-BOARD_KERNEL_PAGESIZE := 2048
-BOARD_KERNEL_OFFSET := 0x00008000
-BOARD_RAMDISK_OFFSET := 0x14f88000
-BOARD_KERNEL_SECOND_OFFSET := 0x00e88000
-BOARD_DTB_OFFSET := 0x13f88000
-BOARD_BOOT_HEADER_VERSION := 2
-BOARD_KERNEL_TAGS_OFFSET := 0x13f88000
-BOARD_KERNEL_IMAGE_NAME := Image.gz
-TARGET_PREBUILT_KERNEL := $(LOCAL_PATH)/prebuilt/Image.gz
+TARGET_PREBUILT_KERNEL := $(DEVICE_REGION_PATH)/prebuilt/Image.gz
 TARGET_PREBUILT_RECOVERY_KERNEL := $(LOCAL_PATH)/prebuilt/Image.gz
-BOARD_PREBUILT_DTBOIMAGE := $(LOCAL_PATH)/prebuilt/dtbo.img
-BOARD_PREBUILT_DTBIMAGE_DIR := $(LOCAL_PATH)/prebuilt/dtb
-BOARD_INCLUDE_DTB_IN_BOOTIMG := true
-BOARD_MKBOOTIMG_ARGS += --base $(BOARD_KERNEL_BASE)
-BOARD_MKBOOTIMG_ARGS += --pagesize $(BOARD_KERNEL_PAGESIZE)
-BOARD_MKBOOTIMG_ARGS += --ramdisk_offset $(BOARD_RAMDISK_OFFSET)
-BOARD_MKBOOTIMG_ARGS += --tags_offset $(BOARD_KERNEL_TAGS_OFFSET)
-BOARD_MKBOOTIMG_ARGS += --kernel_offset $(BOARD_KERNEL_OFFSET)
-BOARD_MKBOOTIMG_ARGS += --second_offset $(BOARD_KERNEL_SECOND_OFFSET)
-BOARD_MKBOOTIMG_ARGS += --dtb_offset $(BOARD_DTB_OFFSET)
-BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOT_HEADER_VERSION)
-
-# Charger
-BOARD_CHARGER_ENABLE_SUSPEND := true
-
-# Crypto
-TW_INCLUDE_CRYPTO := true
-#TW_INCLUDE_CRYPTO_FBE := true
-TW_INCLUDE_FBE := true
-#TW_INCLUDE_FBE_METADATA_DECRYPT := true
-#BOARD_USES_METADATA_PARTITION := true
-
-TARGET_RECOVERY_DEVICE_MODULES += libpuresoftkeymasterdevice
-TARGET_RECOVERY_DEVICE_MODULES += ashmemd_aidl_interface-cpp
-TARGET_RECOVERY_DEVICE_MODULES += libashmemd_client
-TW_RECOVERY_ADDITIONAL_RELINK_LIBRARY_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libpuresoftkeymasterdevice.so
-TW_RECOVERY_ADDITIONAL_RELINK_LIBRARY_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libashmemd_client.so 
-TW_RECOVERY_ADDITIONAL_RELINK_LIBRARY_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/ashmemd_aidl_interface-cpp.so
-
-# TWRP Configuration
-TARGET_RECOVERY_FSTAB := $(LOCAL_PATH)/twrp.fstab
-TARGET_RECOVERY_INITRC := $(LOCAL_PATH)/recovery/root/init.recovery.mt6771.rc
-TW_EXCLUDE_DEFAULT_USB_INIT := true
-
-TW_BRIGHTNESS_PATH := /sys/class/leds/lcd-backlight/brightness
-TW_SECONDARY_BRIGHTNESS_PATH := /sys/devices/platform/leds-mt65xx/leds/lcd-backlight/brightness
-TW_MAX_BRIGHTNESS := 255
-TW_DEFAULT_BRIGHTNESS := 80
-
-# TW_THEME := portrait_hdpi
-DEVICE_RESOLUTION := 640x1136
-TARGET_SCREEN_HEIGHT := 1136
-TARGET_SCREEN_WIDTH := 640
-
-TW_SCREEN_BLANK_ON_BOOT := true
-TW_INPUT_BLACKLIST := "hbtp_vm"  
-TW_NO_USB_STORAGE := false
-TW_USE_MODEL_HARDWARE_ID_FOR_DEVICE_ID := true
-
-TW_INTERNAL_STORAGE_PATH := "/data/media/0"
-TW_INTERNAL_STORAGE_MOUNT_POINT := "data"
-TW_EXTERNAL_STORAGE_PATH := "/external_sd"
-TW_EXTERNAL_STORAGE_MOUNT_POINT := "external_sd"
-TW_MTP_DEVICE := /dev/mtp_usb
-TW_DEFAULT_EXTERNAL_STORAGE := true
-
-TW_USE_TOOLBOX := true
-TW_EXTRA_LANGUAGES := false
-TW_DEFAULT_LANGUAGE := en                    
-TW_NO_SCREEN_BLANK := true
-TW_NO_BATT_PERCENT := false
-TW_EXCLUDE_TWRPAPP := true
-RECOVERY_SDCARD_ON_DATA := true
-TARGET_DISABLE_TRIPLE_BUFFERING := false
-
-# Debug
-TWRP_INCLUDE_LOGCAT := true
-TARGET_USES_LOGD := true
-
-# Hack to get keymaster to recognize the key files
-PLATFORM_SECURITY_PATCH := 2099-12-31
-VENDOR_SECURITY_PATCH := 2020-09-05
+BOARD_PREBUILT_DTBOIMAGE := $(DEVICE_REGION_PATH)/prebuilt/dtbo.img
+BOARD_PREBUILT_DTBIMAGE_DIR := $(DEVICE_REGION_PATH)/prebuilt/dtb

README.md

@@ -1,9 +1,10 @@
-Device configuration for Unihertz Atom XL (Atom_XL)
+Device configuration for Unihertz Atom XL (Atom_XL) EEA (european union)
 =================================================
-This device tree is intended for a special useage in a TWRP or similar environment.
-If you are looking for a device tree for the usage in a LineageOS or similar environment head over to https://github.com/ADeadTrousers/android_device_Unihertz_Atom_XL.
+This region device tree is intended for a special useage in a TWRP or similar environment.
 
-The Unihertz Atom XL (codenamed simply _"Atom_XL"_) is a rugged small smartphone from Unihertz, released in July 2020. It is similar to the Atom L but with integrated amateur radio support.
+If you are looking for a device tree for the usage in a LineageOS or similar environment head over to https://github.com/ADeadTrousers/android_device_Unihertz_Atom_LXL.
+
+The Unihertz Atom XL (codenamed simply _"Atom_XL"_) is a rugged small smartphone from Unihertz, released in July 2020. It is similar to the Atom L but with an integrated digital mobile radio (DMR).
 
 ![](docs/images/atom_xl.png)
 
@@ -20,12 +21,18 @@ The Unihertz Atom XL (codenamed simply _"Atom_XL"_) is a rugged small smartphone
 | Camera (Rear - Main)    | 48MP                                                                                                                           |
 | Camera (Front)          | 8MP                                                                                                                            |
 
+# Dependencies
+
+Additionally to this region device tree, you'll need the common device tree
+
+- [Atom LXL](https://github.com/ADeadTrousers/twrp_device_Unihertz_Atom_LXL)
+
 ## Documentations
 
-- [HOW-TO-BUILD.md](docs/HOW-TO-BUILD.md) - Building instructions for TWRP.
-- [HOW-TO-INSTALL.md](docs/HOW-TO-INSTALL.md) - Installation instructions for the Atom XL.
-- [HOW-TO-UPDATE.md](docs/HOW-TO-UPDATE.md) - Update instructions for the Atom XL.
-- [HOW-TO-PATCH.md](docs/HOW-TO-PATCH.md) - Patching the prebuilt kernel to activate touchscreen in recovery mode.
+- [HOW-TO-BUILD.md](https://github.com/ADeadTrousers/twrp_device_Unihertz_Atom_LXL/blob/master/docs/HOW-TO-BUILD.md) - Building instructions for TWRP.
+- [HOW-TO-INSTALL.md](https://github.com/ADeadTrousers/twrp_device_Unihertz_Atom_LXL/blob/master/docs/HOW-TO-INSTALL.md) - Installation instructions for the Atom XL.
+- [HOW-TO-UPDATE.md](https://github.com/ADeadTrousers/twrp_device_Unihertz_Atom_LXL/blob/master/docs/HOW-TO-UPDATE.md) - Update instructions for the Atom XL.
+- [HOW-TO-PATCH.md](https://github.com/ADeadTrousers/twrp_device_Unihertz_Atom_LXL/blob/master/docs/HOW-TO-PATCH.md) - Patching the prebuilt kernel to activate touchscreen in recovery mode.
 
 ## Special Thanks To