summaryrefslogtreecommitdiff
Diffstat
-rw-r--r--BoardConfig.mk47
-rw-r--r--Kernel.mk6
-rw-r--r--device.mk9
-rw-r--r--einstein.mk78
-rw-r--r--fstab.AB.amlogic14
-rw-r--r--fstab.AB.verity.amlogic14
-rw-r--r--fstab.amlogic1
-rw-r--r--fstab.system.amlogic (renamed from fstab.verity.amlogic)7
-rw-r--r--recovery/recovery.fstab18
-rw-r--r--recovery/recovery_system.fstab29
10 files changed, 151 insertions, 72 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 88a59a3..8777237 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -64,23 +64,60 @@ BOARD_HAVE_FLASHLIGHT := false
BOARD_HAVE_HW_JPEGENC := true
TARGET_USERIMAGES_USE_EXT4 := true
-BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1946157056
BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800
BOARD_FLASH_BLOCK_SIZE := 4096
+
BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
-BOARD_VENDORIMAGE_PARTITION_SIZE := 268435456
BOARD_USES_VENDORIMAGE := true
TARGET_COPY_OUT_VENDOR := vendor
-BOARD_ROOT_EXTRA_FOLDERS := odm
+ifneq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE), true)
+BOARD_ROOT_EXTRA_FOLDERS += odm
+endif
+
BOARD_ODMIMAGE_FILE_SYSTEM_TYPE := ext4
-BOARD_ODMIMAGE_PARTITION_SIZE := 268435456
BOARD_USES_ODMIMAGE := true
+BOARD_USES_METADATA_PARTITION := true
+
+BOARD_USES_PRODUCTIMAGE := true
+BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4
+TARGET_COPY_OUT_PRODUCT := product
+
+BOARD_DTBIMAGE_PARTITION_SIZE := 262144
+BOARD_BOOTIMAGE_PARTITION_SIZE := 16777216
+BOARD_RECOVERYIMAGE_PARTITION_SIZE := 25165824
+ifeq ($(ANDROID_BUILD_TYPE), 64)
+BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1551892480
+BOARD_VENDORIMAGE_PARTITION_SIZE := 268435456
+BOARD_ODMIMAGE_PARTITION_SIZE := 134217728
+BOARD_PRODUCTIMAGE_PARTITION_SIZE := 134217728
+else
+BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1342177280
+BOARD_VENDORIMAGE_PARTITION_SIZE := 268435456
+BOARD_ODMIMAGE_PARTITION_SIZE := 134217728
+BOARD_PRODUCTIMAGE_PARTITION_SIZE := 134217728
+endif
+
+ifneq ($(USE_USB_AS_HOST),true)
+BOARD_KERNEL_CMDLINE += --cmdline "otg_device=1"
+endif
+
+ifeq ($(BOARD_BUILD_DISABLED_VBMETAIMAGE), true)
+ifeq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE), true)
+BOARD_KERNEL_CMDLINE += --cmdline "root=179:18"
+endif
+endif
+
TARGET_SUPPORT_USB_BURNING_V2 := true
TARGET_AMLOGIC_RES_PACKAGE := device/amlogic/einstein/logo_img_files
+
+ifeq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE), true)
+TARGET_RECOVERY_FSTAB := device/amlogic/einstein/recovery/recovery_system.fstab
+else
TARGET_RECOVERY_FSTAB := device/amlogic/einstein/recovery/recovery.fstab
+endif
#BOARD_HAL_STATIC_LIBRARIES := libhealthd.mboxdefault
@@ -106,7 +143,7 @@ TARGET_RECOVERY_UI_LIB += \
libsystemcontrol_static
ifneq ($(AB_OTA_UPDATER),true)
TARGET_RECOVERY_UPDATER_LIBS := libinstall_amlogic
-TARGET_RECOVERY_UPDATER_EXTRA_LIBS += libenv libsystemcontrol_static
+TARGET_RECOVERY_UPDATER_EXTRA_LIBS += libenv libsystemcontrol_static libsecurity libfdt
endif
include device/amlogic/common/sepolicy.mk