commit db8d4ba7b0cca087abadae6ed50e7d9d66cfd5c5
author Jean-Baptiste Queru <jbq@google.com> Mon Oct 01 17:39:08 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Oct 01 17:39:08 2012 -0700
tree 2d083013624905ff3c9be49dc62098de9a17fc0a
parent e819834ea17380042bf767c457e89dad24ff4aa2
parent 2466e5eaa596c7704a78af71a73e86bacca1032e

am 2466e5ea: Handle devices with two bootloader copies

* commit '2466e5eaa596c7704a78af71a73e86bacca1032e':
  Handle devices with two bootloader copies

clear-factory-images-variables.sh

diff --git a/clear-factory-images-variables.sh b/clear-factory-images-variables.sh
index 154244d..aa41e7c 100644
--- a/clear-factory-images-variables.sh
+++ b/clear-factory-images-variables.sh
@@ -17,6 +17,7 @@
 unset BOOTLOADER
 unset BOOTLOADERFILE
 unset BOOTLOADERSRC
+unset TWINBOOTLOADERS
 unset BUILD
 unset CDMARADIO
 unset CDMARADIOFILE

generate-factory-images-common.sh

diff --git a/generate-factory-images-common.sh b/generate-factory-images-common.sh
index f89bd6f..e1a4b6e 100644
--- a/generate-factory-images-common.sh
+++ b/generate-factory-images-common.sh
@@ -117,6 +117,14 @@
 fi
 cat >> tmp/$PRODUCT-$VERSION/flash-all.sh << EOF
 fastboot flash bootloader bootloader-$DEVICE-$BOOTLOADER.img
+EOF
+if test "$TWINBOOTLOADERS" = "true"
+then
+cat >> tmp/$PRODUCT-$VERSION/flash-all.sh << EOF
+fastboot flash bootloader2 bootloader-$DEVICE-$BOOTLOADER.img
+EOF
+fi
+cat >> tmp/$PRODUCT-$VERSION/flash-all.sh << EOF
 fastboot reboot-bootloader
 sleep $SLEEPDURATION
 EOF
@@ -178,6 +186,14 @@
 fi
 cat >> tmp/$PRODUCT-$VERSION/flash-all.bat << EOF
 fastboot flash bootloader bootloader-$DEVICE-$BOOTLOADER.img
+EOF
+if test "$TWINBOOTLOADERS" = "true"
+then
+cat >> tmp/$PRODUCT-$VERSION/flash-all.bat << EOF
+fastboot flash bootloader2 bootloader-$DEVICE-$BOOTLOADER.img
+EOF
+fi
+cat >> tmp/$PRODUCT-$VERSION/flash-all.bat << EOF
 fastboot reboot-bootloader
 ping -n $SLEEPDURATION 127.0.0.1 >nul
 EOF
@@ -232,6 +248,14 @@
 fi
 cat >> tmp/$PRODUCT-$VERSION/flash-base.sh << EOF
 fastboot flash bootloader bootloader-$DEVICE-$BOOTLOADER.img
+EOF
+if test "$TWINBOOTLOADERS" = "true"
+then
+cat >> tmp/$PRODUCT-$VERSION/flash-base.sh << EOF
+fastboot flash bootloader2 bootloader-$DEVICE-$BOOTLOADER.img
+EOF
+fi
+cat >> tmp/$PRODUCT-$VERSION/flash-base.sh << EOF
 fastboot reboot-bootloader
 sleep $SLEEPDURATION
 EOF