Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6d8874a authored by Yifan Hong's avatar Yifan Hong Committed by Automerger Merge Worker
Browse files

Merge "Build boot image if BOARD_KERNEL*_BOOTIMAGE_PARTITION_SIZE" am:... 

Merge "Build boot image if BOARD_KERNEL*_BOOTIMAGE_PARTITION_SIZE" am: ffb2a7f9 am: dc506bb5 am: 790d85a0

Original change: https://android-review.googlesource.com/c/platform/build/+/1462543

Change-Id: I48f41e9af7fe37ef7d72b6caf3a700c088e28e23
parents e3662cf1 790d85a0

core/Makefile

+5 −5
Original line number Diff line number Diff line
@@ -798,10 +798,10 @@ ifeq (true,$(BOARD_AVB_ENABLE)) 
# $1: boot image target

define build_boot_board_avb_enabled

  $(MKBOOTIMG) --kernel $(call bootimage-to-kernel,$(1)) $(INTERNAL_BOOTIMAGE_ARGS) $(INTERNAL_MKBOOTIMG_VERSION_ARGS) $(BOARD_MKBOOTIMG_ARGS) --output $(1)

  $(call assert-max-image-size,$(1),$(call get-hash-image-max-size,$(BOARD_BOOTIMAGE_PARTITION_SIZE)))

  $(call assert-max-image-size,$(1),$(call get-hash-image-max-size,$(call get-bootimage-partition-size,$(1),boot)))

  $(AVBTOOL) add_hash_footer \

          --image $(1) \

          --partition_size $(BOARD_BOOTIMAGE_PARTITION_SIZE) \

          --partition_size $(call get-bootimage-partition-size,$(1),boot) \

          --partition_name boot $(INTERNAL_AVB_BOOT_SIGNING_ARGS) \

          $(BOARD_AVB_BOOT_ADD_HASH_FOOTER_ARGS)

endef
@@ -821,7 +821,7 @@ else ifeq (true,$(PRODUCT_SUPPORTS_BOOT_SIGNER)) # BOARD_AVB_ENABLE != true 
define build_boot_supports_boot_signer

  $(MKBOOTIMG) --kernel $(call bootimage-to-kernel,$(1)) $(INTERNAL_BOOTIMAGE_ARGS) $(INTERNAL_MKBOOTIMG_VERSION_ARGS) $(BOARD_MKBOOTIMG_ARGS) --output $(1)

  $(BOOT_SIGNER) /boot $@ $(PRODUCT_VERITY_SIGNING_KEY).pk8 $(PRODUCT_VERITY_SIGNING_KEY).x509.pem $(1)

  $(call assert-max-image-size,$(1),$(BOARD_BOOTIMAGE_PARTITION_SIZE))

  $(call assert-max-image-size,$(1),$(call get-bootimage-partition-size,$(1),boot))

endef



$(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_FILES) $(BOOT_SIGNER)
@@ -839,7 +839,7 @@ else ifeq (true,$(PRODUCT_SUPPORTS_VBOOT)) # PRODUCT_SUPPORTS_BOOT_SIGNER != tru 
define build_boot_supports_vboot

  $(MKBOOTIMG) --kernel $(call bootimage-to-kernel,$(1)) $(INTERNAL_BOOTIMAGE_ARGS) $(INTERNAL_MKBOOTIMG_VERSION_ARGS) $(BOARD_MKBOOTIMG_ARGS) --output $(1).unsigned

  $(VBOOT_SIGNER) $(FUTILITY) $(1).unsigned $(PRODUCT_VBOOT_SIGNING_KEY).vbpubk $(PRODUCT_VBOOT_SIGNING_KEY).vbprivk $(PRODUCT_VBOOT_SIGNING_SUBKEY).vbprivk $(1).keyblock $(1)

  $(call assert-max-image-size,$(1),$(BOARD_BOOTIMAGE_PARTITION_SIZE))

  $(call assert-max-image-size,$(1),$(call get-bootimage-partition-size,$(1),boot))

endef



$(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_FILES) $(VBOOT_SIGNER) $(FUTILITY)
@@ -856,7 +856,7 @@ else # PRODUCT_SUPPORTS_VBOOT != true 
# $1: boot image target

define build_boot_novboot

  $(MKBOOTIMG) --kernel $(call bootimage-to-kernel,$(1)) $(INTERNAL_BOOTIMAGE_ARGS) $(INTERNAL_MKBOOTIMG_VERSION_ARGS) $(BOARD_MKBOOTIMG_ARGS) --output $(1)

  $(call assert-max-image-size,$1,$(BOARD_BOOTIMAGE_PARTITION_SIZE))

  $(call assert-max-image-size,$1,$(call get-bootimage-partition-size,$(1),boot))

endef



$(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_FILES)

core/board_config.mk

+2 −0
Original line number Diff line number Diff line
@@ -364,6 +364,8 @@ ifeq ($(PRODUCT_BUILD_BOOT_IMAGE),) 
    BUILDING_BOOT_IMAGE :=

  else ifdef BOARD_BOOTIMAGE_PARTITION_SIZE

    BUILDING_BOOT_IMAGE := true

  else ifneq (,$(foreach kernel,$(BOARD_KERNEL_BINARIES),$(BOARD_$(call to-upper,$(kernel))_BOOTIMAGE_PARTITION_SIZE)))

    BUILDING_BOOT_IMAGE := true

  endif

else ifeq ($(PRODUCT_BUILD_BOOT_IMAGE),true)

  ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true)