Added support for C6670

Removed C6616

22 files changed, 80 insertions, 67 deletions

diff --git a/mad-loader/README.txt b/mad-loader/README.txt
index 085b9c0..ebec11e 100644
--- a/mad-loader/README.txt
+++ b/mad-loader/README.txt
@@ -27,7 +27,7 @@ Example applications:
     make DEVICE=<device number>
         supported device numbers are 
             C6472 
-            C6616 
+            C6670 
             C6678
 
 MAD loader library:
@@ -37,7 +37,7 @@ MAD loader library:
     make DEVICE=<device number>
         supported device numbers are 
             C6472 
-            C6616
+            C6670
             C6678
 
 MAD loader application:
@@ -48,7 +48,7 @@ MAD loader application:
     make DEVICE=<device number>
         supported device numbers are 
             C6472
-            C6616
+            C6670
             C6678
 
     NOTE: MAD loader application needs to be XIP in DDR. The linker command file "lnk_<device number>.cmd"
@@ -61,7 +61,7 @@ NML:
     make DEVICE=<device number>
         supported device numbers are 
             C6472
-            C6616
+            C6670
             C6678
 
     NOTE: Since NML is XIP in DDR, it has to be ensured that the NML code segments are bound to virtual address
diff --git a/mad-loader/examples/app_1/Makefile b/mad-loader/examples/app_1/Makefile
index ee2e37d..a758888 100755
--- a/mad-loader/examples/app_1/Makefile
+++ b/mad-loader/examples/app_1/Makefile
@@ -7,7 +7,7 @@ C_OPTS = --abi=elfabi
 ifeq ($(DEVICE),C6472)

 C_OPTS += -mv6400+  

 else

-ifeq ($(DEVICE),C6616)

+ifeq ($(DEVICE),C6670)

 C_OPTS += -mv6600  

 else

 ifeq ($(DEVICE),C6678)

diff --git a/mad-loader/examples/app_2/Makefile b/mad-loader/examples/app_2/Makefile
index 1e6c29c..30d13d3 100755
--- a/mad-loader/examples/app_2/Makefile
+++ b/mad-loader/examples/app_2/Makefile
@@ -7,7 +7,7 @@ C_OPTS = --abi=elfabi
 ifeq ($(DEVICE),C6472)

 C_OPTS += -mv6400+  

 else

-ifeq ($(DEVICE),C6616)

+ifeq ($(DEVICE),C6670)

 C_OPTS += -mv6600  

 else

 ifeq ($(DEVICE),C6678)

diff --git a/mad-loader/examples/shlibs/Makefile b/mad-loader/examples/shlibs/Makefile
index 0e97801..40ada87 100755
--- a/mad-loader/examples/shlibs/Makefile
+++ b/mad-loader/examples/shlibs/Makefile
@@ -7,7 +7,7 @@ C_OPTS = --abi=elfabi
 ifeq ($(DEVICE),C6472)

 C_OPTS += -mv6400+  

 else

-ifeq ($(DEVICE),C6616)

+ifeq ($(DEVICE),C6670)

 C_OPTS += -mv6600  

 else

 ifeq ($(DEVICE),C6678)

diff --git a/mad-loader/mal/malApp/build/Makefile b/mad-loader/mal/malApp/build/Makefile
index b9a45fc..14eea93 100644
--- a/mad-loader/mal/malApp/build/Makefile
+++ b/mad-loader/mal/malApp/build/Makefile
@@ -37,13 +37,13 @@ HOST_PRFX = C60
 APP_EXT = exe
 
 ifeq ($(DEVICE),C6472)
-C_OPTS = -DDEVICE=6472 ## Tomahawk 
+C_OPTS = -DDEVICE=6472
 else
-ifeq ($(DEVICE),C6616)
-C_OPTS = -DDEVICE=6616 ## Nyquist 
+ifeq ($(DEVICE),C6670)
+C_OPTS = -DDEVICE=6670
 else
 ifeq ($(DEVICE),C6678)
-C_OPTS = -DDEVICE=6678 ## Shannon 
+C_OPTS = -DDEVICE=6678
 else
 DEFAULT:
         @echo "Device '$(DEVICE)' not supported"
diff --git a/mad-loader/mal/malApp/build/lnk_C6616.cmd b/mad-loader/mal/malApp/build/lnk_C6670.cmd
index 72388d6..e8193d2 100644
--- a/mad-loader/mal/malApp/build/lnk_C6616.cmd
+++ b/mad-loader/mal/malApp/build/lnk_C6670.cmd
@@ -11,8 +11,8 @@
 MEMORY
 {
         BLOB_ENTER: o = 0x80001040  l = 0x0020
-    PMEM0:  o = 0x80001060   l = 0x7a6c
-    URW0:   o = 0x8ffdb800   l = 0x22000
+    PMEM0:  o = 0x80001060   l = 0x7a8c
+    URW0:   o = 0x9ffdb800   l = 0x22000
 }
 
 SECTIONS
diff --git a/mad-loader/mal/malApp/build/prelink_mal_app_C6616.cmd b/mad-loader/mal/malApp/build/prelink_mal_app_C6670.cmd
index e6cf4b7..e6cf4b7 100644
--- a/mad-loader/mal/malApp/build/prelink_mal_app_C6616.cmd
+++ b/mad-loader/mal/malApp/build/prelink_mal_app_C6670.cmd
diff --git a/mad-loader/mal/malApp/src/mal_app.c b/mad-loader/mal/malApp/src/mal_app.c
index 9274b32..315ccdd 100644
--- a/mad-loader/mal/malApp/src/mal_app.c
+++ b/mad-loader/mal/malApp/src/mal_app.c
@@ -20,7 +20,7 @@
 #if (DEVICE==6472)

     #define __LOAD_PARTITION__  0xE0000000

     #define NUM_CORES   6

-#elif (DEVICE==6616)

+#elif (DEVICE==6670)

     #define __LOAD_PARTITION__  0x80000000

     #define NUM_CORES   4

 #elif (DEVICE==6678)

diff --git a/mad-loader/mal/malLib/build/Makefile b/mad-loader/mal/malLib/build/Makefile
index e70b866..390b254 100644
--- a/mad-loader/mal/malLib/build/Makefile
+++ b/mad-loader/mal/malLib/build/Makefile
@@ -35,17 +35,17 @@ LIB_EXT = a
 
 AS = cl6x
 ifeq ($(DEVICE),C6472)
-C_OPTS = -DDEVICE=6472 ## Tomahawk 
+C_OPTS = -DDEVICE=6472
 C_OPTS += -mv6400+  
 A_OPTS += -mv6400+
 else
-ifeq ($(DEVICE),C6616)
-C_OPTS = -DDEVICE=6616 ## Nyquist 
+ifeq ($(DEVICE),C6670)
+C_OPTS = -DDEVICE=6670
 C_OPTS += -mv6600  
 A_OPTS += -mv6600
 else
 ifeq ($(DEVICE),C6678)
-C_OPTS = -DDEVICE=6678 ## Shannon 
+C_OPTS = -DDEVICE=6678
 C_OPTS += -mv6600  
 A_OPTS += -mv6600
 else
diff --git a/mad-loader/mal/malLib/malApis/device_C6616.h b/mad-loader/mal/malLib/malApis/device_C6670.h
index ff8ef7a..5fca2e4 100644
--- a/mad-loader/mal/malLib/malApis/device_C6616.h
+++ b/mad-loader/mal/malLib/malApis/device_C6670.h
@@ -2,8 +2,8 @@
  * Copyright (C) 2010 Texas Instruments Incorporated - http://www.ti.com/
  */
 
-#ifndef __DEVICE_C6616_H__
-#define __DEVICE_C6616_H__
+#ifndef __DEVICE_C6670_H__
+#define __DEVICE_C6670_H__
 
 /* Number of cores */
 #define NUM_DEVICE_CORES        4
@@ -32,8 +32,9 @@
 
 /* PSC module ID's */
 #define MOD_GEM0        23
+
 /* Get the Module for core */
-#define GET_PSC_MOD(x)  (x + MOD_GEM0)
+#define GET_PSC_MOD(x)  ((x<=1) ? (x + MOD_GEM0) : (((x*2)-1) + MOD_GEM0))
 
 #define MDCTL_NEXT_STATE_DIS    2
 #define MDCTL_NEXT_STATE_EN             3
@@ -85,5 +86,5 @@
 #define L2_GLOBAL_INVALIDATE   (*(volatile unsigned int*)(L1DINV_REG)=1)
 #define L2_GLOBAL_WBINVALIDATE   (*(volatile unsigned int*)(L1DWBINV_REG)=1)
 
-#endif /* __DEVICE_C6616_H__ */
+#endif /* __DEVICE_C6670_H__ */
 
diff --git a/mad-loader/mal/malLib/malApis/mal_lib_loader.c b/mad-loader/mal/malLib/malApis/mal_lib_loader.c
index 0d69699..3d91d50 100644
--- a/mad-loader/mal/malLib/malApis/mal_lib_loader.c
+++ b/mad-loader/mal/malLib/malApis/mal_lib_loader.c
@@ -19,8 +19,8 @@
 #if (DEVICE==6472)

 #include "device_C6472.h"

 /* Nyquist */

-#elif (DEVICE==6616)

-#include "device_C6616.h"

+#elif (DEVICE==6670)

+#include "device_C6670.h"

 /* Shannon */

 #elif (DEVICE==6678)

 #include "device_C6678.h"

@@ -101,7 +101,7 @@ void mal_wbinv_cache_block(void* base_addr, int size, int mode)
     /* Writeback and Invalidate L1D cache */

     *(unsigned int *)(l1d_bar_reg) = (unsigned int)base_addr;

     *(unsigned int *)(l1d_wc_reg) = size;

-#if ((DEVICE==6616) || (DEVICE==6678))

+#if ((DEVICE==6670) || (DEVICE==6678))

     asm (" MFENCE");

 #elif (DEVICE==6472)

     while (*(unsigned int *)(l1d_wc_reg) != 0);

@@ -110,7 +110,7 @@ void mal_wbinv_cache_block(void* base_addr, int size, int mode)
     /* Writeback and Invalidate L2 cache */

     *(unsigned int *)(l2_bar_reg) = (unsigned int)base_addr;

     *(unsigned int *)(l2_wc_reg) = size;

-#if ((DEVICE==6616) || (DEVICE==6678))

+#if ((DEVICE==6670) || (DEVICE==6678))

     asm (" MFENCE");

 #elif (DEVICE==6472)

     while (*(unsigned int *)(l2_wc_reg) != 0);

@@ -320,7 +320,7 @@ static int reset_run_core(unsigned int coreId, unsigned int ba)
         *reg = (*reg & ~ MDCTL_LRSTZ_MASK);

 

         /* Enable power domain module */

-#if ((DEVICE==6678) || (DEVICE==6616))

+#if ((DEVICE==6678) || (DEVICE==6670))

     pd = GET_PD(coreId);

 #elif (DEVICE==6472)

         pd = (*(unsigned int *)MDCFG_ADDR(mod_id) & MDCFG_PD_MASK) >> 16;

@@ -337,7 +337,7 @@ static int reset_run_core(unsigned int coreId, unsigned int ba)
         if (ba & 0x3ff)

                 return -1;

 

-#if ((DEVICE==6678) || (DEVICE==6616))

+#if ((DEVICE==6678) || (DEVICE==6670))

     /* Unlock the DSCR boot config */

     reg = (unsigned int*)DSCR_KICK0;

     *reg = DSCR_KICK0_KEY;

@@ -347,7 +347,7 @@ static int reset_run_core(unsigned int coreId, unsigned int ba)
 

     /* Set the Boot Address for Core */

         reg = (unsigned int*)BOOT_ADDR(coreId);

-#if ((DEVICE==6678) || (DEVICE==6616))

+#if ((DEVICE==6678) || (DEVICE==6670))

         *reg = ba;

 #elif (DEVICE==6472)

         *reg = (ba >> 10);

@@ -357,7 +357,7 @@ static int reset_run_core(unsigned int coreId, unsigned int ba)
         reg = (unsigned int*)BOOT_COMPLETE_ADDR;

         *reg = (1 << coreId);

 

-#if ((DEVICE==6678) || (DEVICE==6616))

+#if ((DEVICE==6678) || (DEVICE==6670))

     /* Lock the DSCR boot config */

     reg = (unsigned int*)DSCR_KICK0;

     *reg = 0;

@@ -397,7 +397,7 @@ static int reset_core(unsigned int coreId)
         *reg = (*reg & ~ MDCTL_NEXT_STATE_MASK) | MDCTL_NEXT_STATE_EN;

         *reg = (*reg & ~ MDCTL_LRSTZ_MASK);

 

-#if ((DEVICE==6678) || (DEVICE==6616))

+#if ((DEVICE==6678) || (DEVICE==6670))

     pd = GET_PD(coreId);

 #elif (DEVICE==6472)

         pd = (*(unsigned int *)MDCFG_ADDR(mod_id) & MDCFG_PD_MASK) >> 16;

diff --git a/mad-loader/nmlLoader/build/Makefile b/mad-loader/nmlLoader/build/Makefile
index 25788a0..afedd9a 100644
--- a/mad-loader/nmlLoader/build/Makefile
+++ b/mad-loader/nmlLoader/build/Makefile
@@ -10,17 +10,17 @@ HOST_EXT = 6x
 

 AS = cl6x

 ifeq ($(DEVICE),C6472)

-C_OPTS = -DDEVICE=6472 ## Tomahawk 

+C_OPTS = -DDEVICE=6472

 C_OPTS += -mv6400+  

 A_OPTS += -mv6400+

 else

-ifeq ($(DEVICE),C6616)

-C_OPTS = -DDEVICE=6616 ## Nyquist 

+ifeq ($(DEVICE),C6670)

+C_OPTS = -DDEVICE=6670

 C_OPTS += -mv6600  

 A_OPTS += -mv6600

 else

 ifeq ($(DEVICE),C6678)

-C_OPTS = -DDEVICE=6678 ## Shannon 

+C_OPTS = -DDEVICE=6678

 C_OPTS += -mv6600  

 A_OPTS += -mv6600

 else

diff --git a/mad-loader/nmlLoader/build/lnk_C6616.cmd b/mad-loader/nmlLoader/build/lnk_C6670.cmd
index 3c33131..cce1867 100644
--- a/mad-loader/nmlLoader/build/lnk_C6616.cmd
+++ b/mad-loader/nmlLoader/build/lnk_C6670.cmd
@@ -10,8 +10,8 @@
 MEMORY
 {
     PMEM:   o = 0x80016400   l = 0x60
-    PMEM1:  o = 0x80016460   l = 0x798
-    DMEM:   o = 0x8fffd800   l = 0x2800
+    PMEM1:  o = 0x80016460   l = 0x7a0
+    DMEM:   o = 0x9fffd800   l = 0x2800
 }
 
 SECTIONS
diff --git a/mad-loader/nmlLoader/build/prelink_nml_C6616.cmd b/mad-loader/nmlLoader/build/prelink_nml_C6670.cmd
index 508ea70..508ea70 100644
--- a/mad-loader/nmlLoader/build/prelink_nml_C6616.cmd
+++ b/mad-loader/nmlLoader/build/prelink_nml_C6670.cmd
diff --git a/mad-loader/nmlLoader/src/device_C6472.h b/mad-loader/nmlLoader/src/device_C6472.h
index ff93f1b..2d747f1 100644
--- a/mad-loader/nmlLoader/src/device_C6472.h
+++ b/mad-loader/nmlLoader/src/device_C6472.h
@@ -11,6 +11,8 @@
 #ifndef __DEVICE_C6472_H__
 #define __DEVICE_C6472_H__
 
+#define NUM_CORES       6
+
 #define L2MPPA0_BASE_ADDR       0x184A200
 #define L2MPPA_ADDR(x)  (L2MPPA0_BASE_ADDR + (4*x))
 
diff --git a/mad-loader/nmlLoader/src/device_C6616.h b/mad-loader/nmlLoader/src/device_C6670.h
index 059dba9..bb89dfa 100644
--- a/mad-loader/nmlLoader/src/device_C6616.h
+++ b/mad-loader/nmlLoader/src/device_C6670.h
@@ -3,14 +3,16 @@
  */
 
 /**
- *  @file device_C6616.h
+ *  @file device_C6670.h
  *
  *  @brief
  *     Device specific macros 
  */
 
-#ifndef __DEVICE_C6616_H__
-#define __DEVICE_C6616_H__
+#ifndef __DEVICE_C6670_H__
+#define __DEVICE_C6670_H__
+
+#define NUM_CORES       4
 
 #define XMPAXL_BASE_ADDR        0x8000000
 #define XMPAXH_BASE_ADDR        0x8000004
@@ -90,5 +92,5 @@
 #define L2_GLOBAL_WBINVALIDATE   (*(volatile unsigned int*)(L1DWBINV_REG)=1)
 #define L2_GLOBAL_WB   (*(volatile unsigned int*)(L1DWB_REG)=1)
 
-#endif /* __DEVICE_C6616_H__ */
+#endif /* __DEVICE_C6670_H__ */
 
diff --git a/mad-loader/nmlLoader/src/device_C6678.h b/mad-loader/nmlLoader/src/device_C6678.h
index fee1c50..7330c9f 100644
--- a/mad-loader/nmlLoader/src/device_C6678.h
+++ b/mad-loader/nmlLoader/src/device_C6678.h
@@ -12,6 +12,8 @@
 #ifndef __DEVICE_C6678_H__
 #define __DEVICE_C6678_H__
 
+#define NUM_CORES       8
+
 #define XMPAXL_BASE_ADDR        0x8000000
 #define XMPAXH_BASE_ADDR        0x8000004
 #define XMPAXL(x)       (XMPAXL_BASE_ADDR + (8*x))
diff --git a/mad-loader/nmlLoader/src/nml_ar_utils.c b/mad-loader/nmlLoader/src/nml_ar_utils.c
index 50fb2f7..21d2506 100644
--- a/mad-loader/nmlLoader/src/nml_ar_utils.c
+++ b/mad-loader/nmlLoader/src/nml_ar_utils.c
@@ -17,8 +17,8 @@
 

 #if (DEVICE==6472)

 #include "device_C6472.h"

-#elif (DEVICE==6616)

-#include "device_C6616.h"

+#elif (DEVICE==6670)

+#include "device_C6670.h"

 #elif (DEVICE==6678)

 #include "device_C6678.h"

 #else

@@ -41,7 +41,7 @@ void nml_wbinv_cache_block(void* base_addr, int size)
     /* Writeback and Invalidate L1D cache */

     *(unsigned int *)(L1DWIBAR_REG) = (unsigned int)base_addr;

     *(unsigned int *)(L1DWIWC_REG) = size;

-#if ((DEVICE==6616) || (DEVICE==6678))

+#if ((DEVICE==6670) || (DEVICE==6678))

     asm (" MFENCE");

 #elif (DEVICE==6472)

     while (*(unsigned int *)(L1DWIWC_REG) != 0);

@@ -50,7 +50,7 @@ void nml_wbinv_cache_block(void* base_addr, int size)
     /* Writeback and Invalidate L2 cache */

     *(unsigned int *)(L2WIBAR_REG) = (unsigned int)base_addr;

     *(unsigned int *)(L2WIWC_REG) = size;

-#if ((DEVICE==6616) || (DEVICE==6678))

+#if ((DEVICE==6670) || (DEVICE==6678))

     asm (" MFENCE");

 #elif (DEVICE==6472)

     while (*(unsigned int *)(L2WIWC_REG) != 0);

@@ -101,7 +101,7 @@ int nml_mem_set (void *dest, unsigned int byte, unsigned int num_bytes)
     return 0;

 }

 

-#if ((DEVICE==6616) || (DEVICE==6678))

+#if ((DEVICE==6670) || (DEVICE==6678))

 static inline int __logbase2(num)

 {

         unsigned r = 0; 

@@ -111,25 +111,25 @@ static inline int __logbase2(num)
         return r;

 }

 #define LOG_BASE2_4K    12

-#endif /* C6616 C6678 */

+#endif /* C6670 C6678 */

 

 /**

  * @brief

- *   Setup MPAX for 6616

+ *   Setup MPAX for 6670

  *   Setup memory protection attributes in MPPA 

  */

-/* paddr is 36 bits for 6616: Activation record will specify paddr without the 4 LSbits */

+/* paddr is 36 bits for 6670: Activation record will specify paddr without the 4 LSbits */

 int nml_mem_map_set (unsigned int paddr, unsigned int vaddr, unsigned int size,

                                          unsigned int perm)

 {

         unsigned char permissions, p;

         unsigned int num_mppa, start_mppa_idx, *start_mppa_addr, i, mppa_val;

-#if ((DEVICE==6616) || (DEVICE==6678))

+#if ((DEVICE==6670) || (DEVICE==6678))

         unsigned char segsz;

         unsigned int raddr, baddr;

 #endif

 

-#if ((DEVICE==6616) || (DEVICE==6678))

+#if ((DEVICE==6670) || (DEVICE==6678))

         if (vaddr >= MPAX_MAPPABLE_RANGE_START) {

                 /* Configure MPAX registers */

                 p = (unsigned char)perm;

@@ -156,7 +156,7 @@ int nml_mem_map_set (unsigned int paddr, unsigned int vaddr, unsigned int size,
                 nml_mpax_seg_idx[DNUM]++;

                 return 0;

         }

-#endif /* C6616, C6678 */

+#endif /* C6670, C6678 */

 

         /* Configure MPPA registers */

         p = (unsigned char)perm;

@@ -242,7 +242,7 @@ int nml_mem_attr_set (unsigned int vaddr, unsigned int size, unsigned int attrs)
                 return 0;

 

         cache_en = (attrs & CACHE_EN)? CACHE_EN_MASK:0; 

-#if ((DEVICE==6616) || (DEVICE==6678))

+#if ((DEVICE==6670) || (DEVICE==6678))

         prefetch_en = (attrs & PREFETCH_EN)? PREFETCH_EN_MASK:0; 

 #else

         prefetch_en = 0;

diff --git a/mad-loader/nmlLoader/src/nml_loader.c b/mad-loader/nmlLoader/src/nml_loader.c
index ff11431..6d17525 100644
--- a/mad-loader/nmlLoader/src/nml_loader.c
+++ b/mad-loader/nmlLoader/src/nml_loader.c
@@ -10,22 +10,26 @@
 #include "mal_lib_activation_record.h"

 #include "nml_ar_utils.h"

 

-extern volatile unsigned int cregister DNUM;

+#if !(defined DEVICE)

+#error DEVICE not defined

+#endif

 

 #if (DEVICE==6472)

-#define NUM_CORES       6

+#include "device_C6472.h"

 #define NML_STACK_SZ    512

 

-#elif (DEVICE==6616)

-#define NUM_CORES       4

+#elif (DEVICE==6670)

+#include "device_C6670.h"

 #define NML_STACK_SZ    512

 

 #elif (DEVICE==6678)

-#define NUM_CORES       8

+#include "device_C6678.h"

 #define NML_STACK_SZ    512

 #endif

 

 

+extern volatile unsigned int cregister DNUM;

+

 typedef int (*fp)(unsigned int, unsigned int, unsigned int, unsigned int);

 

 /* Following data will go into an RW segment */ 

@@ -36,7 +40,7 @@ mal_lib_activationRecord_t nml_ar_data[NUM_CORES*MAL_LIB_MAX_AR];
 /* Boot status for each core */

 unsigned int nml_boot_status[NUM_CORES];

 /* Global variables */

-#if ((DEVICE==6616) || (DEVICE==6678))

+#if ((DEVICE==6670) || (DEVICE==6678))

 /* Variable to maintain current segment idx of MPAX */

 unsigned char nml_mpax_seg_idx[NUM_CORES];

 #endif

@@ -62,7 +66,7 @@ void nml_loader()
         register mal_lib_activationRecord_t *arp;

         register fp fptr;

 

-#if ((DEVICE==6616) || (DEVICE==6678))

+#if ((DEVICE==6670) || (DEVICE==6678))

         /* Initialize the MPAX segment index number */ 

         nml_mpax_seg_idx[DNUM] = 2;

 #endif

diff --git a/map-tool/config-files/deployment_template_C6616.json b/map-tool/config-files/deployment_template_C6670.json
index 1b21a42..2b36b76 100644
--- a/map-tool/config-files/deployment_template_C6616.json
+++ b/map-tool/config-files/deployment_template_C6670.json
@@ -1,5 +1,5 @@
 {

-        "deviceName" : "C6616",

+        "deviceName" : "C6670",

         

         "partitions" : [

                 {

@@ -19,8 +19,8 @@
                 {

                         "name"                  : "ddr-data",

                         "vaddr"                 : "0xD0000000",

-                        "paddr"                 : [ "0x870000000", "0x890000000", "0x8B0000000", "0x8D0000000" ],

-                        "size"                  : "0x2000000",

+                        "paddr"                 : [ "0x806000000", "0x807000000", "0x808000000", "0x809000000" ],

+                        "size"                  : "0x1000000",

                         "secNamePat"    : ["stack", "^.far$", "args", "neardata", "fardata" ],

                         "cores"                 : [0,1,2,3],

                         "permissions"   : ["SR", "SW"],

diff --git a/map-tool/config-files/maptoolCfg_C6616.json b/map-tool/config-files/maptoolCfg_C6670.json
index a276cf9..0f159f5 100644
--- a/map-tool/config-files/maptoolCfg_C6616.json
+++ b/map-tool/config-files/maptoolCfg_C6670.json
@@ -1,6 +1,6 @@
 {

-        "deploymentCfgFile"     : "./config-files/deployment_template_C6616.json",

-        "LoadImageName"                 : "c6616-le.bin",

+        "deploymentCfgFile"     : "./config-files/deployment_template_C6670.json",

+        "LoadImageName"                 : "c6670-le.bin",

         "prelinkExe"                    : "prelink6x",

         "ofdTool"                               : "ofd6x",

         "stripExe"                          : "strip6x",

diff --git a/map-tool/maptool.py b/map-tool/maptool.py
index 7d28df4..42f6dc3 100755
--- a/map-tool/maptool.py
+++ b/map-tool/maptool.py
@@ -485,7 +485,7 @@ def createPadFile(__fname, __size):
 class device:

 # stores [# cores, has MPAX]

         __id    = ''

-        __deviceToCore = { 'C6678' : [8, True], 'C6616' : [4, True], 'C6472' : [6, False] }

+        __deviceToCore = { 'C6678' : [8, True], 'C6670' : [4, True], 'C6472' : [6, False] }

         

         def __init__(self,id):

                 if id.upper() in self.__deviceToCore:

@@ -1329,12 +1329,14 @@ class application:
         fileoffset        = 0                   # offset of the ELF file within ROMFS

         elfFile = None                          # Elf File object of the Application

         dependentLibs = None            # List of all dependent DSO's

+        archiveDir = None           # Directory where application image would be archived

         

         def __init__(self, name, file, libpath, archiveDir):

                 self.alias = name

                 self.shlibPath = libpath

                 self.allowedCores = set()

                 self.dependentLibs = []

+                self.archiveDir = archiveDir

                 __fileCopy = os.path.join(archiveDir, name)

                 __strippedFile = __fileCopy + '.strip'

                 copyFile(file, __fileCopy)

@@ -1360,7 +1362,7 @@ class application:
                         else:

                                 #create a new dso object

                                 file = os.path.join(self.shlibPath,tail)

-                                lib = dso(file,tail,globalLibList,archiveDir)

+                                lib = dso(file,tail,globalLibList,self.archiveDir)

                                 self.dependentLibs.append(lib)

                                 globalLibList[tail] = lib

                 # Create the full dependency list