am 892ea1ea: Merge "build: Add spare size flag to mkyaffs2image"

* commit '892ea1eaadfa5b57948bb66bd3432e06c58188e1':
  build: Add spare size flag to mkyaffs2image

diff --cc core/Makefile
index bf7bd06,7ec0cba..460ae3a
--- 1/core/Makefile
--- 2/core/Makefile
+++ b/core/Makefile
@@@ -692,13 -623,20 +692,17 @@@ els
  mkyaffs2_extra_flags :=
  endif
  
+ ifneq ($(BOARD_NAND_SPARE_SIZE),)
+ mkyaffs2_extra_flags += -s $(BOARD_NAND_SPARE_SIZE)
+ endif
+ 
  
  # -----------------------------------------------------------------
 -# system yaffs image
 +# system image
  #
 -# First, the "unoptimized" image, which contains .apk/.jar files
 -# that contain regular, unoptimized/unverified .dex entries.
 -#
 -systemimage_unopt_intermediates := \
 -      $(call intermediates-dir-for,PACKAGING,systemimage_unopt)
 -BUILT_SYSTEMIMAGE_UNOPT := $(systemimage_unopt_intermediates)/system.img
 +systemimage_intermediates := \
 +      $(call intermediates-dir-for,PACKAGING,systemimage)
 +BUILT_SYSTEMIMAGE := $(systemimage_intermediates)/system.img
  
  INTERNAL_SYSTEMIMAGE_FILES := $(filter $(TARGET_OUT)/%, \
        $(ALL_PREBUILT) \