CMVC tool update to checking DD specific images

Change-Id: Ie42851e1808c90e758170affa4555126e1c614ae
cmvc-prereq: 1016846,1016947
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/37172
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>

3 files changed, 25 insertions, 24 deletions

diff --git a/src/tools/utils/CommitSbeImageToCMVC.py b/src/tools/utils/CommitSbeImageToCMVC.py
index 508b599b..27152cbf 100755
--- a/src/tools/utils/CommitSbeImageToCMVC.py
+++ b/src/tools/utils/CommitSbeImageToCMVC.py
@@ -6,7 +6,7 @@
 #
 # OpenPOWER sbe Project
 #
-# Contributors Listed Below - COPYRIGHT 2016
+# Contributors Listed Below - COPYRIGHT 2016,2017
 # [+] International Business Machines Corp.
 #
 #
@@ -187,8 +187,8 @@ def main():
     #-------------------------------------------------------------
     # CMVC ENV check
     #-------------------------------------------------------------
-    def UserCmvcENV(): 
-        # Assumed the CMVC cofig is there in the user bash ENV 
+    def UserCmvcENV():
+        # Assumed the CMVC cofig is there in the user bash ENV
         # In .bashrc the CMVX ENV would look like this
         # CMVC specific example
         #-----------------------------------------------------------
@@ -197,27 +197,27 @@ def main():
         #export CMVC_AUTH_METHOD=PWD
         #-----------------------------------------------------------
 
-        l_found_cmvc_conf = False 
+        l_found_cmvc_conf = False
         for key in os.environ.keys():
             if "CMVC" in key:
                 print "\t %s : %s" % (key,os.environ[key])
                 l_found_cmvc_conf = True
 
         if l_found_cmvc_conf == False:
-           print "\n [ ERROR SETTING ] :  The CMVC specific ENV is not set" 
-           print " Please add the following CMVC details in ~/.bashrc" 
-           print " ------------------------------------------------------" 
-           print " export CMVC_FAMILY=aix@<yourcmvcdomian>@<portnumber>" 
-           print " export CMVC_BECOME=<your cmvc id>" 
-           print " export CMVC_AUTH_METHOD=PWD" 
+           print "\n [ ERROR SETTING ] :  The CMVC specific ENV is not set"
+           print " Please add the following CMVC details in ~/.bashrc"
+           print " ------------------------------------------------------"
+           print " export CMVC_FAMILY=aix@<yourcmvcdomian>@<portnumber>"
+           print " export CMVC_BECOME=<your cmvc id>"
+           print " export CMVC_AUTH_METHOD=PWD"
            print " ------------------------------------------------------"
            return errorcode.ERROR_SETTING
-     
+
         return errorcode.SUCCESS_EXIT
 
     # Testing CMVC login session.. probe
-    def CheckCmvcAccess(): 
-        cmd='File -view src/sbei/sbfw/img/sbe_seeprom.bin -family aix -release fips910 >/dev/null 2>&1'
+    def CheckCmvcAccess():
+        cmd='File -view src/sbei/sbfw/img/sbe_seeprom_DD1.bin -family aix -release fips910 >/dev/null 2>&1'
         rc = os.system(cmd)
         if rc:
             return errorcode.ERROR_CMVC_LOGIN
diff --git a/src/tools/utils/sbeCmvcConstants.py b/src/tools/utils/sbeCmvcConstants.py
index 339d83b7..c2a93f84 100755
--- a/src/tools/utils/sbeCmvcConstants.py
+++ b/src/tools/utils/sbeCmvcConstants.py
@@ -5,7 +5,7 @@
 #
 # OpenPOWER sbe Project
 #
-# Contributors Listed Below - COPYRIGHT 2016
+# Contributors Listed Below - COPYRIGHT 2016,2017
 # [+] International Business Machines Corp.
 #
 #
@@ -66,8 +66,8 @@ SUCCESS_TRACK_STATE     = 53
 SUCCESS_CI_TRIGGER      = 54
 
 # This is a default files list to Check-in
-CMVC_FILE_LIST  ="sbe_sp_intf.H,simics.tar,sbe_seeprom.bin,releaseNotes.html"
-CMVC_FILE_UNDO_LIST  ="src/sbei/sbfw/sbe_sp_intf.H src/sbei/sbfw/simics.tar src/sbei/sbfw/img/sbe_seeprom.bin,src/sbei/sbfw/releaseNotes.html"
+CMVC_FILE_LIST  ="sbe_sp_intf.H,simics.tar,sbe_seeprom.bin,sbe_seeprom_DD1.bin,sbe_seeprom_DD2.bin,releaseNotes.html"
+CMVC_FILE_UNDO_LIST  ="src/sbei/sbfw/sbe_sp_intf.H src/sbei/sbfw/simics.tar src/sbei/sbfw/img/sbe_seeprom.bin src/sbefw/sbe_seeprom_DD1.bin src/sbefw/sbe_seeprom_DD2.bin src/sbei/sbfw/releaseNotes.html"
 
 CMVC_DIR_CREATE ="sandbox_"
 
@@ -82,4 +82,4 @@ ERROR_SANDBOX_EXIST = 200 # Sandbox doesnt exist
 ERROR_FILE_INPUT    = 201 # User have entered no file
 ERROR_BUILD_FAILED  = 202 # Compilation failed
 ERROR_HOOKING_FILE  = 203 # Error while building shell hooks
-FILE_LOOKUP_LIST  ="src/sbei/sbfw/sbe_sp_intf.H,src/sbei/sbfw/simics.tar,src/sbei/sbfw/img/sbe_seeprom.bin,src/sbei/sbfw/releaseNotes.html"
+FILE_LOOKUP_LIST  ="src/sbei/sbfw/sbe_sp_intf.H,src/sbei/sbfw/simics.tar,src/sbei/sbfw/img/sbe_seeprom.bin,src/sbei/sbfw/img/sbe_seeprom_DD1.bin,src/sbei/sbfw/img/sbe_seeprom_DD2.bin,src/sbei/sbfw/releaseNotes.html"
diff --git a/src/tools/utils/sbePrime.py b/src/tools/utils/sbePrime.py
index 4499873a..986a2733 100755
--- a/src/tools/utils/sbePrime.py
+++ b/src/tools/utils/sbePrime.py
@@ -76,11 +76,10 @@ def main():
         print " \t                                and you want to compile, use this option then only"
         print " \t  -i,--files     = [ Optional ] Firmware Files coma ',' separated input file1,file2"
         print " \t                                Only the pre-define listed files bellow:"
-        print " \t                                sbe_sp_intf.H,simics.tar,sbe_seeprom.bin"
+        print " \t                                sbe_sp_intf.H,simics.tar,"
+        print " \t                                sbe_seeprom_DD1.bin/sbe_seeprom_DD2.bin"
         print " \t  -r,--rc_file   = [ Optional ] The RC file for the sandbox (with absolute path)"
         print " \t  -n,--no_build  = [ Optional ] Flag to determine if sbei component should be compiled"
-        print " \t  -l,--level     = [ Optional ] Flag to determine ddlevel of the image, by default"
-        print " \t                                DD1 image is compiled"
         print " \t  -h,--help      = Help"
         print "  ------------------------------------------------------------------------------------"
 
@@ -115,7 +114,7 @@ def main():
     file_name    = "None"
     rc_file      = "None"
     build        = "1"
-    ddlevel      = "DD1"
+    ddlevel      = "None"
 
     #----------------------------
     # Read command line args
@@ -241,9 +240,11 @@ def main():
             exit_main(rc_shell)
 
     # Files to copy for sbe prime
-    # TODO via RTC:168436 - DD specific images to be updated in CMVC makefiles
-    # PRIME_FILE_LIST  ="sbe_sp_intf.H,simics.tar,sbe_seeprom_"+ddlevel+".bin"
-    PRIME_FILE_LIST  ="sbe_sp_intf.H,simics.tar,sbe_seeprom.bin"
+    # TODO via RTC:168436 - remove sbe_seeprom.bin
+    if ddlevel == "None":
+        PRIME_FILE_LIST  ="sbe_sp_intf.H,simics.tar,sbe_seeprom.bin,sbe_seeprom_DD1.bin,sbe_seeprom_DD2.bin"
+    else:
+        PRIME_FILE_LIST  ="sbe_sp_intf.H,simics.tar,sbe_seeprom.bin,sbe_seeprom_"+ddlevel+".bin"
 
     #----------------------------------------
     # 4) Copy the files from repo to sandbox