Skip to content

Commit 8ac5a92

Browse files
GangSecuritysysopenci
authored andcommitted
Add AVB hash footer to init_boot image
Solve device path of /dev/block/by-name/init_boot_a not found issue during avb_slot_verify Boot done: Boot android Tracked-On: OAM-132936 Signed-off-by: Gang G Chen <gang.g.chen@intel.com>
1 parent 9ea63fd commit 8ac5a92

2 files changed

Lines changed: 5 additions & 10 deletions

File tree

groups/init-boot/true/BoardConfig.mk

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,13 @@ BOARD_INCLUDE_INIT_BOOTIMAGE := true
88
# ramdisk, and that ramdisk will no longer be included in boot.img.
99
BOARD_INIT_BOOT_IMAGE_PARTITION_SIZE := 16777216
1010

11-
# Enable chained vbmeta for init_boot images
12-
BOARD_AVB_INIT_BOOT_KEY_PATH := external/avb/test/data/testkey_rsa4096.pem
13-
BOARD_AVB_INIT_BOOT_ALGORITHM := SHA256_RSA4096
14-
BOARD_AVB_INIT_BOOT_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)
15-
BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOT_HEADER_VERSION)
1611
BOARD_INIT_BOOT_HEADER_VERSION := 4
1712
BOARD_MKBOOTIMG_INIT_ARGS += --header_version $(BOARD_INIT_BOOT_HEADER_VERSION)
18-
BOARD_AVB_INIT_BOOT_ROLLBACK_INDEX_LOCATION := 3
13+
BOARD_AVB_INIT_BOOT_ADD_HASH_FOOTER_ARGS += --hash_algorithm sha256
1914

20-
ifneq ($(PRODUCT_BUILD_INIT_BOOT_IMAGE), false)
15+
{{#slot-ab}}
2116
AB_OTA_PARTITIONS += init_boot
22-
endif
17+
{{/slot-ab}}
2318

2419
BOARD_USES_RECOVERY_AS_BOOT :=
2520
BOARD_USES_GENERIC_KERNEL_IMAGE := true

groups/init-boot/true/files.spec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[devicefiles]
2-
{{target}}/vendor_boot-ramdisk: vendor_boot-ramdisk
2+
{{target}}/init_boot-ramdisk: init_boot-ramdisk
33

44
[mapping]
5-
{{target}}/vendor_boot-ramdisk: vendor_boot-ramdisk
5+
{{target}}/init_boot-ramdisk: init_boot-ramdisk

0 commit comments

Comments
 (0)