PRSDK-8493: Fix the Am64x XDC packaging for remaining modules

Signed-off-by: Sivaraj R <sivaraj@ti.com>

diff --git a/packages/ti/drv/gpio/package.xs b/packages/ti/drv/gpio/package.xs
index 7ce3be1888f04fed6aa48c04fef5449e1b778ee1..51ecfe3fa042ea36f26d366b203b4535934d60b3 100644 (file)
--- a/packages/ti/drv/gpio/package.xs
+++ b/packages/ti/drv/gpio/package.xs
@@ -1,138 +1,139 @@
-/*\r
- *  ======== package.xs ========\r
- *\r
- */\r
-\r
-\r
-/*\r
- *  ======== Package.getLibs ========\r
- *  This function is called when a program's configuration files are\r
- *  being generated and it returns the name of a library appropriate\r
- *  for the program's configuration.\r
- */\r
-\r
-function getLibs(prog)\r
-{\r
-    var suffix = prog.build.target.suffix;\r
-    var name = "";\r
-    var socType = this.Settings.socType;\r
-    var profilingTag = "";\r
-\r
-    socType = socType.toLowerCase();\r
-    /* Replace the last charecter in SoC am#### to am###x */\r
-    if (socType.substring(0, 2) == "am")\r
-    {\r
-        socType = socType.substring(0, socType.length - 1);\r
-        socType = socType.concat("x");\r
-    }\r
-\r
-    if (this.Settings.enableProfiling == true)\r
-    {\r
-        profilingTag = ".profiling"\r
-    }\r
-    name = this.$name + profilingTag + ".a" + suffix;\r
-    \r
-    /* Read LIBDIR variable */\r
-    var lib = java.lang.System.getenv("LIBDIR");\r
-\r
-    /* If NULL, default to "lib" folder */\r
-    if (lib == null)\r
-    {\r
-        lib = "./lib";\r
-    } else {\r
-        print ("\tSystem environment LIBDIR variable defined : " + lib);\r
-    }\r
-       \r
-    var socTypes = [ \r
-                     'am571x',\r
-                     'am572x',\r
-                     'am574x',\r
-                     'am335x',\r
-                     'am437x',\r
-                     'dra72x',\r
-                     'dra75x',\r
-                     'dra78x',\r
-                     'k2h',\r
-                     'k2k',\r
-                     'k2e',\r
-                     'k2l',\r
-                     'k2g',\r
-                     'omapl137',\r
-                     'omapl138',\r
-                     'c6678',\r
-                     'c6657',\r
-                     'c6747',\r
-                     'am65xx',\r
-                     'j721e',\r
-                     'j7200'\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 + profilingTag + ".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('674') )\r
-        lib = lib + "/c674";\r
-    else if (java.lang.String(suffix).contains('a15') )\r
-        lib = lib + "/a15";\r
-    else if (java.lang.String(suffix).contains('m4') )\r
-        lib = lib + "/m4";\r
-    else if (java.lang.String(suffix).contains('a9') )\r
-        lib = lib + "/a9";\r
-    else if (java.lang.String(suffix).contains('a8') )\r
-        lib = lib + "/a8";        \r
-    else if (java.lang.String(suffix).contains('e9') )\r
-        lib = lib + "/arm9";\r
-    else if (java.lang.String(suffix).contains('a53'))\r
-           lib = lib + "/a53";\r
-       else if (java.lang.String(suffix).contains('r5f'))\r
-           lib = lib + "/r5f";\r
-    else\r
-        throw new Error("\tUnknown target for: " + this.packageBase + lib);\r
-\r
-    var libProfiles = ["debug", "release"];\r
-    /* get the configured library profile */\r
-    for each(var profile in libProfiles)\r
-    {\r
-        if (this.Settings.libProfile.equals(profile))\r
-        {\r
-            lib = lib + "/" + profile;\r
-            break;\r
-        }\r
-    }  \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
-    /* Could not find any library, throw exception */\r
-    throw new Error("\tLibrary not found: " + this.packageBase + lib);\r
-}\r
-\r
-function init() {\r
-xdc.loadPackage("ti.osal");\r
-xdc.loadPackage("ti.csl");\r
-}\r
-\r
-/*\r
- *  ======== package.close ========\r
- */\r
-function close()\r
-{    \r
-    if (xdc.om.$name != 'cfg') {\r
-        return;\r
-    }\r
-}\r
+/*
+ *  ======== package.xs ========
+ *
+ */
+
+
+/*
+ *  ======== Package.getLibs ========
+ *  This function is called when a program's configuration files are
+ *  being generated and it returns the name of a library appropriate
+ *  for the program's configuration.
+ */
+
+function getLibs(prog)
+{
+    var suffix = prog.build.target.suffix;
+    var name = "";
+    var socType = this.Settings.socType;
+    var profilingTag = "";
+
+    socType = socType.toLowerCase();
+    /* Replace the last charecter in SoC am#### to am###x */
+    if (socType.substring(0, 2) == "am")
+    {
+        socType = socType.substring(0, socType.length - 1);
+        socType = socType.concat("x");
+    }
+
+    if (this.Settings.enableProfiling == true)
+    {
+        profilingTag = ".profiling"
+    }
+    name = this.$name + profilingTag + ".a" + suffix;
+
+    /* Read LIBDIR variable */
+    var lib = java.lang.System.getenv("LIBDIR");
+
+    /* If NULL, default to "lib" folder */
+    if (lib == null)
+    {
+        lib = "./lib";
+    } else {
+        print ("\tSystem environment LIBDIR variable defined : " + lib);
+    }
+
+    var socTypes = [
+                     'am571x',
+                     'am572x',
+                     'am574x',
+                     'am335x',
+                     'am437x',
+                     'dra72x',
+                     'dra75x',
+                     'dra78x',
+                     'k2h',
+                     'k2k',
+                     'k2e',
+                     'k2l',
+                     'k2g',
+                     'omapl137',
+                     'omapl138',
+                     'c6678',
+                     'c6657',
+                     'c6747',
+                     'am65xx',
+                     'j721e',
+                     'j7200',
+                     'am64x',
+                   ];
+
+    /* Get the SOC */
+    for each (var soc in socTypes)
+    {
+        if (socType.equals(soc))
+        {
+            lib = lib + "/" + soc;
+            name = this.$name + profilingTag + ".a" + suffix;
+            break;
+        }
+    }
+
+    /* Get target folder, if applicable */
+    if ( java.lang.String(suffix).contains('66') )
+        lib = lib + "/c66";
+    else if (java.lang.String(suffix).contains('674') )
+        lib = lib + "/c674";
+    else if (java.lang.String(suffix).contains('a15') )
+        lib = lib + "/a15";
+    else if (java.lang.String(suffix).contains('m4') )
+        lib = lib + "/m4";
+    else if (java.lang.String(suffix).contains('a9') )
+        lib = lib + "/a9";
+    else if (java.lang.String(suffix).contains('a8') )
+        lib = lib + "/a8";
+    else if (java.lang.String(suffix).contains('e9') )
+        lib = lib + "/arm9";
+    else if (java.lang.String(suffix).contains('a53'))
+           lib = lib + "/a53";
+       else if (java.lang.String(suffix).contains('r5f'))
+           lib = lib + "/r5f";
+    else
+        throw new Error("\tUnknown target for: " + this.packageBase + lib);
+
+    var libProfiles = ["debug", "release"];
+    /* get the configured library profile */
+    for each(var profile in libProfiles)
+    {
+        if (this.Settings.libProfile.equals(profile))
+        {
+            lib = lib + "/" + profile;
+            break;
+        }
+    }
+
+    /* Get library name with path */
+    lib = lib + "/" + name;
+    if (java.io.File(this.packageBase + lib).exists()) {
+       print ("\tLinking with library " + this.$name + ":" + lib);
+       return lib;
+    }
+
+    /* Could not find any library, throw exception */
+    throw new Error("\tLibrary not found: " + this.packageBase + lib);
+}
+
+function init() {
+xdc.loadPackage("ti.osal");
+xdc.loadPackage("ti.csl");
+}
+
+/*
+ *  ======== package.close ========
+ */
+function close()
+{
+    if (xdc.om.$name != 'cfg') {
+        return;
+    }
+}

diff --git a/packages/ti/drv/icss_emac/package.xs b/packages/ti/drv/icss_emac/package.xs
index 0217c0855864086e6306c3b4663957982d04028b..2cf31747a34be2ebd4b1601da3c1de9b194e0f9f 100644 (file)
--- a/packages/ti/drv/icss_emac/package.xs
+++ b/packages/ti/drv/icss_emac/package.xs
@@ -31,7 +31,7 @@ function getLibs(prog)
         profilingTag = ".profiling"
     }
     name = this.$name + profilingTag + ".a" + suffix;
-    
+
     /* Read LIBDIR variable */
     var lib = java.lang.System.getenv("LIBDIR");
 
@@ -42,15 +42,16 @@ function getLibs(prog)
     } else {
         print ("\tSystem environment LIBDIR variable defined : " + lib);
     }
-       
-    var socTypes = [ 
+
+    var socTypes = [
                      'am571x',
                      'am572x',
                      'am574x',
                      'am335x',
                      'am437x',
                      'k2g',
-                     'am65xx'
+                     'am65xx',
+                     'am64x',
                    ];
 
     /* Get the SOC */
@@ -59,7 +60,7 @@ function getLibs(prog)
         if (socType.equals(soc))
         {
             lib = lib + "/" + soc;
-            name = this.$name + profilingTag + ".a" + suffix;   
+            name = this.$name + profilingTag + ".a" + suffix;
             break;
         }
     }
@@ -74,14 +75,14 @@ function getLibs(prog)
     else if (java.lang.String(suffix).contains('a9') )
         lib = lib + "/a9";
     else if (java.lang.String(suffix).contains('a8') )
-        lib = lib + "/a8";        
+        lib = lib + "/a8";
     else if (java.lang.String(suffix).contains('a53') )
         lib = lib + "/a53";
     else if (java.lang.String(suffix).contains('r5f') )
         lib = lib + "/r5f";
     else
         throw new Error("\tUnknown target for: " + this.packageBase + lib);
-    
+
     var libProfiles = ["debug", "release"];
     /* get the configured library profile */
     for each(var profile in libProfiles)
@@ -91,7 +92,7 @@ function getLibs(prog)
             lib = lib + "/" + profile;
             break;
         }
-    }  
+    }
 
     /* Get library name with path */
     lib = lib + "/" + name;
@@ -113,7 +114,7 @@ xdc.loadPackage("ti.csl");
  *  ======== package.close ========
  */
 function close()
-{    
+{
     if (xdc.om.$name != 'cfg') {
         return;
     }

diff --git a/packages/ti/drv/uart/package.xs b/packages/ti/drv/uart/package.xs
index 26c5ed91dcf08c269dae5aa144c6d22980f7deff..9a9b8a195c759a5b48265ce10320a089187cc879 100644 (file)
--- a/packages/ti/drv/uart/package.xs
+++ b/packages/ti/drv/uart/package.xs
@@ -66,7 +66,7 @@ function getLibs(prog)
                      'c6657',
                      'C6747',
                      'am65xx',
-                     'j721e', 
+                     'j721e',
                      'j7200',
                      'am64x',
                    ];
@@ -155,14 +155,14 @@ function close()
         socType = socType.concat("x");
     }
     print ("\t SoC Type is " + socType );
-    
+
     /* Append list for SoC which depend on PRUSS. */
     /* This is for PRU UART firmware. */
     /* Add entry in this array for newly supported SoCs. */
     var prussDepSocTypes = [
                         'am335x'
                       ];
-    
+
     if (this.Settings.enableSwIp == true)
     {
         for each(var soc in prussDepSocTypes)