From 6507e084c63181bd3afc22ff0e7548cfdce14d21 Mon Sep 17 00:00:00 2001 From: Jan Altensen Date: Fri, 22 Apr 2022 04:29:01 +0200 Subject: [PATCH 1/4] emerald: enable AVB Change-Id: If194ce97fac7381f6a7eb77f1847c5d87f1cd0fc --- BoardConfig.mk | 39 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/BoardConfig.mk b/BoardConfig.mk index 50829e0..5e9af8a 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -22,7 +22,9 @@ AB_OTA_PARTITIONS += \ product \ system \ vendor \ - vbmeta + vbmeta \ + vbmeta_system \ + vbmeta_vendor # Architecture TARGET_ARCH := arm64 @@ -46,8 +48,39 @@ DEXPREOPT_GENERATE_APEX_IMAGE := true # AVB BOARD_AVB_ENABLE := true -BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --set_hashtree_disabled_flag -BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --flags 2 +ifeq (eng,$(TARGET_BUILD_VARIANT)) +BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --flags 3 +endif + +BOARD_AVB_ALGORITHM := SHA256_RSA2048 +BOARD_AVB_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem +BOARD_AVB_ROLLBACK_INDEX := 0 + +BOARD_AVB_BOOT_ALGORITHM := $(BOARD_AVB_ALGORITHM) +BOARD_AVB_BOOT_KEY_PATH := $(BOARD_AVB_KEY_PATH) +BOARD_AVB_BOOT_ROLLBACK_INDEX := 0 +BOARD_AVB_BOOT_ROLLBACK_INDEX_LOCATION := 3 + +BOARD_AVB_RECOVERY_ALGORITHM := $(BOARD_AVB_ALGORITHM) +BOARD_AVB_RECOVERY_KEY_PATH := $(BOARD_AVB_KEY_PATH) +BOARD_AVB_RECOVERY_ROLLBACK_INDEX := 0 +BOARD_AVB_RECOVERY_ROLLBACK_INDEX_LOCATION := 1 + +BOARD_AVB_VBMETA_SYSTEM := system product +BOARD_AVB_VBMETA_SYSTEM_ALGORITHM := $(BOARD_AVB_ALGORITHM) +BOARD_AVB_VBMETA_SYSTEM_KEY_PATH := $(BOARD_AVB_KEY_PATH) +BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX := 0 +BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX_LOCATION := 2 + +BOARD_AVB_VBMETA_VENDOR := vendor +BOARD_AVB_VBMETA_VENDOR_ALGORITHM := $(BOARD_AVB_ALGORITHM) +BOARD_AVB_VBMETA_VENDOR_KEY_PATH := $(BOARD_AVB_KEY_PATH) +BOARD_AVB_VBMETA_VENDOR_ROLLBACK_INDEX := 0 +BOARD_AVB_VBMETA_VENDOR_ROLLBACK_INDEX_LOCATION := 4 + +BOARD_AVB_SYSTEM_ADD_HASHTREE_FOOTER_ARGS := --hash_algorithm sha256 +BOARD_AVB_PRODUCT_ADD_HASHTREE_FOOTER_ARGS := --hash_algorithm sha256 +BOARD_AVB_VENDOR_ADD_HASHTREE_FOOTER_ARGS := --hash_algorithm sha256 # Bootloader TARGET_NO_BOOTLOADER := true -- GitLab From 63f5123026bfb78e9bf9b7b30028bc6cbad1e068 Mon Sep 17 00:00:00 2001 From: Jan Altensen Date: Mon, 23 May 2022 08:45:34 +0200 Subject: [PATCH 2/4] emerald: use prebuilt dtbo image * the dtbo image is signed by teracube for secure-boot, we cannot build it ourselves and lock the bootloader * extracted from Teracube_2e_A11_05_20211102 Change-Id: I74f984751bd417e5aadda51010dec6be24960a77 --- BoardConfig.mk | 3 +-- dtbo/dtbo-verified.img | Bin 0 -> 56048 bytes dtbo/dtbo.mk | 13 ------------- 3 files changed, 1 insertion(+), 15 deletions(-) create mode 100644 dtbo/dtbo-verified.img delete mode 100644 dtbo/dtbo.mk diff --git a/BoardConfig.mk b/BoardConfig.mk index 5e9af8a..45fff84 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -119,8 +119,7 @@ TARGET_KERNEL_CONFIG := emerald_defconfig TARGET_KERNEL_CLANG_COMPILE := true BOARD_INCLUDE_DTB_IN_BOOTIMG := true -BOARD_KERNEL_SEPARATED_DTBO := true -BOARD_CUSTOM_DTBOIMG_MK := $(DEVICE_PATH)/dtbo/dtbo.mk +BOARD_PREBUILT_DTBOIMAGE := device/teracube/emerald/dtbo/dtbo-verified.img BOARD_MKBOOTIMG_ARGS += --dtb_offset $(BOARD_DTB_OFFSET) BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOTIMG_HEADER_VERSION) diff --git a/dtbo/dtbo-verified.img b/dtbo/dtbo-verified.img new file mode 100644 index 0000000000000000000000000000000000000000..0d7c61238dcd99f39ad69dc70d8d558c2c73a091 GIT binary patch literal 56048 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 literal 0 HcmV?d00001 diff --git a/dtbo/dtbo.mk b/dtbo/dtbo.mk deleted file mode 100644 index aedcdbd..0000000 --- a/dtbo/dtbo.mk +++ /dev/null @@ -1,13 +0,0 @@ -BOARD_KERNEL_DTBO_CFG := dtboimg.cfg -MKDTBOIMG := system/libufdt/utils/src/mkdtboimg.py -APPEND_CERTS := $(DEVICE_PATH)/dtbo/append_certs.py - -# BUG: mkdtboimg.py doesn't support absolute paths yet. Fix this later. -define build-dtboimage-target-from-cfg - $(call pretty,"Target dtbo image from cfg: $(BOARD_PREBUILT_DTBOIMAGE)") - $(hide) $(MKDTBOIMG) cfg_create $@ $(KERNEL_OUT)/$(BOARD_KERNEL_DTBO_CFG) -d / - $(hide) chmod a+r $@ -endef - -$(BOARD_PREBUILT_DTBOIMAGE): $(MKDTBOIMG) $(INSTALLED_KERNEL_TARGET) - $(build-dtboimage-target-from-cfg) -- GitLab From d80dbc60140720d216b08d1b6c44c8d0d09614c6 Mon Sep 17 00:00:00 2001 From: Jan Altensen Date: Mon, 23 May 2022 08:47:37 +0200 Subject: [PATCH 3/4] emerald: use /e/ specific avb key if present Change-Id: I222ef32fbe9ca58574f3e46580c7f076548c787c --- BoardConfig.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/BoardConfig.mk b/BoardConfig.mk index 45fff84..a221ebe 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -53,7 +53,11 @@ BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --flags 3 endif BOARD_AVB_ALGORITHM := SHA256_RSA2048 +ifneq (,$(wildcard $($KEYS_DIR)/avb_rsa2048.pem)) +BOARD_AVB_KEY_PATH := $($KEYS_DIR)/avb_rsa2048.pem +else BOARD_AVB_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem +endif BOARD_AVB_ROLLBACK_INDEX := 0 BOARD_AVB_BOOT_ALGORITHM := $(BOARD_AVB_ALGORITHM) -- GitLab From f52be8d8ff6409509f1278b571cecd221bbc562c Mon Sep 17 00:00:00 2001 From: Jan Altensen Date: Wed, 1 Jun 2022 02:40:25 +0200 Subject: [PATCH 4/4] emerald: show oem unlock switch Change-Id: I8aa2efd72ac7c2cdc4555af36160923b2689548f --- configs/properties/vendor.prop | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/properties/vendor.prop b/configs/properties/vendor.prop index de9b393..a363fb2 100644 --- a/configs/properties/vendor.prop +++ b/configs/properties/vendor.prop @@ -137,6 +137,7 @@ ro.surface_flinger.force_hwc_copy_for_virtual_displays=true ro.surface_flinger.max_frame_buffer_acquired_buffers=3 persist.vendor.md_c2k_cap_dep_check=0 ro.incremental.enable=yes +ro.oem_unlock_supported=1 # Hardware Platform ro.hardware=mt6765 -- GitLab