ota two step 升级进入fastboot模式，无法启动修改

diff --git a/build/make/tools/releasetools/ota_from_target_files.py b/build/make/tools/releasetools/ota_from_target_files.py
index 79670ee..0b2bcd5 100755
--- a/build/make/tools/releasetools/ota_from_target_files.py
+++ b/build/make/tools/releasetools/ota_from_target_files.py
@@ -788,8 +788,6 @@ if get_stage("%(bcb_dev)s") == "2/3" then
     script.Comment("Stage 2/3")
     script.WriteRawImage("/recovery", "recovery.img")
     script.AppendExtra("""
-set_stage("%(bcb_dev)s", "3/3");
-reboot_now("%(bcb_dev)s", "recovery");
 else if get_stage("%(bcb_dev)s") == "3/3" then
 """ % bcb_dev)
 
@@ -844,7 +842,8 @@ else if get_stage("%(bcb_dev)s") == "3/3" then
   script.WriteRawImage("/boot", "boot.img")
 
   script.ShowProgress(0.2, 10)
-  device_specific.FullOTA_InstallEnd()
+  if not OPTIONS.two_step:
+    device_specific.FullOTA_InstallEnd()
 
   if OPTIONS.extra_script is not None:
     script.AppendExtra(OPTIONS.extra_script)
@@ -867,11 +866,20 @@ set_stage("%(bcb_dev)s", "");
 
     script.AppendExtra("""
 set_stage("%(bcb_dev)s", "2/3");
-reboot_now("%(bcb_dev)s", "");
+reboot_now("%(bcb_dev)s", "recovery");
 endif;
 endif;
 """ % bcb_dev)
-
+    if OPTIONS.two_step:
+      script.AppendExtra("""
+if get_stage("%(bcb_dev)s") == "2/3" then
+""" % bcb_dev)
+      device_specific.FullOTA_InstallEnd()
+      script.AppendExtra("""
+set_stage("%(bcb_dev)s", "3/3");
+reboot_now("%(bcb_dev)s", "recovery");
+endif;
+""" % bcb_dev)
   script.SetProgress(1)
   script.AddToZip(input_zip, output_zip, input_path=OPTIONS.updater_binary)
   metadata["ota-required-cache"] = str(script.required_cache)
@@ -1463,8 +1471,6 @@ if get_stage("%(bcb_dev)s") == "2/3" then
     script.AppendExtra("sleep(20);\n")
     script.WriteRawImage("/recovery", "recovery.img")
     script.AppendExtra("""
-set_stage("%(bcb_dev)s", "3/3");
-reboot_now("%(bcb_dev)s", "recovery");
 else if get_stage("%(bcb_dev)s") != "3/3" then
 """ % bcb_dev)
 
@@ -1571,7 +1577,9 @@ else
       print("boot image unchanged; skipping.")
 
   # Do device-specific installation (eg, write radio image).
-  device_specific.IncrementalOTA_InstallEnd()
+  if not OPTIONS.two_step:
+    device_specific.IncrementalOTA_InstallEnd()
+
 
   if OPTIONS.extra_script is not None:
     script.AppendExtra(OPTIONS.extra_script)
@@ -1586,6 +1594,16 @@ set_stage("%(bcb_dev)s", "");
 endif;
 endif;
 """ % bcb_dev)
+    if OPTIONS.two_step:
+      script.AppendExtra("""
+if get_stage("%(bcb_dev)s") == "2/3" then
+""" % bcb_dev)
+      device_specific.IncrementalOTA_InstallEnd()
+      script.AppendExtra("""
+set_stage("%(bcb_dev)s", "3/3");
+reboot_now("%(bcb_dev)s", "recovery");
+endif;
+""" % bcb_dev)