| -rw-r--r-- | BoardConfig.mk | 47 | ||||
| -rw-r--r-- | Kernel.mk | 6 | ||||
| -rw-r--r-- | device.mk | 9 | ||||
| -rw-r--r-- | einstein.mk | 78 | ||||
| -rw-r--r-- | fstab.AB.amlogic | 14 | ||||
| -rw-r--r-- | fstab.AB.verity.amlogic | 14 | ||||
| -rw-r--r-- | fstab.amlogic | 1 | ||||
| -rw-r--r-- | fstab.system.amlogic (renamed from fstab.verity.amlogic) | 7 | ||||
| -rw-r--r-- | recovery/recovery.fstab | 18 | ||||
| -rw-r--r-- | recovery/recovery_system.fstab | 29 |
10 files changed, 151 insertions, 72 deletions
diff --git a/einstein.mk b/einstein.mk index 80ac11b..6ff801b 100644 --- a/einstein.mk +++ b/einstein.mk @@ -83,6 +83,15 @@ BOARD_WIDEVINE_TA_PATH := vendor/amlogic/ OTA_UP_PART_NUM_CHANGED := true #AB_OTA_UPDATER :=true +BUILD_WITH_AVB := true + +ifeq ($(BUILD_WITH_AVB),true) +#BOARD_AVB_ENABLE := true +BOARD_BUILD_DISABLED_VBMETAIMAGE := true +BOARD_AVB_ALGORITHM := SHA256_RSA2048 +BOARD_AVB_KEY_PATH := device/amlogic/common/security/testkey_rsa2048.pem +BOARD_AVB_ROLLBACK_INDEX := 0 +endif ifeq ($(AB_OTA_UPDATER),true) AB_OTA_PARTITIONS := \ @@ -93,10 +102,39 @@ AB_OTA_PARTITIONS := \ TARGET_BOOTLOADER_CONTROL_BLOCK := true TARGET_NO_RECOVERY := true +ifneq ($(BUILD_WITH_AVB),true) TARGET_PARTITION_DTSI := partition_mbox_ab.dtsi else +TARGET_PARTITION_DTSI := partition_mbox_ab_avb.dtsi +endif +else TARGET_NO_RECOVERY := false -TARGET_PARTITION_DTSI := partition_mbox_normal.dtsi + +BOARD_BUILD_SYSTEM_ROOT_IMAGE := true + +ifeq ($(ANDROID_BUILD_TYPE), 64) +TARGET_PARTITION_DTSI := partition_mbox_normal_P_64.dtsi +else +TARGET_PARTITION_DTSI := partition_mbox_normal_P_32.dtsi +endif + +ifneq ($(BUILD_WITH_AVB),true) +TARGET_FIRMWARE_DTSI := firmware_normal.dtsi +else +ifeq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE), true) +ifeq ($(BOARD_BUILD_DISABLED_VBMETAIMAGE), true) +TARGET_FIRMWARE_DTSI := firmware_system.dtsi +else +TARGET_FIRMWARE_DTSI := firmware_avb_system.dtsi +endif +else +ifeq ($(BOARD_BUILD_DISABLED_VBMETAIMAGE), true) +TARGET_FIRMWARE_DTSI := firmware_normal.dtsi +else +TARGET_FIRMWARE_DTSI := firmware_avb.dtsi +endif +endif +endif BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016 BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4 @@ -165,43 +203,19 @@ PRODUCT_PACKAGES += \ fs_mgr \ slideshow endif -ifneq ($(BOARD_USES_RECOVERY_AS_BOOT), true) -ifeq ($(AB_OTA_UPDATER),true) -ifeq ($(BUILD_WITH_DM_VERITY), true) -PRODUCT_COPY_FILES += \ - device/amlogic/einstein/fstab.AB.verity.amlogic:root/fstab.amlogic -else -PRODUCT_COPY_FILES += \ - device/amlogic/einstein/fstab.AB.amlogic:root/fstab.amlogic -endif -else -ifeq ($(BUILD_WITH_DM_VERITY), true) + +ifeq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE), true) PRODUCT_COPY_FILES += \ - device/amlogic/einstein/fstab.verity.amlogic:root/fstab.amlogic + device/amlogic/einstein/fstab.system.amlogic:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.amlogic else +ifneq ($(BOARD_USES_RECOVERY_AS_BOOT), true) PRODUCT_COPY_FILES += \ device/amlogic/einstein/fstab.amlogic:root/fstab.amlogic -endif -endif -else -ifeq ($(AB_OTA_UPDATER),true) -ifeq ($(BUILD_WITH_DM_VERITY), true) -PRODUCT_COPY_FILES += \ - device/amlogic/einstein/fstab.AB.verity.amlogic:recovery/root/fstab.amlogic -else -PRODUCT_COPY_FILES += \ - device/amlogic/einstein/fstab.AB.amlogic:recovery/root/fstab.amlogic -endif -else -ifeq ($(BUILD_WITH_DM_VERITY), true) -PRODUCT_COPY_FILES += \ - device/amlogic/einstein/fstab.verity.amlogic:recovery/root/fstab.amlogic else PRODUCT_COPY_FILES += \ device/amlogic/einstein/fstab.amlogic:recovery/root/fstab.amlogic endif endif -endif ######################################################################### # @@ -368,6 +382,12 @@ PRODUCT_COPY_FILES += \ # A/B update # ######################################################################### +ifeq ($(BUILD_WITH_AVB),true) +PRODUCT_PACKAGES += \ + bootctrl.avb \ + libavb_user +endif + ifeq ($(AB_OTA_UPDATER),true) PRODUCT_PACKAGES += \ bootctrl.amlogic \ |