| -rw-r--r-- | BoardConfig.mk | 22 | ||||
| -rw-r--r-- | Kernel.mk | 6 | ||||
| -rw-r--r-- | board-info.txt | 2 | ||||
| -rw-r--r-- | bootloader.img | 4461 | ||||
| -rw-r--r-- | bootloader.img.sha1 | 1 | ||||
| -rw-r--r-- | darwin.mk | 36 | ||||
| -rw-r--r-- | device.mk | 9 | ||||
| -rw-r--r-- | fstab.system.amlogic | 17 | ||||
| -rw-r--r-- | recovery/recovery_system.fstab | 29 | ||||
| -rw-r--r-- | upgrade/u-boot.bin.sd.bin | 4466 | ||||
| -rw-r--r-- | upgrade/u-boot.bin.usb.bl2 | 2 | ||||
| -rw-r--r-- | upgrade/u-boot.bin.usb.tpl | 4459 |
12 files changed, 6869 insertions, 6641 deletions
@@ -62,6 +62,14 @@ BOARD_WIDEVINE_TA_PATH := vendor/amlogic/ #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 := \ boot \ @@ -78,21 +86,32 @@ TARGET_PARTITION_DTSI := partition_mbox_ab_avb.dtsi endif else TARGET_NO_RECOVERY := false + +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 -TARGET_FIRMWARE_DTSI := firmware_avb.dtsi +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 -TARGET_PARTITION_DTSI := partition_mbox_normal_P_32.dtsi -ifneq ($(BUILD_WITH_AVB),true) +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 @@ -160,6 +179,11 @@ PRODUCT_PACKAGES += \ fs_mgr \ slideshow endif + +ifeq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE), true) +PRODUCT_COPY_FILES += \ + device/amlogic/darwin/fstab.system.amlogic:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.amlogic +else ifneq ($(BOARD_USES_RECOVERY_AS_BOOT), true) PRODUCT_COPY_FILES += \ device/amlogic/darwin/fstab.amlogic:root/fstab.amlogic @@ -167,12 +191,6 @@ else PRODUCT_COPY_FILES += \ device/amlogic/darwin/fstab.amlogic:recovery/root/fstab.amlogic 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 ######################################################################### |