Merge pull request #2 in PROCESSOR-SDK/mcsdk-tools from PRSDK-2194 to master

[keystone-rtos/mcsdk-tools.git] / program_evm / program_evm.js

diff --git a/program_evm/program_evm.js b/program_evm/program_evm.js
index b5d6d52d11f8bd287b922cec02c58c4b6ec33e57..479064edacc294e51ba3364a121e8e3687a1f86a 100644 (file)
--- a/program_evm/program_evm.js
+++ b/program_evm/program_evm.js
@@ -111,7 +111,7 @@ var dss_script_dir    = java.lang.System.getenv("DSS_SCRIPT_DIR");
 var host_os           = "";
 var script_logs    = nandwriter_dir+"/logs/";
 var script_configs = nandwriter_dir+"/configs/";
-var script_binaries = nandwriter_dir+"/binaries/";
+var script_binaries = "../prebuilt-images/";
 var targetConfig = "";
 var writeAll = false;
 var writerImages = "";
@@ -158,21 +158,26 @@ if (arguments.length > 0 && arguments.length < 3)
         xds200 = true;
        emulation_spec = "XDS200 emulator";
         board_spec = board_spec.replace(/ls$/, "l");
-    }    
-       
-    // for now, use the same software for lx and l variants
+    }
+
+    if (board_spec.match(/k2h$/) || board_spec.match(/k2e$/) || board_spec.match(/k2l$/) || board_spec.match(/k2g$/))
+    {
+        emulation_spec = "XDS2xx emulator";
+    }
+
+       // for now, use the same software for lx and l variants
     board_spec = board_spec.replace(/lx$/, "l");
-    
+
     // for now, treat evm6618l as an alias for evm6670l
     board_spec = board_spec.replace(/evm6618/, "evm6670");
-        
+
     targetFlag = board_spec;
-    
+
     endian_spec = (big_endian ? "-be" : "");
-    
-    board_binaries = script_binaries + targetFlag + endian_spec + "/";
+
+    board_binaries = script_binaries;
     targetConfig = java.lang.System.getenv("PROGRAM_EVM_TARGET_CONFIG_FILE");
-    if (!targetConfig)    
+    if (!targetConfig)
         targetConfig = script_configs + targetFlag + "/" + targetFlag + (emul560 ? "e" : "") + (xds200 ? "s" : "") + host_os + ".ccxml";
 
     print("board: " + targetFlag);
@@ -226,6 +231,23 @@ var eeprom51 = board_binaries + "eeprom51.bin";
 var nand = board_binaries + "nand.bin";
 var nor = board_binaries + "nor.bin";
 
+var custom_config = script_configs+targetFlag+"/program_evm_config";
+if (isFile(custom_config))
+{
+       file = new java.io.BufferedReader(new java.io.FileReader(custom_config))
+       while((line = file.readLine()) != null) {
+               params = line.split("\\s+");
+               if (params[1] == undefined) continue;
+               if ("board_binaries" == params[0]) board_binaries = params[1];
+               else if ("norwriterbinary" == params[0]) norwriterbinary = board_binaries + params[1];
+               else if ("nandwriterbinary" == params[0]) nandwriterbinary = board_binaries + params[1];
+               else if ("i2cwriterbinary" == params[0]) i2cwriterbinary = board_binaries + params[1];
+               else if ("nand" == params[0]) nand = board_binaries + params[1];
+               else if ("nor" == params[0]) nor = board_binaries + params[1];
+       }
+       file.close();
+}
+
 // Note: nAddress is the load address for using eepromwriter.
 //       nandNorAddress is the address used for nandwriter and norwriter.
 switch (targetFlag)
@@ -278,6 +300,30 @@ switch (targetFlag)
                var nandNorAddress = 0x80000000;
                var iblByteSwap = false;
                break;
+       case "evmk2h":
+               cpu_id = "C66xx_0";
+               var nAddress = 0x0C000000;
+               var nandNorAddress = 0x80000000;
+               var iblByteSwap = false;
+        break;
+       case "evmk2e":
+               cpu_id = "C66xx_0";
+               var nAddress = 0x0C000000;
+               var nandNorAddress = 0x80000000;
+               var iblByteSwap = false;
+        break;
+       case "evmk2l":
+               cpu_id = "C66xx_0";
+               var nAddress = 0x0C000000;
+               var nandNorAddress = 0x80000000;
+               var iblByteSwap = false;
+        break;
+       case "evmk2g":
+               cpu_id = "C66xx_0";
+               var nAddress = 0x0C000000;
+               var nandNorAddress = 0x80000000;
+               var iblByteSwap = false;
+        break;
        default:
                script.traceWrite("Could not file cpu id for target " + targetFlag + "\n");