Update configs for emmc emulation

Author: Dees-Troy

BoardConfig.mk

@@ -45,3 +45,9 @@ RECOVERY_GRAPHICS_USE_LINELENGTH := true
 TW_HAS_NO_BOOT_PARTITION := true
 TWRP_CUSTOM_KEYBOARD := ../../../device/emulator/twrp/recovery/hardwarekeyboard.cpp
 
+RECOVERY_SDCARD_ON_DATA := true
+TW_INTERNAL_STORAGE_PATH := "/data/media"
+TW_INTERNAL_STORAGE_MOUNT_POINT := "data"
+TW_EXTERNAL_STORAGE_PATH := "/external_sd"
+TW_EXTERNAL_STORAGE_MOUNT_POINT := "external_sd"
+

README.md

@@ -2,10 +2,46 @@
 
 This is a set of device configs that you can use to build and test TWRP in the Android emulator. Note that adb will take about 10 to 15 seconds after TWRP is booted to become available. Just wait and it will come online eventually.
 
+This branch of the device configs is intended to give you a more modern emmc type of device instead of relying on the mtd nand setup that the default emulator configuration uses. In order to make this setup work, you will have to boot the emulator with a custom kernel. We added ext2/3/4 support as well as support for reading a partition map to the kernel configuration. The source for this kernel is located here:
+
+[Kernel Source](https://github.com/Dees-Troy/android_kernel_goldfish "Kernel Source")
+
 To boot this in the emulator, build your recoveryimage. With the Android emulator make a new device based on a Galaxy Nexus. Allow it to have a hardware keyboard and a sdcard. Give it a name like TWRP. Then from your android-sdk/tools folder run the following command:
-./emulator -avd TWRP -ramdisk ~/cm_folder/out/target/product/twrp/ramdisk-recovery.img
 
-You can find a compiling guide [here](http://forum.xda-developers.com/showthread.php?t=1943625 "Guide").
+./emulator -avd TWRP -ramdisk ~/cm_folder/out/target/product/twrp/ramdisk-recovery.img -kernel ~/cm_folder/device/emulator/twrp/goldfish_2.6_kernel
+
+After the first boot, wait for ADB to start up, then: adb shell /sbin/create_partitions.sh
+
+This script will partition the sdcard with a boot, recovery, system, cache, data, and removable sdcard partition. It's designed to work with a 1500MiB sdcard. If you want a different sdcard size then you will need to modify the script in the cm_folder/device/emulator/twrp/recovery/root/sbin/create_partitions.sh location to suite your needs. The script will also copy the existing system files from the MTD system partition to the new emmc-based partition.
+
+If you want to make the emulator boot up using the emmc partitions, you will need to modify the ramdisk.img. Locate the ramdisk.img in your android-sdk/system-images/android##/armeabi-v7a/ folder. To unpack it:
+
+mkdir ramdisk
+
+cd ramdisk
+
+gzip -dc ../ramdisk.img | cpio -i
+
+Modify the init.rc to mount your mmc based partitions instead of the mtd ones by locating the line in init.rc that says "on fs" and modifying it to look like this:
+
+on fs
+# mount emmc 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
+    mount ext4 /dev/block/mmcblk0p3 /system wait ro
+    mount ext4 /dev/block/mmcblk0p5 /data wait noatime nosuid nodev
+    mount ext4 /dev/block/mmcblk0p4 /cache wait noatime nosuid nodev
+
+Save the changes and repack the ramdisk image as follows:
+
+find . | cpio -o -H newc > gzip > ../newramdisk.img
+
+Boot the emulator using -ramdisk path/to/newramdisk.img -kernel path/to/goldfish_2.6_kernel
+
+You can find a compiling guide for TWRP [here](http://forum.xda-developers.com/showthread.php?t=1943625 "Guide").
 
 [More information about the project.](http://www.teamw.in/project/twrp2 "More Information")
 

goldfish_2.6_kernel

@@ -1,7 +1,9 @@
 # mount point	fstype		device
 
-/system     yaffs2      system
-/cache      yaffs2      cache
-/data		yaffs2      userdata
-/sdcard     vfat        /dev/block/mmcblk0
+/external_sd  vfat      /dev/block/mmcblk0p6
+/boot         emmc      /dev/block/mmcblk0p1
+/recovery     emmc      /dev/block/mmcblk0p2
+/system       ext4      /dev/block/mmcblk0p3
+/cache        ext4      /dev/block/mmcblk0p4
+/data         ext4      /dev/block/mmcblk0p5     length=-16384
 

recovery.fstab

@@ -20,8 +20,7 @@ on init
     mkdir /cache
     mount /tmp /tmp tmpfs
 
-on boot
-
+on init
     ifup lo
     ifup eth0
     hostname localhost
@@ -32,16 +31,17 @@ on boot
 service ueventd /sbin/ueventd
     critical
 
-service recovery /sbin/recovery
-
-service adbd /sbin/adbd recovery
-    disabled
-
 #this starts the network needed to get adb working in the emulator
 service network_start /sbin/network_start.sh
     user root
     oneshot
 
+on boot
+service recovery /sbin/recovery
+
+service adbd /sbin/adbd recovery
+    disabled
+
 # Always start adbd on userdebug and eng builds
 # In recovery, always run adbd as root.
 on property:ro.debuggable=1

recovery/init-twrp.rc

@@ -0,0 +1,42 @@
+#!/sbin/sh
+# This will repartition the emulated sdcard so that
+# you can emulate a newer, non-MTD device.
+# This partitioning scheme is based on a 1500MiB
+# sdcard.
+
+umount /sdcard
+
+echo "Creating partition table..."
+# Wipe all partitions and give you a gpt partition table
+parted -s /dev/block/mmcblk0 mklabel gpt
+# 8MB boot partition
+parted /dev/block/mmcblk0 mkpart boot ext2 0 8MB
+# 8MB recovery partition
+parted /dev/block/mmcblk0 mkpart recovery ext2 8MB 16MB
+# 200MB system partition
+parted /dev/block/mmcblk0 mkpart system ext4 16MB 216MB
+# 64MB cache partition
+parted /dev/block/mmcblk0 mkpart cache ext4 216MB 280MB
+# 720MB data partition
+parted /dev/block/mmcblk0 mkpart data ext4 280MB 1000MB
+# 573MB external_sd partition
+parted /dev/block/mmcblk0 mkpart external_sd ext4 1000MB 1573MB
+
+echo "Formatting system, data, and cache..."
+# Format system, cache, and data as ext4
+make_ext4fs /dev/block/mmcblk0p3
+make_ext4fs /dev/block/mmcblk0p4
+make_ext4fs -l -16384 /dev/block/mmcblk0p5
+
+echo "Formatting external_sd..."
+# Format external_sd as vfat
+mkdosfs /dev/block/mmcblk0p6
+
+echo "Mounting new system and sdcard and make a copy of system..."
+mount -t vfat /dev/block/mmcblk0p6 /sdcard
+mkdir /systemmtd
+mount -t ext4 /dev/block/mmcblk0p3 /system
+mount -t yaffs2 /dev/block/mtdblock0 /systemmtd
+cd /system2 && cp -R * /system
+echo "DONE!"
+

recovery/root/sbin/create_partitions.sh

@@ -70,3 +70,4 @@ case "$my_ip" in
     *) ifconfig eth1 "$my_ip" netmask 255.255.255.0 up
     ;;
 esac
+