From e0a40217df12c274f591da212d30bf66c923524c Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 3 Aug 2010 14:43:34 -0700 Subject: [PATCH] Pass partition sizes to make_ext4fs Change-Id: I81e84ca02e4326989d25f7d43306c56cdc39348c --- core/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/core/Makefile b/core/Makefile index f5d23b48b2..afb2a48fc9 100644 --- a/core/Makefile +++ b/core/Makefile @@ -576,12 +576,13 @@ INTERNAL_USERIMAGES_BINARY_PATHS := $(sort $(dir $(INTERNAL_USERIMAGES_DEPS))) # $(1): src directory # $(2): output file -# $(3): label (if any) +# $(3): label # $(4): ext variant (ext2, ext3, ext4) +# $(5): size of the partition define build-userimage-ext-target @mkdir -p $(dir $(2)) $(hide) PATH=$(foreach p,$(INTERNAL_USERIMAGES_BINARY_PATHS),$(p):)$(PATH) \ - $(MKEXT2USERIMG) $(1) $(2) $(4) $(3) + $(MKEXT2USERIMG) $(1) $(2) $(4) $(3) $(5) endef else INTERNAL_USERIMAGES_DEPS := $(MKYAFFS2) @@ -705,7 +706,7 @@ ifeq ($(INTERNAL_USERIMAGES_USE_EXT),true) # $(1): output file define build-systemimage-target @echo "Target system fs image: $(1)" - $(call build-userimage-ext-target,$(TARGET_OUT),$(1),system,$(INTERNAL_USERIMAGES_EXT_VARIANT)) + $(call build-userimage-ext-target,$(TARGET_OUT),$(1),system,$(INTERNAL_USERIMAGES_EXT_VARIANT),$(BOARD_SYSTEMIMAGE_PARTITION_SIZE)) endef else # INTERNAL_USERIMAGES_USE_EXT != true @@ -838,7 +839,7 @@ ifeq ($(INTERNAL_USERIMAGES_USE_EXT),true) define build-userdataimage-target $(call pretty,"Target userdata fs image: $(INSTALLED_USERDATAIMAGE_TARGET)") @mkdir -p $(TARGET_OUT_DATA) - $(call build-userimage-ext-target,$(TARGET_OUT_DATA),$(INSTALLED_USERDATAIMAGE_TARGET),userdata,$(INTERNAL_USERIMAGES_EXT_VARIANT)) + $(call build-userimage-ext-target,$(TARGET_OUT_DATA),$(INSTALLED_USERDATAIMAGE_TARGET),userdata,$(INTERNAL_USERIMAGES_EXT_VARIANT),$(BOARD_USERDATAIMAGE_PARTITION_SIZE)) $(hide) $(call assert-max-image-size,$(INSTALLED_USERDATAIMAGE_TARGET),$(BOARD_USERDATAIMAGE_PARTITION_SIZE),yaffs) endef