Added support for 6657 program evm; changed eepromwriter to use MSMC

diff --git a/program_evm/configs/evm6657l/evm6657l-linuxhost.ccxml b/program_evm/configs/evm6657l/evm6657l-linuxhost.ccxml
new file mode 100644 (file)
index 0000000..8a796e8
--- /dev/null
+++ b/program_evm/configs/evm6657l/evm6657l-linuxhost.ccxml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<configurations XML_version="1.2" id="configurations_0">
+<configuration XML_version="1.2" id="Texas Instruments XDS100v1 USB Emulator_0">
+        <instance XML_version="1.2" desc="Texas Instruments XDS100v1 USB Emulator_0" href="connections/TIXDS100usb_Connection.xml" id="Texas Instruments XDS100v1 USB Emulator_0" xml="TIXDS100usb_Connection.xml" xmlpath="connections"/>
+        <connection XML_version="1.2" id="Texas Instruments XDS100v1 USB Emulator_0">
+            <instance XML_version="1.2" href="drivers/tixds100icepick_d.xml" id="drivers" xml="tixds100icepick_d.xml" xmlpath="drivers"/>
+            <instance XML_version="1.2" href="drivers/tixds100c66xx.xml" id="drivers" xml="tixds100c66xx.xml" xmlpath="drivers"/>
+            <instance XML_version="1.2" href="drivers/tixds100cs_dap.xml" id="drivers" xml="tixds100cs_dap.xml" xmlpath="drivers"/>
+            <instance XML_version="1.2" href="drivers/tixds100csstm.xml" id="drivers" xml="tixds100csstm.xml" xmlpath="drivers"/>
+            <instance XML_version="1.2" href="drivers/tixds100etbcs.xml" id="drivers" xml="tixds100etbcs.xml" xmlpath="drivers"/>
+            <platform XML_version="1.2" id="platform_0">
+                <instance XML_version="1.2" desc="TMS320C6657_0" href="devices/C6657.xml" id="TMS320C6657_0" xml="C6657.xml" xmlpath="devices"/>
+                <device HW_revision="1" XML_version="1.2" description="C66x core" id="TMS320C6657_0" partnum="TMS320C6657" simulation="no">
+                    <router HW_revision="1.0" XML_version="1.2" description="ICEPick_D Router" id="IcePick_D_0" isa="ICEPICK_D">
+                        <subpath id="subpath_0">
+                            <cpu HW_revision="1.0" XML_version="1.2" description="C66xx CGEM+FP CPU" deviceSim="false" id="C66xx_0" isa="TMS320C66XX">
+                                <property Type="filepathfield" Value="../../emulation/boards/evmc6657l/gel/evmc6657l.gel" id="GEL File"/>
+                            </cpu>
+                        </subpath>
+                    </router>
+                </device>
+            </platform>
+        </connection>
+    </configuration>
+</configurations>

diff --git a/program_evm/configs/evm6657l/evm6657l.ccxml b/program_evm/configs/evm6657l/evm6657l.ccxml
index 788e438fff72ca4e05b010c5ee56c8aff5bbc8b0..8a796e8a95b7ece8810ba79e0d682027e10b4c7b 100644 (file)
--- a/program_evm/configs/evm6657l/evm6657l.ccxml
+++ b/program_evm/configs/evm6657l/evm6657l.ccxml
@@ -14,7 +14,7 @@
                     <router HW_revision="1.0" XML_version="1.2" description="ICEPick_D Router" id="IcePick_D_0" isa="ICEPICK_D">
                         <subpath id="subpath_0">
                             <cpu HW_revision="1.0" XML_version="1.2" description="C66xx CGEM+FP CPU" deviceSim="false" id="C66xx_0" isa="TMS320C66XX">
-                                <property Type="filepathfield" Value="..\..\emulation\boards\evmc6657l\gel\evmc6657l.gel" id="GEL File"/>
+                                <property Type="filepathfield" Value="../../emulation/boards/evmc6657l/gel/evmc6657l.gel" id="GEL File"/>
                             </cpu>
                         </subpath>
                     </router>

diff --git a/program_evm/configs/evm6657l/evm6657le-linuxhost.ccxml b/program_evm/configs/evm6657l/evm6657le-linuxhost.ccxml
new file mode 100644 (file)
index 0000000..7b4bece
--- /dev/null
+++ b/program_evm/configs/evm6657l/evm6657le-linuxhost.ccxml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<configurations XML_version="1.2" id="configurations_0">
+<configuration XML_version="1.2" id="Blackhawk XDS560v2-USB Mezzanine Emulator_0">
+        <instance XML_version="1.2" desc="Blackhawk XDS560v2-USB Mezzanine Emulator_0" href="connections/BH-XDS560v2-USB_Mezzanine.xml" id="Blackhawk XDS560v2-USB Mezzanine Emulator_0" xml="BH-XDS560v2-USB_Mezzanine.xml" xmlpath="connections"/>
+        <connection XML_version="1.2" id="Blackhawk XDS560v2-USB Mezzanine Emulator_0">
+            <instance XML_version="1.2" href="drivers/tixds560icepick_d.xml" id="drivers" xml="tixds560icepick_d.xml" xmlpath="drivers"/>
+            <instance XML_version="1.2" href="drivers/tixds560c66xx.xml" id="drivers" xml="tixds560c66xx.xml" xmlpath="drivers"/>
+            <instance XML_version="1.2" href="drivers/tixds560cs_dap.xml" id="drivers" xml="tixds560cs_dap.xml" xmlpath="drivers"/>
+            <instance XML_version="1.2" href="drivers/tixds560csstm.xml" id="drivers" xml="tixds560csstm.xml" xmlpath="drivers"/>
+            <instance XML_version="1.2" href="drivers/tixds560etbcs.xml" id="drivers" xml="tixds560etbcs.xml" xmlpath="drivers"/>
+            <platform XML_version="1.2" id="platform_0">
+                <instance XML_version="1.2" desc="TMS320C6657_0" href="devices/C6657.xml" id="TMS320C6657_0" xml="C6657.xml" xmlpath="devices"/>
+                <device HW_revision="1" XML_version="1.2" description="C66x core" id="TMS320C6657_0" partnum="TMS320C6657" simulation="no">
+                    <router HW_revision="1.0" XML_version="1.2" description="ICEPick_D Router" id="IcePick_D_0" isa="ICEPICK_D">
+                        <subpath id="subpath_0">
+                            <cpu HW_revision="1.0" XML_version="1.2" description="C66xx CGEM+FP CPU" deviceSim="false" id="C66xx_0" isa="TMS320C66XX">
+                                <property Type="filepathfield" Value="../../emulation/boards/evmc6657l/gel/evmc6657l.gel" id="GEL File"/>
+                            </cpu>
+                        </subpath>
+                    </router>
+                </device>
+            </platform>
+        </connection>
+    </configuration>
+</configurations>

diff --git a/program_evm/configs/evm6657l/evm6657le.ccxml b/program_evm/configs/evm6657l/evm6657le.ccxml
new file mode 100644 (file)
index 0000000..7b4bece
--- /dev/null
+++ b/program_evm/configs/evm6657l/evm6657le.ccxml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<configurations XML_version="1.2" id="configurations_0">
+<configuration XML_version="1.2" id="Blackhawk XDS560v2-USB Mezzanine Emulator_0">
+        <instance XML_version="1.2" desc="Blackhawk XDS560v2-USB Mezzanine Emulator_0" href="connections/BH-XDS560v2-USB_Mezzanine.xml" id="Blackhawk XDS560v2-USB Mezzanine Emulator_0" xml="BH-XDS560v2-USB_Mezzanine.xml" xmlpath="connections"/>
+        <connection XML_version="1.2" id="Blackhawk XDS560v2-USB Mezzanine Emulator_0">
+            <instance XML_version="1.2" href="drivers/tixds560icepick_d.xml" id="drivers" xml="tixds560icepick_d.xml" xmlpath="drivers"/>
+            <instance XML_version="1.2" href="drivers/tixds560c66xx.xml" id="drivers" xml="tixds560c66xx.xml" xmlpath="drivers"/>
+            <instance XML_version="1.2" href="drivers/tixds560cs_dap.xml" id="drivers" xml="tixds560cs_dap.xml" xmlpath="drivers"/>
+            <instance XML_version="1.2" href="drivers/tixds560csstm.xml" id="drivers" xml="tixds560csstm.xml" xmlpath="drivers"/>
+            <instance XML_version="1.2" href="drivers/tixds560etbcs.xml" id="drivers" xml="tixds560etbcs.xml" xmlpath="drivers"/>
+            <platform XML_version="1.2" id="platform_0">
+                <instance XML_version="1.2" desc="TMS320C6657_0" href="devices/C6657.xml" id="TMS320C6657_0" xml="C6657.xml" xmlpath="devices"/>
+                <device HW_revision="1" XML_version="1.2" description="C66x core" id="TMS320C6657_0" partnum="TMS320C6657" simulation="no">
+                    <router HW_revision="1.0" XML_version="1.2" description="ICEPick_D Router" id="IcePick_D_0" isa="ICEPICK_D">
+                        <subpath id="subpath_0">
+                            <cpu HW_revision="1.0" XML_version="1.2" description="C66xx CGEM+FP CPU" deviceSim="false" id="C66xx_0" isa="TMS320C66XX">
+                                <property Type="filepathfield" Value="../../emulation/boards/evmc6657l/gel/evmc6657l.gel" id="GEL File"/>
+                            </cpu>
+                        </subpath>
+                    </router>
+                </device>
+            </platform>
+        </connection>
+    </configuration>
+</configurations>

diff --git a/program_evm/program_evm.js b/program_evm/program_evm.js
index d42ce3a7da6e10ef26485326b4f9775e2f015f5a..959a3b64f99ea9e60dbf415438583a9b6973be41 100644 (file)
--- a/program_evm/program_evm.js
+++ b/program_evm/program_evm.js
@@ -215,47 +215,57 @@ var eeprom51 = board_binaries + "eeprom51.bin";
 var nand = board_binaries + "nand.bin";
 var nor = board_binaries + "nor.bin";
 
+// Note: nAddress is the load address for using eepromwriter.
+//       nandNorAddress is the address used for nandwriter and norwriter.
 switch (targetFlag)
 {
        case "evm6457l":
                cpu_id = "C64XP_1";
                var nAddress = 0x800000;
-    var iblByteSwap = false;
+               var nandNorAddress = nAddress;
+               var iblByteSwap = false;
                break;
        case "evm6474l":
                cpu_id = "C64XP_0";
-    var nAddress = 0x800000;
-    var iblByteSwap = false;
+               var nAddress = 0x800000;
+               var nandNorAddress = nAddress;
+               var iblByteSwap = false;
                break;
        case "evm6455":
-    cpu_id = "C64XP_0";
-    var nAddress = 0x800000;
-    var iblByteSwap = false;
-    break;
+               cpu_id = "C64XP_0";
+               var nAddress = 0x800000;
+               var nandNorAddress = nAddress;
+               var iblByteSwap = false;
+               break;
        case "evm6474":
-    cpu_id = "C64XP_1A";
-    var nAddress = 0x800000;
-    var iblByteSwap = false;
-    break;
+               cpu_id = "C64XP_1A";
+               var nAddress = 0x800000;
+               var nandNorAddress = nAddress;
+               var iblByteSwap = false;
+               break;
        case "evm6472l":
                cpu_id = "C64XP_A";
-    var nAddress = 0x800000;
-    var iblByteSwap = false;
+               var nAddress = 0x800000;
+               var nandNorAddress = nAddress;
+               var iblByteSwap = false;
                break;
        case "evm6670l":
                cpu_id = "C66xx_0";
-    var nAddress = 0x80000000;
-    var iblByteSwap = false;
+               var nAddress = 0x0C000000;
+               var nandNorAddress = 0x80000000;
+               var iblByteSwap = false;
                break;
        case "evm6678l":
                cpu_id = "C66xx_0";
-    var nAddress = 0x80000000;
-    var iblByteSwap = false;
+               var nAddress = 0x0C000000;
+               var nandNorAddress = 0x80000000;
+               var iblByteSwap = false;
                break;
        case "evm6657l":
                cpu_id = "C66xx_0";
-    var nAddress = 0x80000000;
-    var iblByteSwap = false;
+               var nAddress = 0x0C000000;
+               var nandNorAddress = 0x80000000;
+               var iblByteSwap = false;
                break;
        default:
                script.traceWrite("Could not file cpu id for target " + targetFlag + "\n");
@@ -376,7 +386,7 @@ if(writeAll || writerImages.match(/nand/))
                try
                {   
                        script.traceWrite("Start loading nand.bin");
-                       debugSession.memory.loadRaw(nPage, nAddress, sFilename, nTypeSize, bByteSwap);
+                       debugSession.memory.loadRaw(nPage, nandNorAddress, sFilename, nTypeSize, bByteSwap);
 
                }
                catch (ex)
@@ -417,7 +427,7 @@ if(writeAll || writerImages.match(/nor/))
                try
                {   
                        script.traceWrite("Start loading nor.bin");
-                       debugSession.memory.loadRaw(nPage, nAddress, sFilename, nTypeSize, bByteSwap);
+                       debugSession.memory.loadRaw(nPage, nandNorAddress, sFilename, nTypeSize, bByteSwap);
 
                }
                catch (ex)

diff --git a/writer/eeprom/src/eepromwriter.c b/writer/eeprom/src/eepromwriter.c
index 9e060a57595f2ed5c8797b49295d5b7a0a4792d9..735d30f0371cdb67b595352c9cb83f3c747f2e38 100644 (file)
--- a/writer/eeprom/src/eepromwriter.c
+++ b/writer/eeprom/src/eepromwriter.c
@@ -61,7 +61,7 @@ char *input_file = "eepromwriter_input.txt";
 #define SWAP_DATA      "swap_data"
 
 /* Memory address to store the write data */
-#define WRITE_DATA_ADDRESS     0x80000000
+#define WRITE_DATA_ADDRESS     0x0C000000
 
 /******************************************************************************
  * Structure:   EEPROM_WRITER_INFO_T