правка монтирования второй КП в рамдиске + сборка рекавери(КП пока не…

… монтируются)

BoardConfig.mk

@@ -40,7 +40,7 @@ TARGET_BOOTLOADER_BOARD_NAME := smdk4x12
 # Images
 TARGET_NO_BOOTLOADER := true
 TARGET_NO_RADIOIMAGE := true
-TARGET_NO_RECOVERY := true
+TARGET_NO_RECOVERY := false
 BOARD_CUSTOM_BOOTIMG_MK := device/cellon/c8690/img.mk
 BOARD_MKBOOTIMG_ARGS := 
 

img.mk

@@ -17,7 +17,7 @@ $(INSTALLED_RECOVERYIMAGE_TARGET): $(MKBOOTIMG) $(MKIMAGE) \
 	  --ramdisk $(PRODUCT_OUT)/ramdisk-recovery-uboot-tmp.img \
 	  --cmdline $(strip 	$(BOARD_KERNEL_CMDLINE)) \
 	  --base $(strip $(BOARD_KERNEL_BASE)) \
-	  --ramdiskaddr 0x11000000 \
+	  --ramdisk_offset 0x11000000 \
 	  --pagesize $(strip $(BOARD_KERNEL_PAGESIZE))\
 	  --output $@
 	rm -f $(PRODUCT_OUT)/ramdisk-recovery-uboot-tmp.img

ramdisk/init.smdk4x12.rc

@@ -28,7 +28,7 @@ on fs
     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 /devices/platform/dw_mmc/mmc_host/mmc0 /mnt/sdcard2 nonremovable,encryptable
     mount vfat /dev/block/mmcblk0p1 /mnt/sdcard2
     mount vfat /dev/block/mmcblk1p1 /mnt/sdcard
 # jmq.disable

recovery.fstab

@@ -1,8 +1,24 @@
-/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
+# Android fstab file.
+# <src>						<mnt_point>		<type>		<mnt_flags and options>		<fs_mgr_flags>
+# The filesystem that contains the filesystem checker binary (typically /system) cannot
+# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
+/dev/block/mmcblk0p2		/system			ext4		ro,noatime		wait
+/dev/block/mmcblk0p4		/cache			ext4		noatime,nosuid,nodev,journal_async_commit,errors=panic		wait
+/dev/block/mmcblk0p3		/data			ext4		noatime,nosuid,nodev,discard,noauto_da_alloc,journal_async_commit,errors=panic		wait,check,encryptable=footer
 
+# vold-managed volumes ("block device" is actually a sysfs devpath)
+#/devices/platform/s3c-sdhci.2/mmc_host/mmc1		/mnt/sdcard		1		defaults		voldmanaged=sdcard:auto
+#/devices/platform/dw_mmc/mmc_host/mmc0		/mnt/sdcard2		1		defaults		voldmanaged=sdcard2:auto
+
+#/sdcard		vfat		/dev/block/mmcblk1p1
+#/dev/block/mmcblk0p1		/emmc			vfat		defaults		voldmanaged=emmc:auto
+#/dev/block/mmcblk1p1		/sdcard			vfat		defaults		voldmanaged=sdcard:auto
+
+#/devices/platform/s3c-sdhci.2/mmc_host/mmc1		/mnt/sdcard		vfat		defaults		voldmanaged=sdcard:auto
+#/devices/platform/dw_mmc/mmc_host/mmc0		/mnt/sdcard2		vfat		defaults		voldmanaged=sdcard2:auto
+
+/devices/platform/s3c-sdhci.2/mmc_host/mmc1		/storage/sdcard		auto		defaults		voldmanaged=sdcard:auto
+/devices/platform/dw_mmc/mmc_host/mmc0		    /storage/sdcard2		auto		defaults		voldmanaged=sdcard2:auto
+
+kernel		    /kernel				mtd		defaults		recoveryonly
+ramdisk		    /ramdisk			mtd		defaults		recoveryonly

recovery/recovery.rc

@@ -1,23 +1,81 @@
+import /init.recovery.${ro.hardware}.rc
+
 on early-init
     start ueventd
+    start healthd
 
 on init
-    export PATH /sbin:/vendor/bin:/system/sbin:/system/bin:/system/xbin
+    mkdir /mnt 0775 root system
+
+    export PATH /sbin:/system/bin
     export ANDROID_ROOT /system
     export ANDROID_DATA /data
     export EXTERNAL_STORAGE /sdcard
 
-    mkdir /sdcard
-    mkdir /ext_sd
+    mkdir /sdcard 
+
+    symlink /system/etc /etc
+
+    mkdir /boot
+    mkdir /internal_sd
     mkdir /external_sd
+    mkdir /sd-ext
+    mkdir /recovery
+    mkdir /datadata
+    mkdir /emmc
     mkdir /system
     mkdir /data
     mkdir /cache
-    mkdir /preload
-    mkdir /efs
-    mount /tmp /tmp tmpfs
+    mount tmpfs tmpfs /tmp
+
+    symlink /sbin/busybox /system/bin/sh
+    symlink /sbin/busybox /sbin/sh
+    symlink /sbin/busybox /sbin/ls
+    symlink /sbin/busybox /sbin/chmod
+    symlink /sbin/busybox /sbin/ln
+    symlink /sbin/busybox /sbin/cat
+    symlink /sbin/busybox /sbin/mount
+    symlink /sbin/busybox /sbin/vi
+
+    chmod 777 /dev/mtd/mtd0
+    chmod 777 /sdcard
+
+    chmod 0755 /sbin/busybox
+
+    chown root shell /tmp
+    chmod 0775 /tmp
+
+    mkdir /storage 0050 root sdcard_r
+    mount tmpfs tmpfs /storage mode=0050,uid=0,gid=1028
+
+    # See storage config details at http://source.android.com/tech/storage/
+    mkdir /mnt/shell 0700 shell shell
+
+    # Directory for putting things only root should see.
+    mkdir /mnt/secure 0700 root root
+
+    # Create private mountpoint so we can MS_MOVE from staging
+    mount tmpfs tmpfs /mnt/secure mode=0700,uid=0,gid=0
+
+    # Directory for staging bindmounts
+    mkdir /mnt/secure/staging 0700 root root
+
+    # Fuse public mount points.
+    mkdir /mnt/fuse 0700 root system
+    mount tmpfs tmpfs /mnt/fuse mode=0775,gid=1000
+
+    write /sys/class/android_usb/android0/enable 0
+    write /sys/class/android_usb/android0/idVendor 283B
+    write /sys/class/android_usb/android0/idProduct 3002
+    write /sys/class/android_usb/android0/functions mass_storage,adb
+    write /sys/class/android_usb/android0/enable 1
+    write /sys/class/android_usb/android0/iManufacturer ${ro.product.manufacturer}
+    write /sys/class/android_usb/android0/iProduct ${ro.product.model}
+    write /sys/class/android_usb/android0/iSerial ${ro.serialno}
+
 
 on boot
+
     ifup lo
     hostname localhost
     domainname localdomain
@@ -27,38 +85,34 @@ on boot
 service ueventd /sbin/ueventd
     critical
 
-service console /sbin/sh
-    class core
-    console
-    disabled
-    group log
-
-on property:ro.debuggable=1
-    start console
+service healthd /sbin/healthd -n
+    critical
 
 service recovery /sbin/recovery
 
+service setup_adbd /sbin/setup_adbd
+    oneshot
+
 service adbd /sbin/adbd recovery
     disabled
+    socket adbd stream 660 system system
 
-# Always start adbd on userdebug and eng builds
-on property:ro.debuggable=1
-    setprop adb.recovery 1
+service vold /sbin/minivold
+    socket vold stream 0660 root mount
+    ioprio be 2
 
-# Always start adbd on userdebug and eng builds
-on property:ro.debuggable=1
+# setup_adbd will start adb once it has checked the keys
+on property:service.adb.root=1
     write /sys/class/android_usb/android0/enable 0
-    write /sys/class/android_usb/android0/idVendor 283B
-    write /sys/class/android_usb/android0/idProduct 3002
-    write /sys/class/android_usb/android0/functions mass_storage,adb
+    restart adbd
     write /sys/class/android_usb/android0/enable 1
-    write /sys/class/android_usb/android0/iManufacturer $ro.product.manufacturer
-    write /sys/class/android_usb/android0/iProduct $ro.product.model
-    write /sys/class/android_usb/android0/iSerial $ro.serialno
-    start adbd
 
-# Restart adbd so it can run as root
-on property:service.adb.root=1
+on property:sys.storage.ums_enabled=1
     write /sys/class/android_usb/android0/enable 0
-    restart adbd
+    write /sys/class/android_usb/android0/functions adb,mass_storage
     write /sys/class/android_usb/android0/enable 1
+
+on property:sys.storage.ums_enabled=0
+    write /sys/class/android_usb/android0/enable 0
+    write /sys/class/android_usb/android0/functions adb
+    write /sys/class/android_usb/android0/enable ${service.adb.root}

recovery/ueventd.smdk4x12.rc

@@ -1,8 +1,3 @@
-/dev/ttyACM0              0666   system     system
-/dev/ttyACM1              0666   system     system
-#20120919: anna add for SamSung patch.
-/dev/ttyACM2              0666   system     system
-/dev/ttyACM3              0666   system     system
 /dev/mali                 0666   system     system
 /dev/ion                  0666   system     system
 /dev/ump                  0666   system     graphics