From 620369c1c9f1bad7cd2402b8e2f4b88356365e27 Mon Sep 17 00:00:00 2001
From: Mohammed Habibulla <moch@google.com>
Date: Fri, 29 Jan 2016 21:41:19 +0000
Subject: Revert "Revert "Build vendor-partition package and update
 provision-device script""

This reverts commit 3ff2c120ab066c9bbc662c2a62f1832a3102f05f.

Change-Id: I80c3f337fb0946acca575ef5736e648a6a84467c
---
 BoardConfig.mk                        |  5 +++++
 flash_tools/brillo-flashall-edison.sh | 20 +++++++++++---------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 7e0e736..933ae2d 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -58,5 +58,10 @@ WIFI_DRIVER_FW_PATH_P2P      := "/vendor/firmware/bcm43340/fw_bcmdhd_p2p.bin"
 BOARD_SEPOLICY_DIRS += \
     device/intel/edison/sepolicy
 
+vendor_partition_directory := vendor/bsp/intel/edison
+BRILLO_VENDOR_PARTITIONS := \
+    $(vendor_partition_directory)/uboot_firmware:u-boot-edison.bin \
+    $(vendor_partition_directory)/uboot_firmware:gpt.bin
+
 # Must defined at the end of the file
 $(call add_device_packages)
diff --git a/flash_tools/brillo-flashall-edison.sh b/flash_tools/brillo-flashall-edison.sh
index a8a971b..761301b 100755
--- a/flash_tools/brillo-flashall-edison.sh
+++ b/flash_tools/brillo-flashall-edison.sh
@@ -22,22 +22,24 @@ function dir_with_file() {
 LOCAL_DIR=$(dirname "${0}")
 
 # Location of where the Brillo OS image is built.
-_EDISON_IMG_DIR=$(dir_with_file boot.img \
+OS=$(dir_with_file boot.img \
+    "${ANDROID_PROVISION_OS_PARTITIONS}" \
     "${LOCAL_DIR}" \
     "${BRILLO_OUT_DIR}" \
     "${ANDROID_PRODUCT_OUT}")
 
 # Location of binary blobs supplied by the vendor.
-_EDISON_UBOOT_DIR=$(dir_with_file u-boot-edison.bin \
+VENDOR=$(dir_with_file u-boot-edison.bin \
+    "${ANDROID_PROVISION_VENDOR_PARTITIONS}" \
     "${LOCAL_DIR}" \
     "${ANDROID_BUILD_TOP}/vendor/bsp/intel/edison/uboot_firmware")
 
-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 \
+fastboot flash gpt     "${VENDOR}"/gpt.bin \
+	flash u-boot   "${VENDOR}"/u-boot-edison.bin \
+	flash boot_a   "${OS}"/boot.img \
+	flash system_a "${OS}"/system.img \
+	flash boot_b   "${OS}"/boot.img \
+	flash system_b "${OS}"/system.img \
+	flash userdata "${OS}"/userdata.img \
 	oem set_active 0 "$@"
 
-- 
cgit v1.2.3