обновление рамдиска, сборка otapackage, gralloc

BoardConfig.mk

@@ -4,7 +4,6 @@
 TARGET_OTA_ASSERT_DEVICE := c8690,c8690,c8690
 DISABLE_DEXPREOPT := true
 TARGET_SPECIFIC_HEADER_PATH := device/cellon/c8690/include
-BOARD_CUSTOM_BOOTIMG_MK := device/cellon/c8690/img.mk
 
 TARGET_BOOTANIMATION_PRELOAD := true
 
@@ -42,11 +41,12 @@ TARGET_BOOTLOADER_BOARD_NAME := smdk4x12
 TARGET_NO_BOOTLOADER := true
 TARGET_NO_RADIOIMAGE := true
 TARGET_NO_RECOVERY := true
+BOARD_CUSTOM_BOOTIMG_MK := device/cellon/c8690/img.mk
+BOARD_MKBOOTIMG_ARGS := 
 
 # Init
 TARGET_PROVIDES_INIT := true
 TARGET_PROVIDES_INIT_TARGET_RC := true
-TARGET_RECOVERY_INITRC := device/cellon/c8690/recovery.rc
 
 # Selinux
 BOARD_SEPOLICY_DIRS += \
@@ -74,8 +74,6 @@ BOARD_KERNEL_PAGESIZE := 2048
 # Recovery
 RECOVERY_NAME := CWM-based Recovery by kaasnake
 TARGET_RECOVERY_INITRC := device/cellon/c8690/recovery/recovery.rc
-TARGET_PROVIDES_INIT := true
-TARGET_PROVIDES_INIT_TARGET_RC := true
 BOARD_CUSTOM_GRAPHICS := ../../../device/cellon/c8690/recovery/graphics.c
 BOARD_USE_CUSTOM_RECOVERY_FONT := \"roboto_15x24.h\"
 BOARD_UMS_LUNFILE := "/sys/class/android_usb/android0/f_mass_storage/lun/file"

common.mk

@@ -14,17 +14,18 @@ PRODUCT_BUILD_PROP_OVERRIDES += BUILD_UTC_DATE=0
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/ramdisk/battery.bqfs:root/battery.bqfs \
     $(LOCAL_PATH)/ramdisk/init.rc:root/init.rc \
-    $(LOCAL_PATH)/ramdisk/init.cm.rc:root/init.cm.rc \
     $(LOCAL_PATH)/ramdisk/init.smdk4x12.rc:root/init.smdk4x12.rc \
     $(LOCAL_PATH)/ramdisk/init.smdk4x12.usb.rc:root/init.smdk4x12.usb.rc \
     $(LOCAL_PATH)/ramdisk/ueventd.smdk4x12.rc:root/ueventd.smdk4x12.rc
+#    $(LOCAL_PATH)/ramdisk/init.cm.rc:root/init.cm.rc \
 
 # Packages
 PRODUCT_PACKAGES := \
     audio.a2dp.default \
     audio.usb.default \
     com.android.future.usb.accessory \
     libhwjpeg \
+    gralloc.exynos4 \
     hwcomposer.exynos4 \
     libfimg \
 	libTVOut \

img.mk

@@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)
 
 $(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_FILES) $(MKIMAGE)
 	$(call pretty,"-- Creating c8690 uboot ramdisk image: $@")
-	$(MKIMAGE) -A ARM -O Linux -T ramdisk -C none -a 0x41000000 -e 0x41000000 -n ramdisk -d $(INSTALLED_RAMDISK_TARGET) $(PRODUCT_OUT)/ramdisk.img
+	$(MKIMAGE) -A ARM -O Linux -T ramdisk -C none -a 0x41000000 -e 0x41000000 -n ramdisk -d $(INSTALLED_RAMDISK_TARGET) $(PRODUCT_OUT)/ramdisk
 	@echo -e ${CL_CYN}"-- ---> uboot ramdisk image: $(PRODUCT_OUT)/ramdisk.img"${CL_RST}
 
 $(INSTALLED_RECOVERYIMAGE_TARGET): $(MKBOOTIMG) $(MKIMAGE) \

ramdisk/init.rc

@@ -78,7 +78,7 @@ loglevel 3
 
     mkdir /system
     mkdir /data 0771 system system
-    mkdir /cache 0771 system cache
+    mkdir /cache 0770 system cache
     mkdir /config 0500 root root
 
     # Directory for putting things only root should see.
@@ -139,19 +139,17 @@ loglevel 3
     write /dev/cpuctl/apps/bg_non_interactive/cpu.rt_runtime_us 700000
     write /dev/cpuctl/apps/bg_non_interactive/cpu.rt_period_us 1000000
 
-# qtaguid will limit access to specific data based on group memberships.
-#   net_bw_acct grants impersonation of socket owners.
-#   net_bw_stats grants access to other apps' detailed tagged-socket stats.
-    chown root net_bw_acct /proc/net/xt_qtaguid/ctrl
-    chown root net_bw_stats /proc/net/xt_qtaguid/stats
-
 # Allow everybody to read the xt_qtaguid resource tracking misc dev.
 # This is needed by any process that uses socket tagging.
     chmod 0644 /dev/xt_qtaguid
 
-# Create location for fs_mgr to store abbreviated output from filesystem
-# checker programs.
-    mkdir /dev/fscklogs 0770 root system
+on fs
+# mount mtd partitions
+    # Mount /system rw first to give the filesystem a chance to save a checkpoint
+    mount yaffs2 mtd@system /system
+    mount yaffs2 mtd@system /system ro remount
+    mount yaffs2 mtd@userdata /data nosuid nodev
+    mount yaffs2 mtd@cache /cache nosuid nodev
 
 on post-fs
      # once everything is setup, no need to modify /
@@ -226,9 +224,7 @@ on post-fs-data
 
     # create basic filesystem structure
     mkdir /data/misc 01771 system misc
-    mkdir /data/misc/adb 02750 system shell
-    mkdir /data/misc/audit 02750 audit system
-    mkdir /data/misc/bluedroid 0770 bluetooth net_bt_stack
+    mkdir /data/misc/bluetoothd 0770 bluetooth bluetooth
     mkdir /data/misc/bluetooth 0770 system system
     mkdir /data/misc/keystore 0700 keystore keystore
     mkdir /data/misc/keychain 0771 system system
@@ -642,7 +638,7 @@ service ril-daemon /system/bin/rild
     socket rild stream 660 root radio
     socket rild-debug stream 660 radio system
     user root
-    group radio cache inet misc audio sdcard_rw qcom_oncrpc qcom_diag log
+    group radio cache inet misc audio sdcard_rw log
 
 service gsm_mux /system/bin/gsm0710muxd
     class main

ramdisk/init.smdk4x12.rc

@@ -1,20 +1,13 @@
 import init.smdk4x12.usb.rc
 on early-init
-#Stock
-#    export EXTERNAL_STORAGE /mnt/sdcard
-#    mkdir /mnt/sdcard 0000 system system
-#    mkdir /mnt/sdcard2 0775 system system
-#    mkdir /mnt/udisk 0775 system system
-#    symlink /mnt/sdcard /sdcard
-
-#New variant
+
     export EXTERNAL_STORAGE /mnt/sdcard
-    export SECONDARY_STORAGE /mnt/ext_sd
-    mkdir /mnt/sdcard 0000 system system
-    mkdir /mnt/ext_sd 0775 system system
+    export SECONDARY_STORAGE /mnt/sdcard2
+    mkdir /mnt/sdcard 0775 system system
+    mkdir /mnt/sdcard2 0775 system system
     mkdir /mnt/udisk 0775 system system
     symlink /mnt/sdcard /sdcard
-    symlink /mnt/ext_sd /ext_sd
+    symlink /mnt/sdcard2 /sdcard2
 
 # jmq.disable
 #on post-fs-data
@@ -32,14 +25,46 @@ on boot
     setprop ro.radio.noril yes
 
 on fs
-    mount_all /fstab.smdk4x12
-
+    mount ext4 /dev/block/mmcblk0p2 /system rw wait
+    mount ext4 /dev/block/mmcblk0p3 /data nosuid nodev noatime wait usedm discard,noauto_da_alloc,nodelalloc
+    mount ext4 /dev/block/mmcblk0p4 /cache wait nosuid nodev noatime nomblk_io_submit
+    mount vfat /devices/platform/dw_mmc/mmc_host/mmc0 /mnt/ext_sd nonremovable,encryptable
+    mount vfat /dev/block/mmcblk0p1 /mnt/sdcard2
+    mount vfat /dev/block/mmcblk1p1 /mnt/sdcard
+# jmq.disable
+#    setprop ro.crypto.fuse_sdcard true
 
 # Permissions for backlight
     chmod 0665 /sys/class/backlight/pwm-backlight.0/brightness
     chown system system /sys/class/backlight/pwm-backlight.0/brightness
+# Permissions for btpower
+#    chown system system /sys/devices/platform/bt-sysfs/bt_power
+
+# create filesystem if necessary
+#service setup_fs /system/bin/setup_fs \
+#            /dev/block/mmcblk0p3 \
+#            /dev/block/mmcblk0p4
+#    class core
+#    user root
+#    group root
+#    oneshot
+
+# create virtual SD card at /mnt/sdcard, based on the /data/media directory
+# daemon will drop to user/group system/media_rw after initializing
+# underlying files in /data/media will be created with user and group media_rw (1023)
+# jmq.disable
+#service sdcard /system/bin/sdcard /data/media 1023 1023
+#    class late_start
+
+# Permissions for GPS
+#    chmod 0777 /dev/ttySAC3
+#    chmod 0777 /dev/AGPS
+#    chown root root /data
+#    chmod 0771 /data
 
+
 #yyd- 111206, add sensor
     chmod 0777 /dev/mpu
     chmod 0777 /dev/mpuirq
+#    chmod 0777 /dev/accelirq
     chmod 0777 /dev/timerirq

recovery.fstab

@@ -1,8 +1,8 @@
-/sdcard		vfat		/dev/block/mmcblk1p1 /sys/devices/platform/s3c-usbgadget/gadget/lun0/file
-/emmc		vfat		/dev/block/mmcblk0p1 /sys/devices/platform/s3c-usbgadget/gadget/lun1/file
+/sdcard		vfat		/dev/block/mmcblk1p1		/sys/devices/platform/s3c-usbgadget/gadget/lun0/file
+/emmc		vfat		/dev/block/mmcblk0p1		/sys/devices/platform/s3c-usbgadget/gadget/lun1/file
 /system		ext4		/dev/block/mmcblk0p2
 /cache		ext4		/dev/block/mmcblk0p4
 /data		ext4		/dev/block/mmcblk0p3
-/kernel		emmc		    kernel
-/ramdisk    emmc		    ramdisk
+/kernel		emmc		kernel
+/ramdisk    emmc		ramdisk