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

Commit 024bc06c authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add BOARD_INIT_BOOT_IMAGE_PAGESIZE" into main

parents 7c3c05d3 ce14fbee

core/Makefile

+8 −2
Original line number Diff line number Diff line
@@ -1543,8 +1543,14 @@ $(INSTALLED_INIT_BOOT_IMAGE_TARGET): $(MKBOOTIMG) $(INSTALLED_RAMDISK_TARGET) 


INTERNAL_INIT_BOOT_IMAGE_ARGS := --ramdisk $(INSTALLED_RAMDISK_TARGET)



ifdef BOARD_KERNEL_PAGESIZE

  INTERNAL_INIT_BOOT_IMAGE_ARGS += --pagesize $(BOARD_KERNEL_PAGESIZE)

ifdef BOARD_INIT_BOOT_IMAGE_PAGESIZE

	INTERNAL_INIT_BOOT_IMAGE_PAGESIZE := $(BOARD_INIT_BOOT_IMAGE_PAGESIZE)

else ifdef BOARD_KERNEL_PAGESIZE

	INTERNAL_INIT_BOOT_IMAGE_PAGESIZE := $(BOARD_KERNEL_PAGESIZE)

endif



ifdef INTERNAL_INIT_BOOT_IMAGE_PAGESIZE

  INTERNAL_INIT_BOOT_IMAGE_ARGS += --pagesize $(INTERNAL_INIT_BOOT_IMAGE_PAGESIZE)

endif



ifeq ($(BOARD_AVB_ENABLE),true)

core/board_config.mk

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ _board_strip_readonly_list += TARGET_ARCH_SUITE 
_board_strip_readonly_list += BOARD_FLASH_BLOCK_SIZE

_board_strip_readonly_list += BOARD_BOOTIMAGE_PARTITION_SIZE

_board_strip_readonly_list += BOARD_INIT_BOOT_IMAGE_PARTITION_SIZE

_board_strip_readonly_list += BOARD_INIT_BOOT_IMAGE_PAGESIZE

_board_strip_readonly_list += BOARD_RECOVERYIMAGE_PARTITION_SIZE

_board_strip_readonly_list += BOARD_SYSTEMIMAGE_PARTITION_SIZE

_board_strip_readonly_list += BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE