rm: keystone 2: add A15 library build for Keystone II devices.
authorHao Zhang <hzhang@ti.com>
Thu, 15 Oct 2015 19:26:08 +0000 (15:26 -0400)
committerHao Zhang <hzhang@ti.com>
Thu, 15 Oct 2015 19:26:08 +0000 (15:26 -0400)
Signed-off-by: Hao Zhang <hzhang@ti.com>
25 files changed:
Settings.xdc.xdt [changed mode: 0644->0755]
build/buildlib.xs [changed mode: 0644->0755]
config.bld [changed mode: 0644->0755]
device/k2h/global-resource-list.c [changed mode: 0644->0755]
device/k2h/policy_dsp-only.c [changed mode: 0644->0755]
package.bld [changed mode: 0644->0755]
package.xs [changed mode: 0644->0755]
src/Module.xs [changed mode: 0644->0755]
test/k2e/c66/bios/rmK2EArmv7LinuxDspClientTestProject.txt [changed mode: 0644->0755]
test/k2e/c66/bios/rmK2EC66DspMtBiosTestProject.txt [changed mode: 0644->0755]
test/k2h/c66/bios/rmK2HArmv7LinuxDspClientTestProject.txt [changed mode: 0644->0755]
test/k2h/c66/bios/rmK2HC66BiosTestProject.txt [changed mode: 0644->0755]
test/k2h/c66/bios/rmK2HC66DspMtBiosTestProject.txt [changed mode: 0644->0755]
test/k2h/c66/bios/rmMemK2HC66BiosTestProject.txt [changed mode: 0644->0755]
test/k2h/c66/bios/rmSharedK2HC66BiosTestProject.txt [changed mode: 0644->0755]
test/k2k/c66/bios/rmK2KArmv7LinuxDspClientTestProject.txt [changed mode: 0644->0755]
test/k2k/c66/bios/rmK2KC66BiosTestProject.txt [changed mode: 0644->0755]
test/k2k/c66/bios/rmK2KC66DspMtBiosTestProject.txt [changed mode: 0644->0755]
test/k2k/c66/bios/rmMemK2KC66BiosTestProject.txt [changed mode: 0644->0755]
test/k2k/c66/bios/rmSharedK2KC66BiosTestProject.txt [changed mode: 0644->0755]
test/k2l/c66/bios/rmK2LArmv7LinuxDspClientTestProject.txt [changed mode: 0644->0755]
test/k2l/c66/bios/rmK2LC66BiosTestProject.txt [changed mode: 0644->0755]
test/k2l/c66/bios/rmK2LC66DspMtBiosTestProject.txt [changed mode: 0644->0755]
test/k2l/c66/bios/rmMemK2LC66BiosTestProject.txt [changed mode: 0644->0755]
test/k2l/c66/bios/rmSharedK2LC66BiosTestProject.txt [changed mode: 0644->0755]

old mode 100644 (file)
new mode 100755 (executable)
index a56b44d..133e0c3
 module Settings\r
 {\r
     config string rmVersionString = `packageVersion`;\r
+\r
+    /*! This variable is to control the device type selection.\r
+     * By default this variable is set to NULL.\r
+     * \r
+     * To use RM for the selected device, add the following lines to config\r
+     * file and set the deviceType correctly:\r
+     * \r
+     *      var rm = xdc.useModule ('ti.drv.rm.Settings');\r
+     *      rm.deviceType = "k2k";\r
+     * \r
+     * If this is not set, then hyperlink will use device independent\r
+     * library where user must supply compiled qmss_device.obj\r
+     */\r
+    metaonly config string deviceType = "";\r
 }\r
 \r
old mode 100644 (file)
new mode 100755 (executable)
index 822f99a..97b7aa5
@@ -7,7 +7,7 @@
  *  This file contains common routines that are used by the various RM \r
  *  components.\r
  *\r
- * Copyright (C) 2012-2013, Texas Instruments, Inc.\r
+ * Copyright (C) 2012-2015, Texas Instruments, Inc.\r
  *****************************************************************************/\r
 \r
 /**************************************************************************\r
@@ -110,11 +110,11 @@ function createMake(makefile)
 \r
       var file = xdc.module('xdc.services.io.File');\r
     \r
-      var xdcTargetType = java.lang.System.getenv("XDCTARGET");\r
-      var toolsBaseDir = java.lang.System.getenv("XDCCGROOT");   \r
       \r
       makefile.writeLine("\n# Output for prebuilt generated libraries");\r
       makefile.writeLine("export LIBDIR ?= ./lib");\r
+      /* use sectti.exe from path */\r
+      makefile.writeLine("export SECTTI ?= sectti");\r
 \r
       /* Create INCDIR from XDCPATH */\r
     \r
@@ -194,7 +194,8 @@ function createMake(makefile)
       makefile.writeLine("\n# Clean Rule");          \r
       makefile.writeLine("clean:: clean_package");                  \r
       makefile.writeLine("# Clean Top Level Object Directory ");          \r
-      makefile.writeLine("clean_package :\n\t$(RMDIR) $(LIBDIR)/*/");      \r
+      makefile.writeLine("clean_package:")\r
+      makefile.writeLine("\t$(RMDIR) $(LIBDIR)/*");  \r
       makefile.writeLine("\t$(RMDIR) package/cfg");            \r
    }\r
    else\r
@@ -212,28 +213,56 @@ function createMake(makefile)
  return makefile;\r
 }\r
 \r
-function createLibMake(makelibname,targetname, objectPath)\r
+function createLibMake(device, makelibname,targetname, objectPath)\r
 {\r
    var tooldir;\r
+   var cmdprefix;\r
+   var targetDir;\r
    var stringname=String(targetname).replace("(xdc.bld.ITarget.Module)","");\r
-   if(stringname.match("ARM11"))\r
-   {\r
-     tooldir="TI_ARM11_GEN_INSTALL_PATH"; \r
-   }\r
-   else\r
-   {\r
-     tooldir="C6X_GEN_INSTALL_PATH";\r
-   }\r
+   \r
    switch(stringname)\r
    {\r
     case String(C66LE):\r
+      tooldir="C6X_GEN_INSTALL_PATH";\r
+      cmdprefix="";\r
+      targetDir="c66";\r
       targetname=C66LE;\r
       break;\r
     case String(C66BE):\r
+      tooldir="C6X_GEN_INSTALL_PATH";\r
+      cmdprefix="";\r
+      targetDir="c66";\r
       targetname=C66BE;\r
       break;\r
-\r
+    case String(A15LE):\r
+      tooldir="TOOLCHAIN_PATH_A15"; \r
+      cmdprefix="CROSS_TOOL_PRFX";\r
+      targetDir="armv7";\r
+      targetname=A15LE;\r
+      break;\r
+    case String(A9LE):\r
+      tooldir="TOOLCHAIN_PATH_A9";\r
+      cmdprefix="CROSS_TOOL_PRFX";\r
+      targetDir="armv7";\r
+      targetname=A9LE;\r
+      break;\r
+    case String(A8LE):\r
+      tooldir="TOOLCHAIN_PATH_A8";\r
+      cmdprefix="CROSS_TOOL_PRFX";\r
+      targetDir="armv7";\r
+      targetname=A8LE;\r
+      break;\r
+    case String(M4LE):\r
+      tooldir="TOOLCHAIN_PATH_M4";\r
+      cmdprefix="";\r
+      targetDir="m4";\r
+      targetname=M4LE;\r
+      break;\r
+    case String(ARM11):\r
+      tooldir="TI_ARM11_GEN_INSTALL_PATH"; \r
+      break;\r
    }\r
+\r
     var fileModule = xdc.module('xdc.services.io.File');\r
     try{\r
      var dstFile = new java.io.File(makelibname);\r
@@ -262,45 +291,82 @@ function createLibMake(makelibname,targetname, objectPath)
     libmakefile.writeLine("empty =");\r
     libmakefile.writeLine("space =$(empty) $(empty)");\r
          \r
-    if(stringname.match("ti.targets"))\r
+    if ((targetname.name == "A15F") || (targetname.name == "A9F") || (targetname.name == "A8F"))\r
     {\r
+    \r
+        if(stringname.match("gnu.targets"))\r
+        {\r
+            libmakefile.writeLine("CC = $("+tooldir+")/bin/$("+cmdprefix+")gcc");\r
+            libmakefile.writeLine("AC = $("+tooldir+")/bin/$("+cmdprefix+")as");    \r
+            libmakefile.writeLine("ARIN = $("+tooldir+")/bin/$("+cmdprefix+")ar");    \r
+            libmakefile.writeLine("LD = $("+tooldir+")/bin/$("+cmdprefix+")gcc");   \r
+        }\r
+        else\r
+        {\r
+            print("Error: Non-GNU targets are not currently supported ");\r
+            java.lang.System.exit(1);\r
 \r
-       var rtslibtemp = targetname.lnkOpts.suffix.toString().split("/");\r
-       var rtslib;\r
-       for(n=0;n<rtslibtemp.length;n++)\r
-       {\r
-          if(rtslibtemp[n].match(".lib"))\r
-          { \r
-             rtslib=rtslibtemp[n];\r
-          }\r
-       }\r
-\r
-      libmakefile.writeLine("CC = $("+tooldir+")/bin/"+targetname.cc.cmd +" "+targetname.ccOpts.prefix+" "+targetname.cc.opts);\r
-      libmakefile.writeLine("AC = $("+tooldir+")/bin/"+targetname.asm.cmd +" "+targetname.asmOpts.prefix+" "+targetname.asm.opts);    \r
-      libmakefile.writeLine("ARIN = $("+tooldir+")/bin/"+targetname.ar.cmd +" "+targetname.ar.opts);    \r
-      libmakefile.writeLine("LD = $("+tooldir+")/bin/"+targetname.lnk.cmd +" "+targetname.lnk.opts);   \r
-      libmakefile.writeLine("RTSLIB = -l $("+tooldir+")/lib/"+rtslib);        \r
+        }\r
+       \r
+        libmakefile.writeLine("INCS = -I. -I$(strip $(subst ;, -I,$(subst $(space),\\$(space),$(INCDIR)))) -I$("+tooldir+")/include");\r
+        libmakefile.writeLine("OBJEXT = o"+targetname.suffix); \r
+        libmakefile.writeLine("AOBJEXT = s"+targetname.suffix);     \r
+        libmakefile.writeLine("CFLAGS_INTERNAL = " +targetname.ccOpts.prefix+" "+targetname.cc.opts);\r
+        libmakefile.writeLine("ASFLAGS_INTERNAL = " +targetname.asmOpts.prefix+" "+targetname.asm.opts);\r
+        libmakefile.writeLine("ARFLAGS_INTERNAL = " +targetname.ar.opts);\r
+        libmakefile.writeLine("LNKFLAGS_INTERNAL = " +targetname.lnk.opts);\r
+        libmakefile.writeLine("INTERNALDEFS = -MD -MF $@.dep");\r
+        libmakefile.writeLine("INTERNALLINKDEFS = -o $@ -m $@.map");  /* TBD */\r
+        libmakefile.writeLine("OBJDIR =  $(LIBDIR)/" + device.toString() + "/" + targetDir +"/obj"); \r
+    \r
     }\r
     else\r
     {\r
-      print("Error: Non-TI targets are not currently supported ");\r
-      java.lang.System.exit(1);\r
+  \r
+        if(stringname.match("ti.targets"))\r
+        {\r
 \r
-    }\r
+            var rtslibtemp = targetname.lnkOpts.suffix.toString().split("/");\r
+            var rtslib;\r
+            for(n=0;n<rtslibtemp.length;n++)\r
+            {\r
+                if(rtslibtemp[n].match(".lib"))\r
+                { \r
+                    rtslib=rtslibtemp[n];\r
+                }\r
+            }\r
+\r
+            libmakefile.writeLine("CC = $("+tooldir+")/bin/"+targetname.cc.cmd);\r
+            libmakefile.writeLine("AC = $("+tooldir+")/bin/"+targetname.asm.cmd);    \r
+            libmakefile.writeLine("ARIN = $("+tooldir+")/bin/"+targetname.ar.cmd);    \r
+            libmakefile.writeLine("LD = $("+tooldir+")/bin/"+targetname.lnk.cmd);   \r
+            libmakefile.writeLine("RTSLIB = -l $("+tooldir+")/lib/"+rtslib);        \r
+        }\r
+        else\r
+        {\r
+            print("Error: Non-TI targets are not currently supported ");\r
+            java.lang.System.exit(1);\r
+\r
+        }\r
        \r
-    libmakefile.writeLine("INCS = -I. -I$(strip $(subst ;, -I,$(subst $(space),\\$(space),$(INCDIR))))");\r
-    libmakefile.writeLine("OBJEXT = o"+targetname.suffix); \r
-    libmakefile.writeLine("AOBJEXT = s"+targetname.suffix);     \r
-    /* libmakefile.writeLine("INTERNALDEFS = -D"+stringname.replace(/\./g,"_")+" -Dxdc_target_types__=ti/targets/std.h -DMAKEFILE_BUILD -eo.$(OBJEXT) -ea.$(AOBJEXT) -fr=$(@D) -fs=$(@D) -ppa -ppd=$@.dep");*/\r
-    libmakefile.writeLine("INTERNALDEFS = -D"+stringname.replace(/\./g,"_")+"  -DMAKEFILE_BUILD -eo.$(OBJEXT) -ea.$(AOBJEXT) -fr=$(@D) -fs=$(@D) -ppa -ppd=$@.dep");\r
-    libmakefile.writeLine("INTERNALLINKDEFS = -o $@ -m $@.map");\r
-    libmakefile.writeLine("OBJDIR =  $(LIBDIR)/obj"); \r
+        libmakefile.writeLine("INCS = -I. -I$(strip $(subst ;, -I,$(subst $(space),\\$(space),$(INCDIR)))) -I$("+tooldir+")/include");\r
+        libmakefile.writeLine("OBJEXT = o"+targetname.suffix); \r
+        libmakefile.writeLine("AOBJEXT = s"+targetname.suffix);     \r
+        libmakefile.writeLine("CFLAGS_INTERNAL = " +targetname.ccOpts.prefix+" "+targetname.cc.opts);\r
+        libmakefile.writeLine("ASFLAGS_INTERNAL = " +targetname.asmOpts.prefix+" "+targetname.asm.opts);\r
+        libmakefile.writeLine("ARFLAGS_INTERNAL = " +targetname.ar.opts);\r
+        libmakefile.writeLine("LNKFLAGS_INTERNAL = " +targetname.lnk.opts);\r
+        /* libmakefile.writeLine("INTERNALDEFS = -D"+stringname.replace(/\./g,"_")+" -Dxdc_target_types__=ti/targets/std.h -DMAKEFILE_BUILD -eo.$(OBJEXT) -ea.$(AOBJEXT) -fr=$(@D) -fs=$(@D) -ppa -ppd=$@.dep");*/\r
+        libmakefile.writeLine("INTERNALDEFS = -D"+stringname.replace(/\./g,"_")+"  -DMAKEFILE_BUILD -eo.$(OBJEXT) -ea.$(AOBJEXT) -fr=$(@D) -fs=$(@D) -ppa -ppd=$@.dep");\r
+        libmakefile.writeLine("INTERNALLINKDEFS = -o $@ -m $@.map");\r
+        libmakefile.writeLine("OBJDIR =  $(LIBDIR)/" + device.toString() + "/" + targetDir +"/obj"); \r
+    }     \r
    \r
  return libmakefile;\r
 \r
 }\r
 \r
-function makeAddObjects(srcString, makefilename, srcfiles, flags,fileExt, targetName)\r
+function makeAddObjects(srcString, makefilename, srcfiles, flags,fileExt, targetName, objDir)\r
 {\r
   var  sourcestring = (srcString + fileExt).toString().toUpperCase();\r
   var  compileflagstring = sourcestring + "FLAGS";\r
@@ -335,8 +401,8 @@ function makeAddObjects(srcString, makefilename, srcfiles, flags,fileExt, target
  makefilename.writeLine(compileflagstring+" = "+compileflags +" \n");     \r
  makefilename.writeLine("# Make Rule for the "+srcString+" Files");  \r
  \r
- makefilename.writeLine(objectliststring +" = $(patsubst %."+fileExt+", $(OBJDIR)/%.$(OBJEXT), $(" + sourcestring + "))"); \r
- makefilename.writeLine("\n$("+objectliststring+"): $(OBJDIR)/%.$(OBJEXT): %."+fileExt);   \r
+ makefilename.writeLine(objectliststring +" = $(patsubst %."+fileExt+", "+objDir+"/%.$(OBJEXT), $(" + sourcestring + "))"); \r
+ makefilename.writeLine("\n$("+objectliststring+"): "+objDir+"/%.$(OBJEXT): %."+fileExt);   \r
  if(fileExt == "c")\r
  { \r
    makefilename.writeLine("\t-@echo cl"+targetName.suffix +" $< ...");     \r
@@ -349,21 +415,33 @@ function makeAddObjects(srcString, makefilename, srcfiles, flags,fileExt, target
  \r
  if(fileExt == "c")\r
  {\r
-   makefilename.writeLine("\t$(RM) $@.dep");\r
-   makefilename.writeLine("\t$(CC) $("+compileflagstring+") $(INTERNALDEFS) $(INCS) -fc $< ");\r
-   makefilename.writeLine("\t-@$(CP) $@.dep $@.pp; \\");\r
-   makefilename.writeLine("         $(SED) -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\\\$$//' \\");\r
-   makefilename.writeLine("             -e '/^$$/ d' -e 's/$$/ :/' < $@.pp >> $@.dep; \\");\r
-   makefilename.writeLine("         $(RM) $@.pp ");\r
+   if ((targetName.name == "A15F") || (targetName.name == "A9F") || (targetName.name == "A8F"))\r
+   {\r
+    makefilename.writeLine("\t$(RM) $@.dep");\r
+    makefilename.writeLine("\t$(CC) $(CFLAGS_INTERNAL) $("+compileflagstring+") $(INTERNALDEFS) $(INCS) $< -o $@");\r
+   /* \r
+    TBD\r
+   */\r
+   }\r
+   else\r
+   {\r
+    makefilename.writeLine("\t$(RM) $@.dep");\r
+    makefilename.writeLine("\t$(CC) $(CFLAGS_INTERNAL) $("+compileflagstring+") $(INTERNALDEFS) $(INCS) -fc $< ");\r
+    makefilename.writeLine("\t-@$(CP) $@.dep $@.pp; \\");\r
+    makefilename.writeLine("         $(SED) -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\\\$$//' \\");\r
+    makefilename.writeLine("             -e '/^$$/ d' -e 's/$$/ :/' < $@.pp >> $@.dep; \\");\r
+    makefilename.writeLine("         $(RM) $@.pp ");\r
+   }\r
  }\r
  else if(fileExt == "asm")\r
  {\r
-   makefilename.writeLine("\t$(AC) $("+compileflagstring+") $(INTERNALDEFS) $(INCS) -fa $< ");\r
+   makefilename.writeLine("\t$(AC) $(ASFLAGS_INTERNAL) $("+compileflagstring+") $(INTERNALDEFS) $(INCS) -fa $< ");\r
  }\r
  else if(fileExt == "sa")\r
  {\r
-   makefilename.writeLine("\t$(AC) $("+compileflagstring+") $(INTERNALDEFS) $(INCS) $< ");\r
+   makefilename.writeLine("\t$(AC) $(ASFLAGS_INTERNAL) $("+compileflagstring+") $(INTERNALDEFS) $(INCS) $< ");\r
  }\r
\r
    makefilename.writeLine("\n#Create Empty rule for dependency");\r
    makefilename.writeLine("$("+objectliststring+"):"+makefilename.$private.fd);\r
    makefilename.writeLine(makefilename.$private.fd+":");\r
@@ -381,11 +459,47 @@ function makeAddObjects(srcString, makefilename, srcfiles, flags,fileExt, target
  *  Utility function which will build a specific library\r
  **************************************************************************/\r
 var makefilelocal;\r
-function buildLibrary (libOptions, libName, target, libFiles) \r
+function buildLibrary (socName, isDmaSoc, isSoc, libOptions, libName, target, libFiles) \r
 {\r
-    var lldFullLibraryPath = "./lib/c66/" + libName;\r
-    var lldFullBuildPath = "./build/c66/" + libName;\r
-    var lldFullLibraryPathMake = "$(LIBDIR)/" + "c66/" + libName;\r
+    var targetDir;\r
+\r
+    if (target.name == "A15F")\r
+    {\r
+        targetDir = "armv7";\r
+    }\r
+       else if (target.name == "A9F")\r
+    {\r
+        targetDir = "armv7";\r
+    }\r
+       else if (target.name == "A8F")\r
+    {\r
+        targetDir = "armv7";\r
+    }\r
+    else if (target.name == "M4")\r
+    {\r
+        targetDir = "m4";\r
+    }\r
+    else\r
+    {\r
+        targetDir = "c66";\r
+    }\r
+    \r
+    /* Derive the operating system and soc names */\r
+    if (isDmaSoc == "true") {\r
+        var libNameExp = libName+"."+socName+".dma";\r
+        targetDir = socName+"/"+targetDir;\r
+    }\r
+    else if (isSoc == "true") {\r
+        var libNameExp = libName+"."+socName;\r
+        targetDir = socName+"/"+targetDir;\r
+    }\r
+    else  {\r
+        var libNameExp = libName;\r
+    }\r
+        \r
+    var lldFullLibraryPath = "./lib/" + targetDir +"/" + libNameExp;\r
+    var lldFullBuildPath = "./build/" + targetDir +"/" + libNameExp;\r
+    var lldFullLibraryPathMake = "$(LIBDIR)/" + targetDir +"/" + libNameExp;\r
 \r
     /* Create Main make file in the root of package folder */\r
     makefilelocal = createMake(makefilelocal);\r
@@ -399,7 +513,7 @@ function buildLibrary (libOptions, libName, target, libFiles)
     makefilelocal.writeLine(libMake+": FORCE\n\t$(MAKE) -f "+lib+".mk $@");                                 \r
 \r
     /* Create Library make file in the lib folder */\r
-    var makefilelib= createLibMake(lib+".mk",target,objectPath);  \r
+    var makefilelib= createLibMake(socName, lib+".mk",target,objectPath);  \r
 \r
     /* Rule to clean library in main makefile */\r
     makefilelocal.writeLine("# Rule to clean "+libMake+" library");                                              \r
@@ -436,42 +550,60 @@ function buildLibrary (libOptions, libName, target, libFiles)
      }\r
     if(cfiles.length > 0)\r
     {                                                \r
-      makeAddObjects("COMMONSRC",makefilelib,cfiles,libOptions,"c",target);\r
+      makeAddObjects("COMMONSRC",makefilelib,cfiles,libOptions,"c",target, "$(OBJDIR)");\r
       librule += " $(COMMONSRCCOBJS)";                   \r
     }\r
     if(afiles.length > 0)\r
     {                                                \r
-      makeAddObjects("COMMONSRC",makefilelib,afiles,libOptions,"asm",target);\r
+      makeAddObjects("COMMONSRC",makefilelib,afiles,libOptions,"asm",target, "$(OBJDIR)");\r
       librule += " $(COMMONSRCASMOBJS)";                   \r
     }\r
     if(safiles.length > 0)\r
     {                                                \r
-      makeAddObjects("COMMONSRC",makefilelib,safiles,libOptions,"sa",target);\r
+      makeAddObjects("COMMONSRC",makefilelib,safiles,libOptions,"sa",target, "$(OBJDIR)");\r
       librule += " $(COMMONSRCSAOBJS)";                   \r
     }\r
 \r
     makefilelib.writeLine(librule);\r
     makefilelib.writeLine("\t@echo archiving $? into $@ ...");\r
-    makefilelib.writeLine("\tif [ ! -d $(LIBDIR)/c66 ]; then $(MKDIR) $(LIBDIR)/c66 ; fi;"); \r
-               makefilelib.writeLine("\t$(ARIN) $@ $?");\r
+    makefilelib.writeLine("\tif [ ! -d $(LIBDIR)/" + targetDir + " ]; then $(MKDIR) $(LIBDIR)/" + targetDir + " ; fi;"); \r
+    makefilelib.writeLine("\t$(ARIN) $(ARFLAGS_INTERNAL) $@ $?");\r
                makefilelib.close();   \r
 \r
     /* Create the Epilogue; which executes after all the builds are completed. \r
      * This is used to generate the benchmark information for the built library. \r
      * Also add the benchmarking information file to the package. */\r
-    Pkg.makeEpilogue += ".libraries: benchmarking_" + target.suffix + "\n";\r
-    Pkg.makeEpilogue += "benchmarking_" + target.suffix + ":";\r
-    Pkg.makeEpilogue += "\n\t ofd6x.exe -x " + lldFullLibraryPath + ".a" + target.suffix + " > tmp.xml";\r
-    Pkg.makeEpilogue += "\n\t sectti.exe tmp.xml > " + lldFullLibraryPath + ".a" + target.suffix +  "_size.txt";\r
-    Pkg.makeEpilogue += "\n\t $(RM) tmp.xml\n\n";\r
+\r
+    /* Put the temp file in object directory since javascript doesn't have a built in tmpname, \r
+     * and don't want --jobs=# with # > 1 to result in collisions */\r
+    var libFullName = lldFullLibraryPath + ".a" + target.suffix;\r
+    var tempFile = libFullName + ".xml";\r
+    Pkg.makeEpilogue += ".libraries: " + libFullName +  "_size.txt\n";\r
+    Pkg.makeEpilogue += libFullName +  "_size.txt: " + libFullName + "\n";\r
+    if ( java.lang.String(target.name).contains('66') )\r
+    {    \r
+        Pkg.makeEpilogue += "\n\t $(C6X_GEN_INSTALL_PATH)/bin/ofd6x -x " + libFullName + " > " + tempFile;\r
+        Pkg.makeEpilogue += "\n\t $(SECTTI) " + tempFile + " > " + libFullName +  "_size.txt";\r
+        Pkg.makeEpilogue += "\n\t $(RM) " + tempFile + "\n\n";\r
+    }   \r
+    else if (target.name == "M4")\r
+    {\r
+        Pkg.makeEpilogue += "\n\t $(TOOLCHAIN_PATH_M4)/bin/armofd -x " + libFullName + " > " + tempFile;\r
+        Pkg.makeEpilogue += "\n\t $(SECTTI) " + tempFile + " > " + libFullName +  "_size.txt";\r
+        Pkg.makeEpilogue += "\n\t $(RM) " + tempFile + "\n\n";\r
+    }\r
+    else\r
+    {\r
+        Pkg.makeEpilogue += "\n\t $(TOOLCHAIN_PATH_A15)/bin/$(CROSS_TOOL_PRFX)size " + libFullName + " > " + libFullName + "_size.txt";\r
+    }       \r
     Pkg.otherFiles[Pkg.otherFiles.length++] = lldFullLibraryPath + ".a" + target.suffix + "_size.txt";\r
     Pkg.otherFiles[Pkg.otherFiles.length++] = lldFullBuildPath + ".a" + target.suffix + ".mk";\r
     Pkg.otherFiles[Pkg.otherFiles.length++] = lldFullLibraryPath + ".a" + target.suffix;\r
 \r
     /* We need to clean after ourselves; extend the 'clean' target to take care of this. */\r
-    Pkg.makeEpilogue += "clean::\n";\r
+    Pkg.makeEpilogue += "\nclean::\n";\r
     Pkg.makeEpilogue += "\t$(RM) " + lldFullBuildPath + ".a" + target.suffix + "_size.txt\n";    \r
-    Pkg.makeEpilogue += "\t$(RMDIR) " + "$(LIBDIR)/" + "c66/ \n\n";\r
+    Pkg.makeEpilogue += "\t$(RMDIR) " + "$(LIBDIR)/" + targetDir + "/ \n\n";\r
 \r
     return lib;\r
 }\r
old mode 100644 (file)
new mode 100755 (executable)
index 0d31b4e..24dbbc2
@@ -8,11 +8,31 @@
  *  and is responsible for configuration of the paths for the various tools\r
  *  required to build RM.\r
  *\r
- * Copyright (C) 2012-2013, Texas Instruments, Inc.\r
+ * Copyright (C) 2012-2015, Texas Instruments, Inc.\r
  *****************************************************************************/\r
 \r
 /* Get the Tools Base directory from the Environment Variable. */\r
-var toolsBaseDir = java.lang.System.getenv("XDCCGROOT");\r
+var c66ToolsBaseDir = java.lang.System.getenv("C6X_GEN_INSTALL_PATH");\r
+var m4ToolsBaseDir = java.lang.System.getenv("TOOLCHAIN_PATH_M4");\r
+var a15ToolsBaseDir = java.lang.System.getenv("TOOLCHAIN_PATH_A15");\r
+var a9ToolsBaseDir = java.lang.System.getenv("TOOLCHAIN_PATH_A9");\r
+var a8ToolsBaseDir = java.lang.System.getenv("TOOLCHAIN_PATH_A8");\r
+\r
+/* Get the extended debug flags for C66x, \r
+ * did not change the name for backwards compatibilty */\r
+var extDbgFlags = java.lang.System.getenv("EXTDBGFLAGS");\r
+\r
+/* Get the extended debug flags for A15 */\r
+var extDbgFlags_a15 = java.lang.System.getenv("EXTDBGFLAGS_A15");\r
+\r
+/* Get the extended debug flags for A8 */\r
+var extDbgFlags_a8 = java.lang.System.getenv("EXTDBGFLAGS_A8");\r
+\r
+/* Get the extended debug flags for A9 */\r
+var extDbgFlags_a9 = java.lang.System.getenv("EXTDBGFLAGS_A9");\r
+\r
+/* Get the extended debug flags for M4 */\r
+var extDbgFlags_m4 = java.lang.System.getenv("EXTDBGFLAGS_M4");\r
 \r
 /* Get the base directory for the RM Package */\r
 var lldPath = new java.io.File(".//").getPath();\r
@@ -23,7 +43,7 @@ var lldInstallType;
 var lldPartNumber = java.lang.System.getenv("PARTNO");\r
 \r
 /* Include Path */\r
-var lldIncludePath = " -i" + lldPath + "/src" + " -i" + lldPath  + " -i" + lldPath + "/test" + " -i" + lldPath + "/util/libfdt";\r
+var lldIncludePath = " -I" + lldPath + "/src" + " -I" + lldPath  + " -I" + lldPath + "/test" + " -I" + lldPath + "/util/libfdt";\r
 \r
 /* Configure the RM Release Version Information */\r
 /* 3 steps: remove SPACE and TAB, convert to string and split to make array */\r
@@ -35,13 +55,45 @@ var lldCoverityAnalysis = java.lang.System.getenv("LLDCOV");
 \r
 /* C66 ELF compiler configuration for Little Endian Mode. */\r
 var C66LE          = xdc.useModule('ti.targets.elf.C66');\r
-C66LE.rootDir       = toolsBaseDir;\r
+C66LE.rootDir       = c66ToolsBaseDir;\r
 C66LE.ccOpts.prefix  = "-mo -o3 --gcc -q -k -eo.o";\r
+if(extDbgFlags)     \r
+    C66LE.ccOpts.prefix = C66LE.ccOpts.prefix + " " + extDbgFlags; \r
 \r
 /* C66 ELF compiler configuration for Big Endian Mode. */\r
 var C66BE          = xdc.useModule('ti.targets.elf.C66_big_endian');\r
-C66BE.rootDir       = toolsBaseDir;\r
+C66BE.rootDir       = c66ToolsBaseDir;\r
 C66BE.ccOpts.prefix  = "-mo -o3 --gcc -q -k -eo.o -DBIGENDIAN";\r
+if(extDbgFlags)     \r
+    C66BE.ccOpts.prefix = C66BE.ccOpts.prefix + " " + extDbgFlags;\r
+\r
+/* ARMv7 A15 compiler configuration */\r
+var A15LE            = xdc.useModule('gnu.targets.arm.A15F');\r
+A15LE.rootDir        = a15ToolsBaseDir;\r
+A15LE.ccOpts.prefix  = "-mno-unaligned-access -c -mtune=cortex-a15 -marm -DDRA7xx -gstrict-dwarf -Wall -D__ARMv7 -D_LITTLE_ENDIAN=1";\r
+if(extDbgFlags_a15)     \r
+    A15LE.ccOpts.prefix = A15LE.ccOpts.prefix + " " + extDbgFlags_a15; \r
+\r
+/* ARMv7 A9 compiler configuration */\r
+var A9LE            = xdc.useModule('gnu.targets.arm.A9F');\r
+A9LE.rootDir        = a9ToolsBaseDir;\r
+A9LE.ccOpts.prefix  = "-mno-unaligned-access -c -mtune=cortex-a9 -marm -DDRA7xx -gstrict-dwarf -Wall -D__ARMv7 -D_LITTLE_ENDIAN=1";\r
+if(extDbgFlags_a9)     \r
+    A9LE.ccOpts.prefix = A9LE.ccOpts.prefix + " " + extDbgFlags_a9; \r
+\r
+/* ARMv7 A8 compiler configuration */\r
+var A8LE            = xdc.useModule('gnu.targets.arm.A8F');\r
+A8LE.rootDir        = a8ToolsBaseDir;\r
+A8LE.ccOpts.prefix  = "-mno-unaligned-access -c -mtune=cortex-a8 -marm -DDRA7xx -gstrict-dwarf -Wall -D__ARMv7 -D_LITTLE_ENDIAN=1";\r
+if(extDbgFlags_a8)     \r
+    A8LE.ccOpts.prefix = A8LE.ccOpts.prefix + " " + extDbgFlags_a8; \r
+\r
+/* M4 ELF compiler configuration for Little Endian Mode. */\r
+var M4LE            = xdc.useModule('ti.targets.arm.elf.M4');\r
+M4LE.rootDir        = m4ToolsBaseDir;\r
+M4LE.ccOpts.prefix  = "-o4 -qq -pdsw255 -DMAKEFILE_BUILD";\r
+if(extDbgFlags_m4)\r
+    M4LE.ccOpts.prefix = M4LE.ccOpts.prefix + " " + extDbgFlags_m4; \r
 \r
 /* Check if we need to run the STATIC Analysis or not? */\r
 var coverityAnalysis = java.lang.System.getenv("STATIC_ANALYZE");\r
@@ -94,5 +146,139 @@ if (miniBuild == "ON")
 \r
 }\r
 \r
-/* List all the build targets here. */\r
-Build.targets = [ C66LE, C66BE ];\r
+/* Create the SoC List  */\r
+var socs = { \r
+    /* device independent libraries */\r
+    all :\r
+    {\r
+        /* Build this library */\r
+        build: "true",\r
+        /* SoC lib enabled */\r
+        socDevLib: "false",\r
+        /* dma lib enabled */\r
+        dmaDevLib: "false",     \r
+       /* Library options */\r
+        copts: "",\r
+        /* target lists, kept blank now, would be updated based on argument lists */\r
+        targets: []\r
+    },\r
+   k2h :\r
+    {\r
+        /* this variable would be reinitialized to true, if XDCARGS contains k2h */\r
+        build: "false", \r
+        /* SoC lib enabled */\r
+        socDevLib: "false",\r
+        /* dma lib enabled */\r
+        dmaDevLib: "false",     \r
+       /* Library options */\r
+       copts: " -DSOC_K2H",\r
+       /* target list */\r
+       targets: [ C66LE, C66BE, A15LE]\r
+    },\r
+   k2k :\r
+    {\r
+        /* this variable would be reinitialized to true, if XDCARGS contains k2k */\r
+        build: "false", \r
+        /* SoC lib enabled */\r
+        socDevLib: "false",\r
+        /* dma lib enabled */\r
+        dmaDevLib: "false",     \r
+       /* Library options */\r
+       copts: " -DSOC_K2K",\r
+       /* target list */\r
+       targets: [ C66LE, C66BE, A15LE]\r
+    },\r
+   k2e :\r
+    {\r
+        /* this variable would be reinitialized to true, if XDCARGS contains k2e */\r
+        build: "false", \r
+        /* SoC lib enabled */\r
+        socDevLib: "false",\r
+        /* dma lib enabled */\r
+        dmaDevLib: "false",     \r
+      /* Library options */\r
+       copts: " -DSOC_K2E",\r
+       /* target list */\r
+       targets: [ C66LE, C66BE, A15LE]\r
+    },\r
+   k2l :\r
+    {\r
+        /* this variable would be reinitialized to true, if XDCARGS contains k2l */\r
+        build: "false", \r
+         /* SoC lib enabled */\r
+        socDevLib: "false",\r
+        /* dma lib enabled */\r
+        dmaDevLib: "false",     \r
+      /* Library options */\r
+       copts: " -DSOC_K2L",\r
+       /* target list */\r
+       targets: [ C66LE, C66BE, A15LE]\r
+    }\r
+};\r
+\r
+/**************************************************************************\r
+ * FUNCTION NAME : merge\r
+ **************************************************************************\r
+ * DESCRIPTION   :\r
+ *  The function is used to merge two arrarys\r
+ **************************************************************************/\r
+function merge() {\r
+    var args = arguments;\r
+    var hash = {};\r
+    var arr = [];\r
+    for (var i = 0; i < args.length; i++) {\r
+       for (var j = 0; j < args[i].length; j++) {\r
+         if (hash[args[i][j]] !== true) {\r
+           arr[arr.length] = args[i][j];\r
+           hash[args[i][j]] = true;\r
+         }\r
+       }\r
+     }\r
+    return arr;\r
+}\r
+\r
+/* Grab input from XDCARGS */\r
+var buildArguments  = [];\r
+\r
+/* Construct the build arguments */\r
+for (var tmp=0; arguments[tmp] != undefined; tmp++)\r
+{\r
+\r
+    /* If no arguments are provided, override for building all */\r
+    if ( ( arguments.length == 1) && (arguments[tmp].equals("./config.bld")) )\r
+        buildArguments[buildArguments.length++] = "all";\r
+    else\r
+        buildArguments[buildArguments.length++] = arguments[tmp];\r
+}\r
+\r
+/* Build targets on this build */\r
+var build_targets = [];\r
+var soc_names = Object.keys(socs);\r
+\r
+for (var i=0; i < buildArguments.length; i++ ) {\r
+    /* Build it for all targets */\r
+    if (buildArguments[i] == "all") {\r
+        for (var j = 0; j < soc_names.length; j++)  {\r
+            build_targets = merge (build_targets.slice(0), socs[soc_names[j]].targets.slice(0));\r
+            /* Set build to "true" for that SoC */\r
+            socs[soc_names[j]].build = "true";\r
+        }\r
+    }\r
+    else {\r
+        /* Skip the first argument, which is ./config.bld to get to next SoCs */\r
+        if (i == 0) continue;          \r
+        /* Set that build to true if it is found in supported build socs */\r
+        for (j = 0; j < soc_names.length; j++) {\r
+            if (buildArguments[i] == soc_names[j]) {\r
+                socs[buildArguments[i]].build = "true";\r
+                build_targets = merge (build_targets.slice(0), socs[buildArguments[i]].targets.slice(0));\r
+                break;\r
+            }\r
+        }\r
+    }   \r
+}\r
+\r
+/* Update the Build target generated list */\r
+socs["all"].targets = build_targets; \r
+Build.targets   = build_targets;\r
+\r
old mode 100644 (file)
new mode 100755 (executable)
index 1ebcda8..f8a2255
@@ -1,6 +1,10 @@
+#ifdef _TMS320C6X
 #pragma DATA_SECTION (rmGlobalResourceList, ".sharedGRL");
 #pragma DATA_ALIGN (rmGlobalResourceList, 128)
 const char rmGlobalResourceList[] = {
+#else
+const char rmGlobalResourceList[] __attribute__ ((aligned (128))) = {
+#endif
 0xd0,
 0x0d,
 0xfe,
old mode 100644 (file)
new mode 100755 (executable)
index 7ed9ec7..8e1fcfa
@@ -1,6 +1,10 @@
+#ifdef _TMS320C6X
 #pragma DATA_SECTION (rmDspOnlyPolicy, ".sharedPolicy");
 #pragma DATA_ALIGN (rmDspOnlyPolicy, 128)
 const char rmDspOnlyPolicy[] = {
+#else
+const char rmDspOnlyPolicy[] __attribute__ ((aligned (128))) = {
+#endif
 0xd0,
 0x0d,
 0xfe,
old mode 100644 (file)
new mode 100755 (executable)
index d0c82a8..44fdc2c
@@ -15,7 +15,7 @@
  *  Example for a valid command:\r
  *      xdc XDCARGS="SETUP" release   \r
  *\r
- * Copyright (C) 2012-2014, Texas Instruments, Inc.\r
+ * Copyright (C) 2012-2015, Texas Instruments, Inc.\r
  *****************************************************************************/\r
 \r
 /* List of all subdirectories that combine to make the RM Package. */\r
@@ -49,14 +49,18 @@ var lldRTSCFileName = "rm" + "_" + lldPartNumber + "_" +
  ******************************************************************/\r
 \r
 print ("*************** RM Build Information ****************");\r
-print ("RM Install        : " + lldInstallType);\r
-print ("RM Version        : " + lldReleaseVersion);\r
-print ("Tools Directory   : " + toolsBaseDir);\r
-print ("RTSC File Name   : " + lldRTSCFileName);\r
-print ("RM Path           : " + lldPath);\r
-print ("Coverity Analysis : " + (coverityAnalysis == "ON" ? "ON" : "OFF"));\r
-print ("CC LE opts        : " + C66LE.ccOpts.prefix);\r
-print ("CC BE opts        : " + C66BE.ccOpts.prefix);\r
+print ("RM Install                 : " + lldInstallType);\r
+print ("RM Version                 : " + lldReleaseVersion);\r
+print ("C66 Tools Directory        : " + c66ToolsBaseDir);\r
+print ("M4 Tools Directory         : " + m4ToolsBaseDir);\r
+print ("A15 Tools Directory        : " + a15ToolsBaseDir);\r
+print ("RTSC File Name            : " + lldRTSCFileName);\r
+print ("RM Path                    : " + lldPath);\r
+print ("Coverity Analysis          : " + (coverityAnalysis == "ON" ? "ON" : "OFF"));\r
+print ("CC LE opts                 : " + C66LE.ccOpts.prefix);\r
+print ("CC BE opts                 : " + C66BE.ccOpts.prefix);\r
+print ("M4 LE opts                 : " + M4LE.ccOpts.prefix);\r
+print ("A15 basic opts             : " + A15LE.ccOpts.prefix);\r
 print ("***********************************************************");\r
 \r
 /* Create the release package for the RM */\r
@@ -175,7 +179,7 @@ if (lldInstallType == "SETUP")
     Pkg.makeEpilogue += "\t tar -xf ./packages/" + lldRTSCFileName + ".tar" + " -Ctmp/packages \n";\r
     Pkg.makeEpilogue += "\t installjammer " + InstallJammerVersion + PackageBaseDir + WinInstallDir + \r
                         " --output-dir packages/ --build install/rm.mpi\n";\r
-    Pkg.makeEpilogue += "\t -$(RMDIR) tmp\n\n";\r
+    Pkg.makeEpilogue += "\t -$(RMDIR) /S /Q tmp\n\n";\r
 }\r
 \r
 /* We need to clean after ourselves; extend the 'clean' target to take care of this. */\r
old mode 100644 (file)
new mode 100755 (executable)
index 37b1ffc..e75fa47
 function getLibs(prog)\r
 {\r
     var suffix = prog.build.target.suffix;\r
-\r
     var name = this.$name + ".a" + suffix;\r
+    var socType = this.Settings.deviceType;\r
+\r
+    socType = socType.toLowerCase();\r
 \r
     /* Read LIBDIR variable */\r
     var lib = java.lang.System.getenv("LIBDIR");\r
@@ -28,13 +30,37 @@ function getLibs(prog)
         print ("\tSystem environment LIBDIR variable defined : " + lib);\r
     }\r
 \r
+    /* SoC types supported */\r
+    var socTypes = [\r
+                        'k2k',\r
+                        'k2h',\r
+                        'k2l',\r
+                        'k2e',\r
+                      ];\r
+    \r
+    /* Get the SOC */\r
+    for each (var soc in socTypes)\r
+    {\r
+        if (socType.equals(soc))\r
+        {\r
+            lib = lib + "/" + soc;\r
+            name = this.$name + "." + soc + ".a" + suffix;      \r
+            break;\r
+        }\r
+    }\r
+\r
     /* Get target folder, if applicable */\r
     if ( java.lang.String(suffix).contains('66') )\r
         lib = lib + "/c66";\r
+    else if ( java.lang.String(suffix).contains('m4') )\r
+        lib = lib + "/m4";\r
+    else\r
+        lib = lib + "/armv7"; \r
 \r
     /* Get library name with path */\r
     lib = lib + "/" + name;\r
     if (java.io.File(this.packageBase + lib).exists()) {\r
+       print ("\tLinking with library " + this.$name + ":" + lib);\r
        return lib;\r
     }\r
 \r
old mode 100644 (file)
new mode 100755 (executable)
index 0037345..8c44862
@@ -12,7 +12,7 @@
 /* Load the library utility. */
 var libUtility = xdc.loadCapsule ("../build/buildlib.xs");
 
-var rmFile = [
+var rmlldFile = [
     "src/rm.c",
     "src/rm_nameserver.c",
     "src/rm_policy.c",
@@ -37,14 +37,39 @@ var rmFile = [
  **************************************************************************/
 function modBuild() 
 {
-    /* Build the libraries for all the targets specified. */
-    for (var targets=0; targets < Build.targets.length; targets++)
+    /* Build the device independent libraries for all the targets specified. */
+    for (var targets=0; targets < socs["all"].targets.length; targets++)
     {
+        var targetFiles = rmlldFile.slice(); /* make copy */
         var libOptions = {
-            incs: lldIncludePath, 
+            copts: socs["all"].copts,
+            incs:  lldIncludePath, 
         };
+        libUtility.buildLibrary ("",  "false", "false", libOptions, Pkg.name, socs["all"].targets[targets], targetFiles);
+    }
+
+    /* Build library targets for device dependent SoCs */
+    for (var soc=0; soc < soc_names.length; soc++) 
+    {
+        var dev = socs[soc_names[soc]];
         
-        libUtility.buildLibrary (libOptions, "ti.drv.rm", Build.targets[targets], rmFile);
+        /* do not proceed if this SoC is not configured to be built */
+        if (dev.build == "false")
+           continue;
+
+        if (dev.socDevLib == "true")
+        { 
+            var targetFiles_soc = rmlldFile.slice(); /* make copy */
+            /* Build the libraries for all the targets specified. */
+            for (var targets=0; targets < dev.targets.length; targets++)
+            {
+                var libOptions = {
+                    copts: dev.copts,
+                    incs:  lldIncludePath, 
+                };
+                libUtility.buildLibrary (soc_names[soc], "false", "true", libOptions, Pkg.name, dev.targets[targets], targetFiles_soc);
+            }
+         }
     }
 
     /* Add all the .c files to the release package. */
old mode 100644 (file)
new mode 100755 (executable)
index a127c12..a511854
@@ -2,6 +2,6 @@
 -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/dts_files/static-policy.c"
 -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2e/c66/bios/rm_osal.c"
 -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2e/c66/bios/dsp_client.cfg"
--ccs.setCompilerOptions "-mv6600 -g -DDEVICE_K2E --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" 
+-ccs.setCompilerOptions "-mv6600 -g -DSOC_K2E --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" 
 -rtsc.enableRtsc
 
old mode 100644 (file)
new mode 100755 (executable)
index dfbf638..6da3a57
@@ -3,6 +3,6 @@
 -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/dts_files/server-policy.c"
 -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2e/c66/bios/rm_osal.c"
 -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2e/c66/bios/rm_test_sc.cfg"
--ccs.setCompilerOptions "-mv6600 -g -DDEVICE_K2E --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" 
+-ccs.setCompilerOptions "-mv6600 -g -DSOC_K2E --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" 
 -rtsc.enableRtsc
 
old mode 100644 (file)
new mode 100755 (executable)
index 80d4d3c..49d6169
@@ -2,6 +2,6 @@
 -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/dts_files/static-policy.c"
 -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2h/c66/bios/rm_osal.c"
 -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2h/c66/bios/dsp_client.cfg"
--ccs.setCompilerOptions "-mv6600 -g -DDEVICE_K2H --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" 
+-ccs.setCompilerOptions "-mv6600 -g -DSOC_K2H --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" 
 -rtsc.enableRtsc
 
old mode 100644 (file)
new mode 100755 (executable)
index 54cbf60..cc9ea67
@@ -5,6 +5,6 @@
 -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/dts_files/static-policy.c"
 -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2h/c66/bios/rm_osal.c"
 -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2h/c66/bios/rm_test.cfg"
--ccs.setCompilerOptions "-mv6600 -g -DDEVICE_K2H --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" 
+-ccs.setCompilerOptions "-mv6600 -g -DSOC_K2H --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" 
 -rtsc.enableRtsc
 
old mode 100644 (file)
new mode 100755 (executable)
index 4000122..a1e4305
@@ -3,6 +3,6 @@
 -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/dts_files/server-policy.c"
 -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2h/c66/bios/rm_osal.c"
 -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2h/c66/bios/rm_test_sc.cfg"
--ccs.setCompilerOptions "-mv6600 -g -DDEVICE_K2H --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" 
+-ccs.setCompilerOptions "-mv6600 -g -DSOC_K2H --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" 
 -rtsc.enableRtsc
 
old mode 100644 (file)
new mode 100755 (executable)
index 12db031..b132ec0
@@ -8,6 +8,6 @@
 -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/rm_transport_setup.c"
 -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2h/c66/bios/rm_osal.c"
 -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2h/c66/bios/rm_mem_test.cfg"
--ccs.setCompilerOptions "-mv6600 -g -DDEVICE_K2H --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" 
+-ccs.setCompilerOptions "-mv6600 -g -DSOC_K2H --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" 
 -rtsc.enableRtsc
 
old mode 100644 (file)
new mode 100755 (executable)
index f818aaf..a6eaf21
@@ -4,6 +4,6 @@
 -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/dts_files/server-policy.c"
 -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2h/c66/bios/rm_shared_osal.c"
 -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2h/c66/bios/rm_shared_test.cfg"
--ccs.setCompilerOptions "-mv6600 -g -DDEVICE_K2H --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" 
+-ccs.setCompilerOptions "-mv6600 -g -DSOC_K2H --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" 
 -rtsc.enableRtsc
 
old mode 100644 (file)
new mode 100755 (executable)
index 8effadc..d448371
@@ -2,6 +2,6 @@
 -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/dts_files/static-policy.c"
 -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2k/c66/bios/rm_osal.c"
 -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2k/c66/bios/dsp_client.cfg"
--ccs.setCompilerOptions "-mv6600 -g -DDEVICE_K2K --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" 
+-ccs.setCompilerOptions "-mv6600 -g -DSOC_K2K --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" 
 -rtsc.enableRtsc
 
old mode 100644 (file)
new mode 100755 (executable)
index a55ad38..f751fa3
@@ -5,6 +5,6 @@
 -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/dts_files/static-policy.c"
 -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2k/c66/bios/rm_osal.c"
 -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2k/c66/bios/rm_test.cfg"
--ccs.setCompilerOptions "-mv6600 -g -DDEVICE_K2K --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" 
+-ccs.setCompilerOptions "-mv6600 -g -DSOC_K2K --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" 
 -rtsc.enableRtsc
 
old mode 100644 (file)
new mode 100755 (executable)
index be2bf9f..3dd1dc7
@@ -3,6 +3,6 @@
 -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/dts_files/server-policy.c"
 -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2k/c66/bios/rm_osal.c"
 -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2k/c66/bios/rm_test_sc.cfg"
--ccs.setCompilerOptions "-mv6600 -g -DDEVICE_K2K --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" 
+-ccs.setCompilerOptions "-mv6600 -g -DSOC_K2K --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" 
 -rtsc.enableRtsc
 
old mode 100644 (file)
new mode 100755 (executable)
index d6c79b9..0de0c34
@@ -8,6 +8,6 @@
 -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/rm_transport_setup.c"
 -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2k/c66/bios/rm_osal.c"
 -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2k/c66/bios/rm_mem_test.cfg"
--ccs.setCompilerOptions "-mv6600 -g -DDEVICE_K2K --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" 
+-ccs.setCompilerOptions "-mv6600 -g -DSOC_K2K --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" 
 -rtsc.enableRtsc
 
old mode 100644 (file)
new mode 100755 (executable)
index 85458e1..e6ae07d
@@ -4,6 +4,6 @@
 -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/dts_files/server-policy.c"
 -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2k/c66/bios/rm_shared_osal.c"
 -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2k/c66/bios/rm_shared_test.cfg"
--ccs.setCompilerOptions "-mv6600 -g -DDEVICE_K2K --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" 
+-ccs.setCompilerOptions "-mv6600 -g -DSOC_K2K --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" 
 -rtsc.enableRtsc
 
old mode 100644 (file)
new mode 100755 (executable)
index f781caa..ec2c08e
@@ -2,6 +2,6 @@
 -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/dts_files/static-policy.c"
 -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2l/c66/bios/rm_osal.c"
 -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2l/c66/bios/dsp_client.cfg"
--ccs.setCompilerOptions "-mv6600 -g -DDEVICE_K2L --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" 
+-ccs.setCompilerOptions "-mv6600 -g -DSOC_K2L --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" 
 -rtsc.enableRtsc
 
old mode 100644 (file)
new mode 100755 (executable)
index f062ec5..ce50012
@@ -5,6 +5,6 @@
 -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/dts_files/static-policy.c"
 -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2l/c66/bios/rm_osal.c"
 -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2l/c66/bios/rm_test.cfg"
--ccs.setCompilerOptions "-mv6600 -g -DDEVICE_K2L --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" 
+-ccs.setCompilerOptions "-mv6600 -g -DSOC_K2L --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" 
 -rtsc.enableRtsc
 
old mode 100644 (file)
new mode 100755 (executable)
index 6c13611..bb51317
@@ -3,6 +3,6 @@
 -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/dts_files/server-policy.c"
 -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2l/c66/bios/rm_osal.c"
 -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2l/c66/bios/rm_test_sc.cfg"
--ccs.setCompilerOptions "-mv6600 -g -DDEVICE_K2L --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" 
+-ccs.setCompilerOptions "-mv6600 -g -DSOC_K2L --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" 
 -rtsc.enableRtsc
 
old mode 100644 (file)
new mode 100755 (executable)
index 35a5680..d1ddd14
@@ -8,6 +8,6 @@
 -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/rm_transport_setup.c"
 -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2l/c66/bios/rm_osal.c"
 -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2l/c66/bios/rm_mem_test.cfg"
--ccs.setCompilerOptions "-mv6600 -g -DDEVICE_K2L --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" 
+-ccs.setCompilerOptions "-mv6600 -g -DSOC_K2L --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" 
 -rtsc.enableRtsc
 
old mode 100644 (file)
new mode 100755 (executable)
index 9db2895..dda1407
@@ -4,6 +4,6 @@
 -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/dts_files/server-policy.c"
 -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2l/c66/bios/rm_shared_osal.c"
 -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2l/c66/bios/rm_shared_test.cfg"
--ccs.setCompilerOptions "-mv6600 -g -DDEVICE_K2L --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" 
+-ccs.setCompilerOptions "-mv6600 -g -DSOC_K2L --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" 
 -rtsc.enableRtsc