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

Commit 389cf7ac authored by Ying Wang's avatar Ying Wang Committed by Android (Google) Code Review
Browse files

Merge "Fix the case BOARD_FLASH_BLOCK_SIZE smaller than BOARD_NAND_PAGE_SIZE, eg generic_x86"

parents f67684b2 279f3084

core/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -1085,7 +1085,7 @@ target-files-package: $(BUILT_TARGET_FILES_PACKAGE) 


ifneq ($(TARGET_SIMULATOR),true)

ifneq ($(TARGET_PRODUCT),sdk)

ifneq ($(TARGET_DEVICE),generic)

ifeq ($(filter generic%,$(TARGET_DEVICE)),)

ifneq ($(TARGET_NO_KERNEL),true)



# -----------------------------------------------------------------
@@ -1140,7 +1140,7 @@ $(INTERNAL_UPDATE_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(OTATOOLS) 
updatepackage: $(INTERNAL_UPDATE_PACKAGE_TARGET)



endif    # TARGET_NO_KERNEL != true

endif    # TARGET_DEVICE != generic

endif    # TARGET_DEVICE != generic*

endif    # TARGET_PRODUCT != sdk

endif    # TARGET_SIMULATOR != true

core/definitions.mk

+4 −2
Original line number Diff line number Diff line
@@ -1833,8 +1833,10 @@ endif 
# spare area for each page).

# $(1): the partition data size

define image-size-from-data-size

$(shell echo $$(($(1) / $(BOARD_NAND_PAGE_SIZE) * \

  ($(BOARD_NAND_PAGE_SIZE)+$(BOARD_NAND_SPARE_SIZE)))))

$(strip $(eval _isfds_value := $(shell echo $$(($(1) / $(BOARD_NAND_PAGE_SIZE) * \

  ($(BOARD_NAND_PAGE_SIZE)+$(BOARD_NAND_SPARE_SIZE))))))\

$(if $(filter 0, $(_isfds_value)),$(shell echo $$(($(BOARD_NAND_PAGE_SIZE)+$(BOARD_NAND_SPARE_SIZE)))),$(_isfds_value))\

$(eval _isfds_value :=))

endef



# $(1): The file(s) to check (often $@)