StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make image-size-from-data-size not use hard coded values."

Browse Source
This commit is contained in:
Jean-Baptiste Queru
2010-12-06 14:58:08 -08:00
committed by Android Code Review
parent d2dd865299 9cb8c28352
commit 4985f06f4e
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/Makefile
View File

@@ -621,13 +621,15 @@ ifneq ($(BOARD_NAND_PAGE_SIZE),)
mkyaffs2_extra_flags := -c $(BOARD_NAND_PAGE_SIZE) mkyaffs2_extra_flags := -c $(BOARD_NAND_PAGE_SIZE)
else else
mkyaffs2_extra_flags := mkyaffs2_extra_flags :=
BOARD_NAND_PAGE_SIZE := 2048
endif endif
ifneq ($(BOARD_NAND_SPARE_SIZE),) ifneq ($(BOARD_NAND_SPARE_SIZE),)
mkyaffs2_extra_flags += -s $(BOARD_NAND_SPARE_SIZE) mkyaffs2_extra_flags += -s $(BOARD_NAND_SPARE_SIZE)
else
BOARD_NAND_SPARE_SIZE := 64
endif endif
# ----------------------------------------------------------------- # -----------------------------------------------------------------
# system yaffs image # system yaffs image
# #

5
core/definitions.mk
View File

@@ -1657,10 +1657,11 @@ endif
# Convert a partition data size (eg, as reported in /proc/mtd) to the # 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 # 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 # $(1): the partition data size
define image-size-from-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 endef
# $(1): The file(s) to check (often $@) # $(1): The file(s) to check (often $@)