| -rw-r--r-- | BoardConfig.mk | 23 | ||||
| -rw-r--r-- | Kernel.mk | 6 | ||||
| -rw-r--r-- | board-info.txt | 2 | ||||
| -rw-r--r-- | bootloader.img | 3214 | ||||
| -rw-r--r-- | bootloader.img.sha1 | 3 | ||||
| -rw-r--r-- | darwin.mk | 63 | ||||
| -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.verity.amlogic | 16 | ||||
| -rw-r--r-- | recovery/recovery.fstab | 4 | ||||
| -rw-r--r-- | upgrade/u-boot.bin.sd.bin | 3217 | ||||
| -rw-r--r-- | upgrade/u-boot.bin.usb.bl2 | 2 | ||||
| -rw-r--r-- | upgrade/u-boot.bin.usb.tpl | 3212 |
14 files changed, 4858 insertions, 4933 deletions
@@ -60,6 +60,7 @@ BOARD_AML_VENDOR_PATH := vendor/amlogic/ampere/ BOARD_WIDEVINE_TA_PATH := vendor/amlogic/ #AB_OTA_UPDATER :=true +#BUILD_WITH_AVB := true ifeq ($(AB_OTA_UPDATER),true) AB_OTA_PARTITIONS := \ @@ -70,10 +71,29 @@ 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 +ifeq ($(ANDROID_BUILD_TYPE), 64) +TARGET_PARTITION_DTSI := partition_mbox_normal_P_64.dtsi +ifneq ($(BUILD_WITH_AVB),true) +TARGET_FIRMWARE_DTSI := firmware_normal.dtsi +else +TARGET_FIRMWARE_DTSI := firmware_avb.dtsi +endif +else +TARGET_PARTITION_DTSI := partition_mbox_normal_P_32.dtsi +ifneq ($(BUILD_WITH_AVB),true) +TARGET_FIRMWARE_DTSI := firmware_normal.dtsi +else +TARGET_FIRMWARE_DTSI := firmware_avb.dtsi +endif +endif + BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016 BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4 endif @@ -139,41 +159,18 @@ PRODUCT_PACKAGES += \ 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/darwin/fstab.AB.verity.amlogic:root/fstab.amlogic -else -PRODUCT_COPY_FILES += \ - device/amlogic/darwin/fstab.AB.amlogic:root/fstab.amlogic -endif -else -ifeq ($(BUILD_WITH_DM_VERITY), true) -PRODUCT_COPY_FILES += \ - device/amlogic/darwin/fstab.verity.amlogic:root/fstab.amlogic -else PRODUCT_COPY_FILES += \ device/amlogic/darwin/fstab.amlogic:root/fstab.amlogic -endif -endif -else -ifeq ($(AB_OTA_UPDATER),true) -ifeq ($(BUILD_WITH_DM_VERITY), true) -PRODUCT_COPY_FILES += \ - device/amlogic/darwin/fstab.AB.verity.amlogic:recovery/root/fstab.amlogic -else -PRODUCT_COPY_FILES += \ - device/amlogic/darwin/fstab.AB.amlogic:recovery/root/fstab.amlogic -endif -else -ifeq ($(BUILD_WITH_DM_VERITY), true) -PRODUCT_COPY_FILES += \ - device/amlogic/darwin/fstab.verity.amlogic:recovery/root/fstab.amlogic else PRODUCT_COPY_FILES += \ device/amlogic/darwin/fstab.amlogic:recovery/root/fstab.amlogic endif -endif + +ifeq ($(BUILD_WITH_AVB),true) +BOARD_AVB_ENABLE := true +BOARD_AVB_ALGORITHM := SHA256_RSA2048 +BOARD_AVB_KEY_PATH := device/amlogic/common/security/testkey_rsa2048.pem +BOARD_AVB_ROLLBACK_INDEX := 0 endif ######################################################################### @@ -344,6 +341,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 \ |