flash-ap: Standardize deploy config variable names. [chromiumos/chromite : master]

12 views
Skip to first unread message

Alex Klein (Gerrit)

unread,
Apr 7, 2020, 8:46:57 AM4/7/20
to Mike Frysinger

Alex Klein has uploaded this change for review.

View Change

flash-ap: Standardize deploy config variable names.

BUG=chromium:1045508
TEST=None

Change-Id: I248ed25ba8e54fdea23b697dec1282ef58027115
---
M lib/firmware/ap_firmware_config/volteer.py
M lib/firmware/ap_firmware_config/wilco.py
M lib/firmware/ap_firmware_config/zork.py
3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/firmware/ap_firmware_config/volteer.py b/lib/firmware/ap_firmware_config/volteer.py
index 5d0c743..3682a83 100644
--- a/lib/firmware/ap_firmware_config/volteer.py
+++ b/lib/firmware/ap_firmware_config/volteer.py
@@ -14,7 +14,7 @@
 BUILD_PACKAGES = ('chromeos-bootimage',)
 
 # TODO: Remove this line once VBoot is working on Volteer.
-__use_flashrom__ = True
+DEPLOY_SERVO_FORCE_FLASHROM = True
 
 
 def get_commands(servo):
diff --git a/lib/firmware/ap_firmware_config/wilco.py b/lib/firmware/ap_firmware_config/wilco.py
index 45d19c3..2d1fcee 100644
--- a/lib/firmware/ap_firmware_config/wilco.py
+++ b/lib/firmware/ap_firmware_config/wilco.py
@@ -9,7 +9,7 @@
 from chromite.lib import cros_logging as logging
 
 # TODO(b/143241417): Use futility anytime flashing over ssh to avoid failures.
-use_futility_ssh = True
+DEPLOY_SSH_FORCE_FUTILITY = True
 
 
 def is_fast_required(_use_futility, servo):
diff --git a/lib/firmware/ap_firmware_config/zork.py b/lib/firmware/ap_firmware_config/zork.py
index f3a7dac..333ae1d 100644
--- a/lib/firmware/ap_firmware_config/zork.py
+++ b/lib/firmware/ap_firmware_config/zork.py
@@ -12,7 +12,7 @@
 BUILD_PACKAGES = BUILD_WORKON_PACKAGES + ('chromeos-bootimage',)
 
 # TODO: Remove this line once VBoot is working on Zork.
-__use_flashrom__ = True
+DEPLOY_SERVO_FORCE_FLASHROM = True
 
 
 def get_commands(servo):

To view, visit change 2139779. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: chromiumos/chromite
Gerrit-Branch: master
Gerrit-Change-Id: I248ed25ba8e54fdea23b697dec1282ef58027115
Gerrit-Change-Number: 2139779
Gerrit-PatchSet: 1
Gerrit-Owner: Alex Klein <sak...@chromium.org>
Gerrit-MessageType: newchange

Alex Klein (Gerrit)

unread,
Apr 7, 2020, 8:53:12 AM4/7/20
to chromium-...@chromium.org

Alex Klein uploaded patch set #2 to this change.

View Change

flash-ap: Standardize deploy config variable names.

BUG=chromium:1045508
TEST=None

Cq-Depend: chromium:2139780

Change-Id: I248ed25ba8e54fdea23b697dec1282ef58027115
---
M lib/firmware/ap_firmware_config/volteer.py
M lib/firmware/ap_firmware_config/wilco.py
M lib/firmware/ap_firmware_config/zork.py
3 files changed, 3 insertions(+), 3 deletions(-)

To view, visit change 2139779. To unsubscribe, or for help writing mail filters, visit settings.



 Gerrit-Project: chromiumos/chromite 


 Gerrit-Branch: master 


 Gerrit-Change-Id: I248ed25ba8e54fdea23b697dec1282ef58027115 


 Gerrit-Change-Number: 2139779 


 Gerrit-PatchSet: 2 


 Gerrit-Owner: Alex Klein <sak...@chromium.org> 


 Gerrit-MessageType: newpatchset 



Alex Klein (Gerrit)
unread,
Apr 8, 2020, 11:59:51 AM4/8/20
to Jacob Rasmussen
Patch set 2:Verified +1
View Change
    To view, visit change 2139779. To unsubscribe, or for help writing mail filters, visit settings.
    


     Gerrit-Project: chromiumos/chromite 
    

     Gerrit-Branch: master 
    

     Gerrit-Change-Id: I248ed25ba8e54fdea23b697dec1282ef58027115 
    

     Gerrit-Change-Number: 2139779 
    

     Gerrit-PatchSet: 2 
    

     Gerrit-Owner: Alex Klein <sak...@chromium.org> 
    

     Gerrit-Reviewer: Alex Klein <sak...@chromium.org> 
    

     Gerrit-Reviewer: Jacob Rasmussen <jaco...@google.com> 
    

     Gerrit-Comment-Date: Wed, 08 Apr 2020 15:59:47 +0000 
    

     Gerrit-HasComments: No 
    

     Gerrit-Has-Labels: Yes 
    

     Gerrit-MessageType: comment 
    


    Jacob Rasmussen (Gerrit)
    unread,
    Apr 8, 2020, 12:31:18 PM4/8/20
    to Alex Klein
    Patch set 2:Code-Review +2
    View Change
      To view, visit change 2139779. To unsubscribe, or for help writing mail filters, visit settings.
      


       Gerrit-Project: chromiumos/chromite 
      

       Gerrit-Branch: master 
      

       Gerrit-Change-Id: I248ed25ba8e54fdea23b697dec1282ef58027115 
      

       Gerrit-Change-Number: 2139779 
      

       Gerrit-PatchSet: 2 
      

       Gerrit-Owner: Alex Klein <sak...@chromium.org> 
      

       Gerrit-Reviewer: Alex Klein <sak...@chromium.org> 
      

       Gerrit-Reviewer: Jacob Rasmussen <jaco...@google.com> 
      

       Gerrit-Comment-Date: Wed, 08 Apr 2020 16:31:14 +0000 
      Alex Klein (Gerrit)
      unread,
      Apr 8, 2020, 12:43:56 PM4/8/20
      to Jacob Rasmussen
      Patch set 2:Commit-Queue +2
      View Change
        To view, visit change 2139779. To unsubscribe, or for help writing mail filters, visit settings.
        


         Gerrit-Project: chromiumos/chromite 
        

         Gerrit-Branch: master 
        

         Gerrit-Change-Id: I248ed25ba8e54fdea23b697dec1282ef58027115 
        

         Gerrit-Change-Number: 2139779 
        

         Gerrit-PatchSet: 2 
        

         Gerrit-Owner: Alex Klein <sak...@chromium.org> 
        

         Gerrit-Reviewer: Alex Klein <sak...@chromium.org> 
        

         Gerrit-Reviewer: Jacob Rasmussen <jaco...@google.com> 
        

         Gerrit-Comment-Date: Wed, 08 Apr 2020 16:43:52 +0000 
        Reply all
        Reply to author
        Forward
        0 new messages