fixed CGT tool install variable for yocto

diff --git a/config.bld b/config.bld
index aafb70f1540645a87865bf29f2d44ab198dbe739..a36cd2e437f3ed874c2a0da13b2da892972d4604 100644 (file)
--- a/config.bld
+++ b/config.bld
@@ -1,200 +1,200 @@
-/******************************************************************************\r
- * FILE PURPOSE: Build configuration Script for the hyplnk LLD\r
- ******************************************************************************\r
- * FILE NAME: config.bld\r
- *\r
- * DESCRIPTION: \r
- *  This file contains the build configuration script for the hyplnk LLD\r
- *  and is responsible for configuration of the paths for the various \r
- *  tools required to build the driver.\r
- *\r
- * Copyright (C) 2009-2014, Texas Instruments, Inc.\r
- *****************************************************************************/\r
-\r
-/* Get the Tools Base directory from the Environment Variable. */\r
-var toolsBaseDir = java.lang.System.getenv("XDCCGROOT");\r
-\r
-/* Check if we need to create the Makefiles? */\r
-var miniBuild = java.lang.System.getenv("MINI_PACKAGE");\r
-\r
-/* Get the extended debug flags */\r
+/******************************************************************************
+ * FILE PURPOSE: Build configuration Script for the hyplnk LLD
+ ******************************************************************************
+ * FILE NAME: config.bld
+ *
+ * DESCRIPTION: 
+ *  This file contains the build configuration script for the hyplnk LLD
+ *  and is responsible for configuration of the paths for the various 
+ *  tools required to build the driver.
+ *
+ * Copyright (C) 2009-2014, Texas Instruments, Inc.
+ *****************************************************************************/
+
+/* Get the Tools Base directory from the Environment Variable. */
+var toolsBaseDir = java.lang.System.getenv("C6X_GEN_INSTALL_PATH");
+
+/* Check if we need to create the Makefiles? */
+var miniBuild = java.lang.System.getenv("MINI_PACKAGE");
+
+/* Get the extended debug flags */
 var extDbgFlags = java.lang.System.getenv("EXTDBGFLAGS");
-\r
-/* Get the base directory for the hyplnk LLD Package */\r
-var hyplnklldPath = new java.io.File(".//").getPath();\r
-\r
-/* This is the part number for which the hyplnk LLD is being created */\r
-var hyplnklldPartNumber = java.lang.System.getenv("PARTNO");\r
-\r
-if(hyplnklldPartNumber == null)\r
-{\r
-    hyplnklldPartNumber = "keystone2";\r
-}\r
-\r
-/* Include Path */\r
-var hyplnklldIncPath = " -i" + hyplnklldPath;\r
-\r
-/* Configure the hyplnk LLD Version Information */\r
-/* 3 steps: remove SPACE and TAB, convert to string and split to make array */\r
-var hyplnklldReleaseVersion = (""+Pkg.version.replace(/\s/g, "")).split(',');\r
-\r
-/* hyplnk LLD Coverity Analysis: Check the environment variable to determine if Static\r
- * Analysis has to be done on the driver Code base or not? */\r
-var hyplnkCoverityAnalysis = java.lang.System.getenv("STATIC_ANALYZE");\r
-\r
-/* C66 ELF compiler configuration for Little Endian Mode. */\r
-var C66LE            = xdc.useModule('ti.targets.elf.C66');\r
-C66LE.rootDir        = toolsBaseDir;\r
-C66LE.ccOpts.prefix  = "-mo -o3 -q -k -eo.o";\r
+
+/* Get the base directory for the hyplnk LLD Package */
+var hyplnklldPath = new java.io.File(".//").getPath();
+
+/* This is the part number for which the hyplnk LLD is being created */
+var hyplnklldPartNumber = java.lang.System.getenv("PARTNO");
+
+if(hyplnklldPartNumber == null)
+{
+    hyplnklldPartNumber = "keystone2";
+}
+
+/* Include Path */
+var hyplnklldIncPath = " -i" + hyplnklldPath;
+
+/* Configure the hyplnk LLD Version Information */
+/* 3 steps: remove SPACE and TAB, convert to string and split to make array */
+var hyplnklldReleaseVersion = (""+Pkg.version.replace(/\s/g, "")).split(',');
+
+/* hyplnk LLD Coverity Analysis: Check the environment variable to determine if Static
+ * Analysis has to be done on the driver Code base or not? */
+var hyplnkCoverityAnalysis = java.lang.System.getenv("STATIC_ANALYZE");
+
+/* C66 ELF compiler configuration for Little Endian Mode. */
+var C66LE            = xdc.useModule('ti.targets.elf.C66');
+C66LE.rootDir        = toolsBaseDir;
+C66LE.ccOpts.prefix  = "-mo -o3 -q -k -eo.o";
 if(extDbgFlags)     
-    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.ccOpts.prefix  = "-mo -o3 -q -k -eo.o -DBIGENDIAN";\r
+    C66LE.ccOpts.prefix = C66LE.ccOpts.prefix + " " + extDbgFlags; 
+
+/* C66 ELF compiler configuration for Big Endian Mode. */
+var C66BE          = xdc.useModule('ti.targets.elf.C66_big_endian');
+C66BE.rootDir       = toolsBaseDir;
+C66BE.ccOpts.prefix  = "-mo -o3 -q -k -eo.o -DBIGENDIAN";
 if(extDbgFlags)     
     C66BE.ccOpts.prefix = C66BE.ccOpts.prefix + " " + extDbgFlags;
-\r
-\r
-\r
-/* device name (k2?) is inserted between first an second element of this\r
-   list to construct device file name for each device */\r
-var deviceConstruct = [ "device/", "/src/hyplnk_device.c" ];\r
-\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 disabled as this is device independent lib */\r
-        socDevLib: "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: "true",\r
-        /* Library options */\r
-        copts: " -DDEVICE_K2H -DSOC_K2H",\r
-        /* target list */\r
-        targets: [ C66LE, C66BE ]\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: "true",\r
-        /* Library options */\r
-        copts: " -DDEVICE_K2K -DSOC_K2K",\r
-        /* target list */\r
-        targets: [ C66LE, C66BE ]\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: "true",\r
-        /* Library options */\r
-        copts: " -DDEVICE_K2E -DSOC_K2E",\r
-        /* target list */\r
-        targets: [ C66LE, C66BE ]\r
-    },\r
-    c6678 :\r
-    {\r
-        /* this variable would be reinitialized to true, if XDCARGS contains c6678 */\r
-        build: "false",\r
-        /* SoC lib enabled */\r
-        socDevLib: "true",\r
-        /* Library options */\r
-        copts: " -DSOC_C6678",\r
-        /* target list */\r
-        targets: [ C66LE, C66BE ]\r
-    },\r
-    c6657 :\r
-    {\r
-        /* this variable would be reinitialized to true, if XDCARGS contains c6657 */\r
-        build: "false",\r
-        /* SoC lib enabled */\r
-        socDevLib: "true",\r
-        /* Library options */\r
-        copts: " -DSOC_C6657",\r
-        /* target list */\r
-        targets: [ C66LE, C66BE ]\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
+
+
+
+/* device name (k2?) is inserted between first an second element of this
+   list to construct device file name for each device */
+var deviceConstruct = [ "device/", "/src/hyplnk_device.c" ];
+
+/* Create the SoC List  */
+var socs = { 
+    /* device independent libraries */
+    all :
+    {
+        /* Build this library */
+        build: "true",
+        /* SoC lib disabled as this is device independent lib */
+        socDevLib: "false",
+        /* Library options */
+        copts: "",
+        /* target lists, kept blank now, would be updated based on argument lists */
+        targets: []
+    },
+    k2h :
+    {
+        /* this variable would be reinitialized to true, if XDCARGS contains k2h */
+        build: "false",
+        /* SoC lib enabled */
+        socDevLib: "true",
+        /* Library options */
+        copts: " -DDEVICE_K2H -DSOC_K2H",
+        /* target list */
+        targets: [ C66LE, C66BE ]
+    },
+    k2k :
+    {
+        /* this variable would be reinitialized to true, if XDCARGS contains k2k */
+        build: "false",
+        /* SoC lib enabled */
+        socDevLib: "true",
+        /* Library options */
+        copts: " -DDEVICE_K2K -DSOC_K2K",
+        /* target list */
+        targets: [ C66LE, C66BE ]
+    },
+    k2e :
+    {
+        /* this variable would be reinitialized to true, if XDCARGS contains k2e */
+        build: "false",
+        /* SoC lib enabled */
+        socDevLib: "true",
+        /* Library options */
+        copts: " -DDEVICE_K2E -DSOC_K2E",
+        /* target list */
+        targets: [ C66LE, C66BE ]
+    },
+    c6678 :
+    {
+        /* this variable would be reinitialized to true, if XDCARGS contains c6678 */
+        build: "false",
+        /* SoC lib enabled */
+        socDevLib: "true",
+        /* Library options */
+        copts: " -DSOC_C6678",
+        /* target list */
+        targets: [ C66LE, C66BE ]
+    },
+    c6657 :
+    {
+        /* this variable would be reinitialized to true, if XDCARGS contains c6657 */
+        build: "false",
+        /* SoC lib enabled */
+        socDevLib: "true",
+        /* Library options */
+        copts: " -DSOC_C6657",
+        /* target list */
+        targets: [ C66LE, C66BE ]
+    },
+};
+
+/**************************************************************************
+ * FUNCTION NAME : merge
+ **************************************************************************
+ * DESCRIPTION   :
+ *  The function is used to merge two arrarys
+ **************************************************************************/
+function merge() {
+    var args = arguments;
+    var hash = {};
+    var arr = [];
+    for (var i = 0; i < args.length; i++) {
+       for (var j = 0; j < args[i].length; j++) {
+         if (hash[args[i][j]] !== true) {
+           arr[arr.length] = args[i][j];
+           hash[args[i][j]] = true;
+         }
+       }
+     }
+    return arr;
+}
+
+/* Grab input from XDCARGS */
+var buildArguments  = [];
+
+/* Construct the build arguments */
+for (var tmp=0; arguments[tmp] != undefined; tmp++)
+{
+
+    /* If no arguments are provided, override for building all */
+    if ( ( arguments.length == 1) && (arguments[tmp].equals("./config.bld")) )
+        buildArguments[buildArguments.length++] = "all";
+    else
+        buildArguments[buildArguments.length++] = arguments[tmp];
+}
+
+/* Build targets on this build */
+var build_targets = [];
+var soc_names = Object.keys(socs);
+
+for (var i=0; i < buildArguments.length; i++ ) {
+    /* Build it for all targets */
+    if (buildArguments[i] == "all") {
+        for (var j = 0; j < soc_names.length; j++)  {
+            build_targets = merge (build_targets.slice(0), socs[soc_names[j]].targets.slice(0));
+            /* Set build to "true" for that SoC */
+            socs[soc_names[j]].build = "true";
+        }
+    }
     else {
-        /* 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
+        /* Skip the first argument, which is ./config.bld to get to next SoCs */
+        if (i == 0) continue;          
+        /* Set that build to true if it is found in supported build socs */
+        for (j = 0; j < soc_names.length; j++) {
+            if (buildArguments[i] == soc_names[j]) {
+                socs[buildArguments[i]].build = "true";
+                build_targets = merge (build_targets.slice(0), socs[buildArguments[i]].targets.slice(0));
+                break;
             }
         }
     }   
-}\r
+}
 
 /* Update the Build target generated list */
 socs["all"].targets = build_targets; 
-Build.targets   = build_targets;\r
+Build.targets   = build_targets;

diff --git a/docs/Module.xs b/docs/Module.xs
old mode 100755 (executable)
new mode 100644 (file)
index 1cc47e1..d69fa1c
--- a/docs/Module.xs
+++ b/docs/Module.xs
@@ -30,7 +30,6 @@ function modBuild()
     Pkg.makePrologue += "\t @echo -------------------------------------------------------\n";\r
 \r
     /* Add the documentation file to the package. */\r
-    Pkg.otherFiles[Pkg.otherFiles.length++] = "docs/hyplnkDocs.chm";\r
     Pkg.otherFiles[Pkg.otherFiles.length++] = "docs/tifooter.htm";\r
     Pkg.otherFiles[Pkg.otherFiles.length++] = "docs/tiheader.htm";\r
     Pkg.otherFiles[Pkg.otherFiles.length++] = "docs/tilogo.gif";\r