diff options
| author | anbranci <alexandru.n.branciog@intel.com> | 2015-12-14 18:27:04 +0200 |
|---|---|---|
| committer | anbranci <alexandru.n.branciog@intel.com> | 2015-12-14 18:27:04 +0200 |
| commit | 1bad2603684ccb3e44d4877f0b0aae5e78bf2c9f (patch) | |
| tree | 0aea6211f010d7debaf2682a5bf58f6b857ae657 | |
| parent | 974803d1d0f189fee12f337514460b603bd4ec71 (diff) | |
| download | edison-1bad2603684ccb3e44d4877f0b0aae5e78bf2c9f.tar.gz | |
Flash both _a and _b boot and system partitions.
Fix is needed by the automated recovery script
in the PTS suite which assumes both partitions
are written.
BUG=25892336
Change-Id: Icb2b4735e7922a2b1ec6edd58a67361233de8ef2
| -rw-r--r-- | flash_tools/FlashEdison.json | 26 | ||||
| -rwxr-xr-x | flash_tools/brillo-flashall-edison.bat | 2 | ||||
| -rwxr-xr-x | flash_tools/brillo-flashall-edison.sh | 2 |
3 files changed, 26 insertions, 4 deletions
diff --git a/flash_tools/FlashEdison.json b/flash_tools/FlashEdison.json index 1eeaeeb..4309b56 100644 --- a/flash_tools/FlashEdison.json +++ b/flash_tools/FlashEdison.json @@ -55,13 +55,22 @@ "args": "flash boot_a ${boot_file}" }, { - "restrict": ["full", "os"], + "restrict": ["full", "os", "update"], "retry": 2, "mandatory": true, - "description": "Flashing data", + "description": "Flashing system", + "timeout": 1200000, + "tool": "fastboot", + "args": "flash system_a ${system_file}" + }, + { + "restrict": ["full", "os", "update"], + "retry": 2, + "mandatory": true, + "description": "Flashing boot", "timeout": 60000, "tool": "fastboot", - "args": "flash userdata ${userdata_file}" + "args": "flash boot_b ${boot_file}" }, { "restrict": ["full", "os", "update"], @@ -70,7 +79,16 @@ "description": "Flashing system", "timeout": 1200000, "tool": "fastboot", - "args": "flash system_a ${system_file}" + "args": "flash system_b ${system_file}" + }, + { + "restrict": ["full", "os"], + "retry": 2, + "mandatory": true, + "description": "Flashing data", + "timeout": 60000, + "tool": "fastboot", + "args": "flash userdata ${userdata_file}" }, { "restrict": ["full", "os", "update"], diff --git a/flash_tools/brillo-flashall-edison.bat b/flash_tools/brillo-flashall-edison.bat index d1d9cb8..4f17f5d 100755 --- a/flash_tools/brillo-flashall-edison.bat +++ b/flash_tools/brillo-flashall-edison.bat @@ -22,5 +22,7 @@ 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 boot_b boot.img +fastboot flash system_b system.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 231abce..a8a971b 100755 --- a/flash_tools/brillo-flashall-edison.sh +++ b/flash_tools/brillo-flashall-edison.sh @@ -36,6 +36,8 @@ 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 boot_b "${_EDISON_IMG_DIR}"/boot.img \ + flash system_b "${_EDISON_IMG_DIR}"/system.img \ flash userdata "${_EDISON_IMG_DIR}"/userdata.img \ oem set_active 0 "$@" |