PRSDK-4138: resolve CCS project build issue for VPS projets

Signed-off-by: Aravind Batni <aravindbr@ti.com>

diff --git a/examples/ccsprojects/am574x/armv7/bios/vps_arm_idkAM574x.cfg b/examples/ccsprojects/am574x/armv7/bios/vps_arm_idkAM574x.cfg
index 4e877d3f2b545ec7d866bf46c89b0473cf9ae06b..37502a2c4202ceac13b8b11554aba774a7f58cbf 100644 (file)
--- a/examples/ccsprojects/am574x/armv7/bios/vps_arm_idkAM574x.cfg
+++ b/examples/ccsprojects/am574x/armv7/bios/vps_arm_idkAM574x.cfg
@@ -32,6 +32,11 @@
 
 xdc.loadCapsule("../../../../utility/BIOS_common_a15.cfg");
 
+/* ================ Driver configuration ================ */
+
+var Edma               = xdc.loadPackage ("ti.sdo.edma3.drv.sample");
+var drv                        = xdc.loadPackage ("ti.sdo.edma3.drv");
+var rm                 = xdc.loadPackage ("ti.sdo.edma3.rm");
 /* Building the executables for the platform */
 
 var boardName = "idkAM574x";
@@ -41,6 +46,14 @@ var socType   = "am574x";
 var osType = "tirtos"
 var Osal = xdc.useModule('ti.osal.Settings');
 Osal.osType = osType;
+Osal.socType = socType;
+
+/* Load the MMCSD package */
+var Mmcsd = xdc.loadPackage('ti.drv.mmcsd');
+Mmcsd.Settings.socType = socType;
+Mmcsd.Settings.useDma = "false";
+
+var Fatfs = xdc.loadPackage('ti.fs.fatfs');
 
 /*use CSL package*/
 var Csl = xdc.loadPackage('ti.csl');

diff --git a/examples/ccsprojects/am574x/c66/bios/vps_c66_idkAM574x.cfg b/examples/ccsprojects/am574x/c66/bios/vps_c66_idkAM574x.cfg
index 412ed63fa038f492b4c3af2e22ef6ca2412e3cc1..e37bae6c93bf8991e650fcd38c324fe61da5c9fb 100644 (file)
--- a/examples/ccsprojects/am574x/c66/bios/vps_c66_idkAM574x.cfg
+++ b/examples/ccsprojects/am574x/c66/bios/vps_c66_idkAM574x.cfg
@@ -32,6 +32,12 @@
 
 xdc.loadCapsule("../../../../utility/BIOS_common_c66.cfg");
 
+/* ================ Driver configuration ================ */
+
+var Edma               = xdc.loadPackage ("ti.sdo.edma3.drv.sample");
+var drv                        = xdc.loadPackage ("ti.sdo.edma3.drv");
+var rm                 = xdc.loadPackage ("ti.sdo.edma3.rm");
+
 /* Building the executables for the platform */
 var boardName = "idkAM574x";
 var socType   = "am574x";
@@ -40,6 +46,13 @@ var socType   = "am574x";
 var osType = "tirtos"
 var Osal = xdc.useModule('ti.osal.Settings');
 Osal.osType = osType;
+Osal.socType = socType;
+
+/* Load the MMCSD package */
+var Mmcsd = xdc.loadPackage('ti.drv.mmcsd');
+Mmcsd.Settings.socType = socType;
+Mmcsd.Settings.useDma = "false";
+var Fatfs = xdc.loadPackage('ti.fs.fatfs');
 
 /*use CSL package*/
 var Csl = xdc.loadPackage('ti.csl');

diff --git a/examples/ccsprojects/am574x/m4/bios/vps_m4_idkAM574x.cfg b/examples/ccsprojects/am574x/m4/bios/vps_m4_idkAM574x.cfg
index 0f1555ca8c79edca7d4f80735ceb5456f51bdc93..fb3562b38b0af73797f2a010fac91ae3cbb4c9f0 100644 (file)
--- a/examples/ccsprojects/am574x/m4/bios/vps_m4_idkAM574x.cfg
+++ b/examples/ccsprojects/am574x/m4/bios/vps_m4_idkAM574x.cfg
@@ -32,6 +32,12 @@
 
 xdc.loadCapsule("../../../../utility/BIOS_common_m4.cfg");
 
+/* ================ Driver configuration ================ */
+
+var Edma               = xdc.loadPackage ("ti.sdo.edma3.drv.sample");
+var drv                        = xdc.loadPackage ("ti.sdo.edma3.drv");
+var rm                 = xdc.loadPackage ("ti.sdo.edma3.rm");
+
 /* Building the executables for the platform */
 var boardName = "idkAM574x";
 var socType   = "am574x";
@@ -40,6 +46,13 @@ var socType   = "am574x";
 var osType = "tirtos"
 var Osal = xdc.useModule('ti.osal.Settings');
 Osal.osType = osType;
+Osal.socType = socType;
+
+/* Load the MMCSD package */
+var Mmcsd = xdc.loadPackage('ti.drv.mmcsd');
+Mmcsd.Settings.socType = socType;
+Mmcsd.Settings.useDma = "false";
+var Fatfs = xdc.loadPackage('ti.fs.fatfs');
 
 /*use CSL package*/
 var Csl = xdc.loadPackage('ti.csl');

diff --git a/examples/ccsprojects/common/bios/utils/bspCommonBIOS_a15.cfg b/examples/ccsprojects/common/bios/utils/bspCommonBIOS_a15.cfg
index a28e981c976675947f766060e8e75d9212d9bb2e..89d04266865d63b2b34b59a31e835b0c57802b9a 100644 (file)
--- a/examples/ccsprojects/common/bios/utils/bspCommonBIOS_a15.cfg
+++ b/examples/ccsprojects/common/bios/utils/bspCommonBIOS_a15.cfg
@@ -1,5 +1,5 @@
 /* =============================================================================
- *   Copyright (c) Texas Instruments Incorporated 2016
+ *   Copyright (c) Texas Instruments Incorporated 2016-2018
  *
  *  Redistribution and use in source and binary forms, with or without
  *  modification, are permitted provided that the following conditions
@@ -32,6 +32,8 @@
 
 xdc.loadCapsule("../../../../utility/BIOS_common_a15.cfg");
 
+/* ================ Driver configuration ================ */
+
 /* Building the executables for the platform */
 var RTSCPlatformName = Program.platformName;
 var boardName;
@@ -59,11 +61,19 @@ else
 var osType = "tirtos"
 var Osal = xdc.useModule('ti.osal.Settings');
 Osal.osType = osType;
+Osal.socType = socType;
 
 /*use CSL package*/
 var Csl = xdc.loadPackage('ti.csl');
 Csl.Settings.deviceType = socType;
 
+/* Load the MMCSD package */
+var Mmcsd = xdc.loadPackage('ti.drv.mmcsd');
+Mmcsd.Settings.socType = socType;
+Mmcsd.Settings.useDma = "false";
+
+var Fatfs = xdc.loadPackage('ti.fs.fatfs');
+
 /* Load the uart package */
 var Uart = xdc.loadPackage('ti.drv.uart');
 Uart.Settings.socType = socType;
@@ -84,6 +94,10 @@ var Board = xdc.loadPackage('ti.board');
 Board.Settings.boardName  = boardName;
 Board.Settings.libProfile = "release";
 
+var drv                        = xdc.loadPackage ("ti.sdo.edma3.drv");
+var rm                 = xdc.loadPackage ("ti.sdo.edma3.rm");
+var Edma               = xdc.loadPackage ("ti.sdo.edma3.drv.sample");
+
 /* Use the VPS module */
 var vps = xdc.loadPackage ('ti.drv.vps');
 vps.Settings.socType    = socType;

diff --git a/examples/ccsprojects/common/bios/utils/bspCommonBIOS_c66.cfg b/examples/ccsprojects/common/bios/utils/bspCommonBIOS_c66.cfg
index 90649850514e027c6aed46bca772643e76bc81be..5b0364f8bb85d16c9ae445935520a6884726b382 100644 (file)
--- a/examples/ccsprojects/common/bios/utils/bspCommonBIOS_c66.cfg
+++ b/examples/ccsprojects/common/bios/utils/bspCommonBIOS_c66.cfg
@@ -1,5 +1,5 @@
 /* =============================================================================
- *   Copyright (c) Texas Instruments Incorporated 2016
+ *   Copyright (c) Texas Instruments Incorporated 2016-2018
  *
  *  Redistribution and use in source and binary forms, with or without
  *  modification, are permitted provided that the following conditions
@@ -32,6 +32,12 @@
 
 xdc.loadCapsule("../../../../utility/BIOS_common_c66.cfg");
 
+/* ================ Driver configuration ================ */
+
+var Edma               = xdc.loadPackage ("ti.sdo.edma3.drv.sample");
+var drv                        = xdc.loadPackage ("ti.sdo.edma3.drv");
+var rm                 = xdc.loadPackage ("ti.sdo.edma3.rm");
+
 /* Building the executables for the platform */
 var RTSCPlatformName = Program.platformName;
 var boardName;
@@ -63,6 +69,13 @@ else
 var osType = "tirtos"
 var Osal = xdc.useModule('ti.osal.Settings');
 Osal.osType = osType;
+Osal.socType = socType;
+
+/* Load the MMCSD package */
+var Mmcsd = xdc.loadPackage('ti.drv.mmcsd');
+Mmcsd.Settings.socType = socType;
+Mmcsd.Settings.useDma = "false";
+var Fatfs = xdc.loadPackage('ti.fs.fatfs');
 
 /*use CSL package*/
 var Csl = xdc.loadPackage('ti.csl');

diff --git a/examples/ccsprojects/common/bios/utils/bspCommonBIOS_m4.cfg b/examples/ccsprojects/common/bios/utils/bspCommonBIOS_m4.cfg
index 6a8a0671671a439facd24313640b7ebaecf6df61..7cc6d2fda532673e297f38c95042f9edca92a9e8 100644 (file)
--- a/examples/ccsprojects/common/bios/utils/bspCommonBIOS_m4.cfg
+++ b/examples/ccsprojects/common/bios/utils/bspCommonBIOS_m4.cfg
@@ -1,5 +1,5 @@
 /* =============================================================================
- *   Copyright (c) Texas Instruments Incorporated 2016
+ *   Copyright (c) Texas Instruments Incorporated 2016-2018
  *
  *  Redistribution and use in source and binary forms, with or without
  *  modification, are permitted provided that the following conditions
@@ -32,6 +32,12 @@
 
 xdc.loadCapsule("../../../../utility/BIOS_common_m4.cfg");
 
+/* ================ Driver configuration ================ */
+
+var Edma               = xdc.loadPackage ("ti.sdo.edma3.drv.sample");
+var drv                        = xdc.loadPackage ("ti.sdo.edma3.drv");
+var rm                 = xdc.loadPackage ("ti.sdo.edma3.rm");
+
 /* Building the executables for the platform */
 var RTSCPlatformName = Program.platformName;
 var boardName;
@@ -59,6 +65,14 @@ else
 var osType = "tirtos"
 var Osal = xdc.useModule('ti.osal.Settings');
 Osal.osType = osType;
+Osal.socType = socType;
+
+/* Load the MMCSD package */
+var Mmcsd = xdc.loadPackage('ti.drv.mmcsd');
+Mmcsd.Settings.socType = socType;
+Mmcsd.Settings.useDma = "false";
+
+var Fatfs = xdc.loadPackage('ti.fs.fatfs');
 
 /*use CSL package*/
 var Csl = xdc.loadPackage('ti.csl');

diff --git a/examples/utility/src/bsputils_app.c b/examples/utility/src/bsputils_app.c
index 7b0bf0960f10fbb5b2a3a66654746da107bce875..50b99b69583f5c86dda46317bead0ed3f87cd75e 100644 (file)
--- a/examples/utility/src/bsputils_app.c
+++ b/examples/utility/src/bsputils_app.c
@@ -83,6 +83,7 @@
 #include <ti/sdo/edma3/drv/edma3_drv.h>
 #include <ti/sdo/edma3/rm/edma3_rm.h>
 #include <ti/sdo/edma3/drv/sample/bios6_edma3_drv_sample.h>
+EDMA3_DRV_Handle edma3init(UInt32 edma3Id, EDMA3_DRV_Result *);
 #endif
 #else
 #include <ti/drv/stw_lld/fatlib/hsmmcsd_API.h>
@@ -497,11 +498,9 @@ Int32 BspUtils_appDefaultInit(UInt32 isI2cInitReq)
     MMCSD_init();
 #if defined(BARE_METAL)
     retVal += BspUtils_initFileio(NULL);
-    GT_0trace(BspAppTrace, GT_ERR, "Error: init File IO complete for Bare Metal cases!!\r\n");
 #else
     gBspUtilsAppObj.hEdma = edma3init(0, &edmaResult);
     retVal += BspUtils_initFileio(gBspUtilsAppObj.hEdma);
-    GT_0trace(BspAppTrace, GT_ERR, "Error: init File IO complete for Sys Bios cases!!\r\n");
 #endif
     if (BSP_SOK != retVal)
     {

diff --git a/package.xdc b/package.xdc
index 622c0b970ddf923c97e06caa2edb74223fd61c0c..41c41f559b1663eb75a0795afcc810598c260efb 100644 (file)
--- a/package.xdc
+++ b/package.xdc
@@ -8,7 +8,7 @@
  *
  * Copyright (C) 2016-2018, Texas Instruments, Inc.
  *****************************************************************************/
-package ti.drv.vps[1, 0, 1, 9] {
+package ti.drv.vps[1, 0, 1, 10] {
     module Settings;
 }
 

diff --git a/package.xs b/package.xs
index 243a4cbf76a9ecd70e7db0af91c45cc42b0148a5..3817825e52006ef33d26aae9411f9da10b16f6c4 100644 (file)
--- a/package.xs
+++ b/package.xs
@@ -106,6 +106,10 @@ function getLibs(prog)
     return lib;
 }
 
+function init() {
+    xdc.loadPackage("ti.sdo.edma3.drv.sample");
+}
+
 /*
  *  ======== package.close ========
  */

diff --git a/vpsver.h b/vpsver.h
index f9c65a1a5ba97a2c5877f5b7104f0b6398358798..70cf2da98e79f6a208ebc40dc13c82cd846a349b 100644 (file)
--- a/vpsver.h
+++ b/vpsver.h
@@ -14,7 +14,7 @@ extern "C" {
  *   @brief  VPS Driver Version Definitions
  *
  *  ============================================================
- *  Copyright (c) Texas Instruments Incorporated 2016
+ *  Copyright (c) Texas Instruments Incorporated 2016-2018
  *
  *  Redistribution and use in source and binary forms, with or without
  *  modification, are permitted provided that the following conditions
@@ -51,13 +51,13 @@ extern "C" {
  * format:
  *  0xAABBCCDD -> Arch (AA); API Changes (BB); Major (CC); Minor (DD)
  */
-#define VPS_DRV_VERSION_ID                     (0x01000109)
+#define VPS_DRV_VERSION_ID                     (0x0100010A)
 
 /**
  * @brief   This is the version string which describes the VPS driver along with the
  * date and build information.
  */
-#define VPS_DRV_VERSION_STR                    "VPS Driver Revision: 01.00.01.09"
+#define VPS_DRV_VERSION_STR                    "VPS Driver Revision: 01.00.01.10"
 
 
 #ifdef __cplusplus

diff --git a/vpsver.h.xdt b/vpsver.h.xdt
index 58437fe408dabda89e1b9c53e47523b32bd59aca..82e99087bb787d8345b807539e508308143fcc69 100644 (file)
--- a/vpsver.h.xdt
+++ b/vpsver.h.xdt
@@ -46,7 +46,7 @@ extern "C" {
  *   @brief  VPS Driver Version Definitions
  *
  *  ============================================================
- *  Copyright (c) Texas Instruments Incorporated 2016
+ *  Copyright (c) Texas Instruments Incorporated 2016-2018
  *
  *  Redistribution and use in source and binary forms, with or without
  *  modification, are permitted provided that the following conditions