edison: Rename 'data' partition to 'userdata' and remove some duplication.

With this change "fastboot -w" works as expected.

Other bug fixes:

 - Forward params from 'provision' to fastboot program, as required
   by the "Brillo Device Provisioning" document.

 - In the phoneflashtoollitecli step, don't flash all of Brillo since
   this means keeping two descriptions of our partitions / fastboot
   commands in place. Instead tell the user to run the 'provision'
   command, then 'fastboot reboot'. That way we'll keep it in one
   place only.

Bug: 25199072
Change-Id: If3daa783f242782230808d362ada39f6c17fb919
Test: Manually tested using 'provision', 'phoneflashtoollitecli', 'fastboot -w'.

5 files changed, 10 insertions, 72 deletions

diff --git a/flash_tools/FlashEdison.json b/flash_tools/FlashEdison.json
index c58c517..968573e 100644
--- a/flash_tools/FlashEdison.json
+++ b/flash_tools/FlashEdison.json
@@ -46,72 +46,15 @@
                 "args": "flash u-boot ${u-boot_file}"
             },
             {
-                "restrict": ["full", "os"],
-                "retry": 2,
-                "mandatory": true,
-                "description": "Flashing boot",
-                "timeout": 60000,
-                "tool": "fastboot",
-                "args": "flash boot_a ${boot_file}"
-            },
-            {
-                "restrict": ["full", "os"],
-                "retry": 2,
-                "mandatory": true,
-                "description": "Flashing data",
-                "timeout": 60000,
-                "tool": "fastboot",
-                "args": "flash data ${userdata_file}"
-            },
-            {
-                "restrict": ["full", "os", "system"],
-                "retry": 2,
-                "mandatory": true,
-                "description": "Flashing system",
-                "timeout": 1200000,
-                "tool": "fastboot",
-                "args": "flash system_a ${system_file}"
-            },
-            {
-                "restrict": ["full", "os", "system"],
-                "retry": 2,
-                "mandatory": true,
-                "description": "Setting slot 0 active",
-                "timeout": 1200000,
-                "tool": "fastboot",
-                "args": "oem set_active 0"
-            },
-            {
-                "restrict": ["full", "os", "system"],
-                "retry": 2,
-                "mandatory": true,
-                "description": "Rebooting",
-                "timeout": 1200000,
-                "tool": "fastboot",
-                "args": "reboot"
-            },
-            {
                 "duration": 60000,
                 "restrict": null,
                 "tool": "notifier",
-                "source": "Edison board needs to reboot<br />\nPlease do not unplug it for 2 minutes<br /><br /><br />\n\n",
-                "description": "flashing ifwi via xfstk"
+                "source": "Run 'provision', then 'fastboot reboot' to boot the device.",
+                "description": "notify"
             }
         ],
         "groups": {},
         "parameters": {
-            "system_file": {
-                "type": "file",
-                "description": "System",
-                "value": "system.img",
-                "name": "System"
-            },
-            "userdata_file": {
-                "type": "file",
-                "description": "data partition",
-                "value": "userdata.img",
-                "name": "Userdata"
-            },
             "u-boot_file": {
                 "type": "file",
                 "description": "U-Boot",
@@ -148,12 +91,6 @@
                 "value": "edison_dnx_osr.bin",
                 "name": "OS DnX"
             },
-            "boot_file": {
-                "type": "file",
-                "description": "Boot partition",
-                "value": "boot.img",
-                "name": "Boot partition"
-            },
             "gpt_file": {
                 "type": "file",
                 "description": "Partition Table",
diff --git a/flash_tools/brillo-flashall-edison.bat b/flash_tools/brillo-flashall-edison.bat
index 74f9d0e..d1d9cb8 100755
--- a/flash_tools/brillo-flashall-edison.bat
+++ b/flash_tools/brillo-flashall-edison.bat
@@ -22,5 +22,5 @@ fastboot flash gpt      gpt.bin
 fastboot flash u-boot   u-boot-edison.bin
 fastboot flash boot_a   boot.img
 fastboot flash system_a system.img
-fastboot flash data     userdata.img
+fastboot flash userdata userdata.img
 fastboot oem set_active 0
diff --git a/flash_tools/brillo-flashall-edison.sh b/flash_tools/brillo-flashall-edison.sh
index dafbcfa..693bfd2 100755
--- a/flash_tools/brillo-flashall-edison.sh
+++ b/flash_tools/brillo-flashall-edison.sh
@@ -36,5 +36,6 @@ fastboot flash gpt     "${_EDISON_IMG_DIR}"/gpt.bin \
 	flash u-boot   "${_EDISON_UBOOT_DIR}"/u-boot-edison.bin \
 	flash boot_a   "${_EDISON_IMG_DIR}"/boot.img \
 	flash system_a "${_EDISON_IMG_DIR}"/system.img \
-	flash data     "${_EDISON_IMG_DIR}"/userdata.img
-fastboot oem set_active 0
+	flash userdata "${_EDISON_IMG_DIR}"/userdata.img \
+	oem set_active 0 "$@"
+
diff --git a/fstab.device b/fstab.device
index 4757e5b..1513090 100644
--- a/fstab.device
+++ b/fstab.device
@@ -1,3 +1,3 @@
 /dev/block/by-name/system   /system      ext4    ro,barrier=1,discard                                wait,slotselect
-/dev/block/by-name/data     /data        ext4    nosuid,nodev,barrier=1,noauto_da_alloc,discard      wait,check,encryptable=footer
+/dev/block/by-name/userdata /data        ext4    nosuid,nodev,barrier=1,noauto_da_alloc,discard      wait,check,encryptable=footer
 /dev/block/by-name/misc     /misc        emmc    defaults                                            defaults
diff --git a/gpt.ini b/gpt.ini
index a101b22..fdd727b 100644
--- a/gpt.ini
+++ b/gpt.ini
@@ -1,5 +1,5 @@
 [base]
-partitions = u-boot factory panic recovery boot_a system_a oem_a misc boot_b system_b oem_b data
+partitions = u-boot factory panic recovery boot_a system_a oem_a misc boot_b system_b oem_b userdata
 
 [partition.u-boot]
 label = u-boot
@@ -67,8 +67,8 @@ len = 96
 type = linux
 guid = a623cc5c-7eab-49d7-9314-61366c560ebc
 
-[partition.data]
-label = data
+[partition.userdata]
+label = userdata
 len = -1
 type = linux
 guid = b1e70484-b6f7-4c2d-9b5f-f40862361369