diff options
| -rw-r--r-- | core/Makefile | 4 | ||||
| -rw-r--r-- | core/definitions.mk | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/core/Makefile b/core/Makefile index 9b0b8e7b8e..515f91d807 100644 --- a/core/Makefile +++ b/core/Makefile @@ -621,13 +621,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 yaffs image # diff --git a/core/definitions.mk b/core/definitions.mk index 7e2d1fbfe5..8675f36e98 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -1657,10 +1657,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 $@) |