summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Kocialkowski <contact@paulk.fr>2012-11-08 15:24:01 +0100
committerPaul Kocialkowski <contact@paulk.fr>2012-11-08 15:24:01 +0100
commit79038c7ed52de607811294cea21f055d8427dcf6 (patch)
treec914a0d6fd0156582672c4304399cd1d1faf03bb
parent2e6b9a121300c12b76ecfa0854347a85dc86cb60 (diff)
downloaddevice_samsung_aries-common-79038c7ed52de607811294cea21f055d8427dcf6.zip
device_samsung_aries-common-79038c7ed52de607811294cea21f055d8427dcf6.tar.gz
device_samsung_aries-common-79038c7ed52de607811294cea21f055d8427dcf6.tar.bz2
Make yaffs2 images under the correct names for recovery
Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
-rw-r--r--BoardConfigCommon.mk5
-rw-r--r--userimg.mk10
2 files changed, 12 insertions, 3 deletions
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 9ea7c7c..755344f 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -59,8 +59,6 @@ BOARD_HAVE_BLUETOOTH_BCM := true
BOARD_V4L2_DEVICE := /dev/video1
BOARD_CAMERA_DEVICE := /dev/video0
-BOARD_NAND_PAGE_SIZE := 4096
-BOARD_NAND_SPARE_SIZE := 128
BOARD_KERNEL_BASE := 0x32000000
BOARD_KERNEL_PAGESIZE := 4096
BOARD_KERNEL_CMDLINE := console=ttyFIQ0,115200 init=/init no_console_suspend
@@ -89,11 +87,12 @@ BOARD_VOLD_EMMC_SHARES_DEV_MAJOR := true
TARGET_USE_CUSTOM_LUN_FILE_PATH := "/sys/devices/platform/s3c-usbgadget/gadget/lun%d/file"
# Recovery
-TARGET_USERIMAGES_USE_EXT4 := true
+TARGET_USERIMAGES_USE_EXT4 := false
BOARD_HAS_NO_SELECT_BUTTON := true
BOARD_CUSTOM_GRAPHICS := ../../../device/samsung/aries-common/recovery/graphics.c
BOARD_USES_BML_OVER_MTD := true
BOARD_CUSTOM_BOOTIMG_MK := device/samsung/aries-common/shbootimg.mk
+BOARD_CUSTOM_USERIMG_MK := device/samsung/aries-common/userimg.mk
# Hardware rendering
USE_OPENGL_RENDERER := true
diff --git a/userimg.mk b/userimg.mk
new file mode 100644
index 0000000..a979b4a
--- /dev/null
+++ b/userimg.mk
@@ -0,0 +1,10 @@
+INSTALLED_SYSTEMIMAGE_TARGET := $(PRODUCT_OUT)/system.yaffs2.img
+INSTALLED_USERDATAIMAGE_TARGET := $(PRODUCT_OUT)/data.ext4.img
+
+$(INSTALLED_SYSTEMIMAGE_TARGET): $(INSTALLED_SYSTEMIMAGE)
+ @echo -e ${CL_INS}"Install system fs image: $@"${CL_RST}
+ $(hide) mv $(INSTALLED_SYSTEMIMAGE) $(INSTALLED_SYSTEMIMAGE_TARGET)
+
+$(INSTALLED_USERDATAIMAGE_TARGET): $(BUILT_USERDATAIMAGE_TARGET)
+
+systemimage: $(INSTALLED_SYSTEMIMAGE_TARGET)