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

Commit dbd43691 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am 3ef1d674: am 4985f06f: Merge "Make image-size-from-data-size not use hard coded values." 

* commit '3ef1d674':
  Make image-size-from-data-size not use hard coded values.
parents 1c4fe5aa 3ef1d674

core/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -690,13 +690,15 @@ ifneq ($(BOARD_NAND_PAGE_SIZE),) 
mkyaffs2_extra_flags := -c $(BOARD_NAND_PAGE_SIZE)

else

mkyaffs2_extra_flags :=

BOARD_NAND_PAGE_SIZE := 2048

endif



ifneq ($(BOARD_NAND_SPARE_SIZE),)

mkyaffs2_extra_flags += -s $(BOARD_NAND_SPARE_SIZE)

else

BOARD_NAND_SPARE_SIZE := 64

endif





# -----------------------------------------------------------------

# system image

#

core/definitions.mk

+3 −2
Original line number Diff line number Diff line
@@ -1654,10 +1654,11 @@ endif 


# Convert a partition data size (eg, as reported in /proc/mtd) to the

# size of the image used to flash that partition (which includes a

# 64-byte spare area for each 2048-byte page).

# spare area for each page).

# $(1): the partition data size

define image-size-from-data-size

$(shell echo $$(($(1) / 2048 * (2048+64))))

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

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

endef



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