Skip to content

Commit 2051f86

Browse files
GangSecuritysysopenci
authored andcommitted
Add init_boot to GPT images
boot-debug.img will not be generate if enables init_boot image Test Done: Boot Tracked-On: OAM-132990 Signed-off-by: Gang G Chen <gang.g.chen@intel.com>
1 parent 172cbd3 commit 2051f86

7 files changed

Lines changed: 19 additions & 17 deletions

File tree

groups/gptbuild/mixinfo.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
[mixinfo]
2-
deps = tee vendor-partition product-partition odm-partition acpi-partition acpio-partition dynamic-partitions vendor-boot
2+
deps = tee vendor-partition product-partition odm-partition acpi-partition acpio-partition dynamic-partitions vendor-boot init-boot

groups/gptbuild/true/AndroidBoard.mk

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,9 @@ $(GPTIMAGE_BIN): \
161161
{{#vendor-boot}}
162162
--vendor_boot $(TARGET_IMAGE_PATH)/vendor_boot.img \
163163
{{/vendor-boot}}
164+
{{#init-boot}}
165+
--init_boot $(TARGET_IMAGE_PATH)/init_boot.img \
166+
{{/init-boot}}
164167
--config $(raw_config) \
165168
--factory $(raw_factory)
166169

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,2 @@
11
BOARD_USES_RECOVERY_AS_BOOT := true
2-
3-
# Enable debug boot image for GSI testing
4-
# For Generic Kernel Image (GKI) using devices that have a vendor_boot partition,
5-
# boot-debug.img mustn't be flashed, as the boot partition must be flashed with
6-
# a certified GKI image. Instead vendor_boot-debug.img should be flashed
7-
# onto the vendor_boot partition in order to facilitate debug ramdisk.
8-
PRODUCT_BUILD_DEBUG_BOOT_IMAGE := true
2+
BOARD_FLASHFILES += $(PRODUCT_OUT)/boot-debug.img
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[output.installer.cmd]
2+
additional-files += provdatazip:boot-debug.img

groups/init-boot/false/product.mk

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# disable debug boot image for GSI testing
2+
# For Generic Kernel Image (GKI) using devices that have a vendor_boot partition,
3+
# boot-debug.img mustn't be flashed, as the boot partition must be flashed with
4+
# a certified GKI image. Instead vendor_boot-debug.img should be flashed
5+
# onto the vendor_boot partition in order to facilitate debug ramdisk.
6+
PRODUCT_BUILD_DEBUG_BOOT_IMAGE := true

groups/init-boot/true/BoardConfig.mk

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,3 @@ BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT := true
2222
BOARD_EXCLUDE_KERNEL_FROM_RECOVERY_IMAGE :=
2323
BOARD_MOVE_GSI_AVB_KEYS_TO_VENDOR_BOOT := true
2424
BOOT_SECURITY_PATCH := $(PLATFORM_SECURITY_PATCH)
25-
26-
# disable debug boot image for GSI testing
27-
# For Generic Kernel Image (GKI) using devices that have a vendor_boot partition,
28-
# boot-debug.img mustn't be flashed, as the boot partition must be flashed with
29-
# a certified GKI image. Instead vendor_boot-debug.img should be flashed
30-
# onto the vendor_boot partition in order to facilitate debug ramdisk.
31-
PRODUCT_BUILD_DEBUG_BOOT_IMAGE := false

groups/init-boot/true/product.mk

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,9 @@ INITBOOT_ENABLE := true
55
INITBOOT_ENABLE := false
66
{{/initboot_enable}}
77

8-
#PRODUCT_COPY_FILES += \
9-
# $(LOCAL_PATH)/fstab:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/first_stage_ramdisk/fstab.$(TARGET_PRODUCT)
8+
# disable debug boot image for GSI testing
9+
# For Generic Kernel Image (GKI) using devices that have a vendor_boot partition,
10+
# boot-debug.img mustn't be flashed, as the boot partition must be flashed with
11+
# a certified GKI image. Instead vendor_boot-debug.img should be flashed
12+
# onto the vendor_boot partition in order to facilitate debug ramdisk.
13+
PRODUCT_BUILD_DEBUG_BOOT_IMAGE := false

0 commit comments

Comments
 (0)