Merged from master; updated build-related files for dsp build

diff --git a/examples/edma3_driver/evmC66AK2E/maketemp_configuro_cmd_c6xdsp.bat b/examples/edma3_driver/evmC66AK2E/maketemp_configuro_cmd_c6xdsp.bat
deleted file mode 100644 (file)
index 52bce55..0000000
--- a/examples/edma3_driver/evmC66AK2E/maketemp_configuro_cmd_c6xdsp.bat
+++ /dev/null
@@ -1 +0,0 @@
-C:/ti/xdctools_3_25_04_88/xs xdc.tools.configuro --generationOnly -o obj/c66ak2e-evm/c6xdsp/release/edma3_drv_EVMc66ak2e_sample_configuro -t ti.targets.elf.C66 -p ti.platforms.evmC66AK2E -r release -c C:/ti/ccsv5/tools/compiler/c6000_7.4.2 -b C:/data/project/edma3-lld/edma3_lld_development/packages/_config.bld rtsc_config/edma3_drv_bios6_c66ak2e_st_sample.cfg

diff --git a/examples/edma3_driver/evmC66AK2EBE/maketemp_configuro_cmd_c6xdsp.bat b/examples/edma3_driver/evmC66AK2EBE/maketemp_configuro_cmd_c6xdsp.bat
deleted file mode 100644 (file)
index 5815ebf..0000000
--- a/examples/edma3_driver/evmC66AK2EBE/maketemp_configuro_cmd_c6xdsp.bat
+++ /dev/null
@@ -1 +0,0 @@
-C:/ti/xdctools_3_25_04_88/xs xdc.tools.configuro --generationOnly -o obj/c66ak2e-evm/c6xdsp/debug/edma3_drv_EVMc66ak2ebe_sample_configuro -t ti.targets.elf.C66_big_endian -p ti.platforms.evmC66AK2E -r debug -c C:/ti/ccsv5/tools/compiler/c6000_7.4.2 -b C:/data/project/edma3-lld/edma3_lld_development/packages/_config.bld rtsc_config/edma3_drv_bios6_c66ak2ebe_st_sample.cfg

diff --git a/examples/edma3_driver/evmTCI6630K2L/maketemp_configuro_cmd_c6xdsp.bat b/examples/edma3_driver/evmTCI6630K2L/maketemp_configuro_cmd_c6xdsp.bat
deleted file mode 100644 (file)
index 5196eb4..0000000
--- a/examples/edma3_driver/evmTCI6630K2L/maketemp_configuro_cmd_c6xdsp.bat
+++ /dev/null
@@ -1 +0,0 @@
-C:/ti/xdctools_3_25_04_88/xs xdc.tools.configuro --generationOnly -o obj/tci6630k2l-evm/c6xdsp/release/edma3_drv_EVMtci6630k2l_sample_configuro -t ti.targets.elf.C66 -p ti.platforms.evmTCI6630K2L -r release -c C:/ti/ccsv5/tools/compiler/c6000_7.4.2 -b C:/data/project/edma3-lld/edma3_lld_development/packages/_config.bld rtsc_config/edma3_drv_bios6_tci6630k2l_st_sample.cfg

diff --git a/examples/edma3_driver/evmTCI6630K2LBE/maketemp_configuro_cmd_c6xdsp.bat b/examples/edma3_driver/evmTCI6630K2LBE/maketemp_configuro_cmd_c6xdsp.bat
deleted file mode 100644 (file)
index 33cd082..0000000
--- a/examples/edma3_driver/evmTCI6630K2LBE/maketemp_configuro_cmd_c6xdsp.bat
+++ /dev/null
@@ -1 +0,0 @@
-C:/ti/xdctools_3_25_04_88/xs xdc.tools.configuro --generationOnly -o obj/tci6630k2l-evm/c6xdsp/release/edma3_drv_EVMtci6630k2lbe_sample_configuro -t ti.targets.elf.C66_big_endian -p ti.platforms.evmTCI6630K2L -r release -c C:/ti/ccsv5/tools/compiler/c6000_7.4.2 -b C:/data/project/edma3-lld/edma3_lld_development/packages/_config.bld rtsc_config/edma3_drv_bios6_tci6630k2lbe_st_sample.cfg

diff --git a/examples/edma3_driver/evmTCI6636K2H/maketemp_configuro_cmd_c6xdsp.bat b/examples/edma3_driver/evmTCI6636K2H/maketemp_configuro_cmd_c6xdsp.bat
deleted file mode 100644 (file)
index 9442251..0000000
--- a/examples/edma3_driver/evmTCI6636K2H/maketemp_configuro_cmd_c6xdsp.bat
+++ /dev/null
@@ -1 +0,0 @@
-C:/ti/xdctools_3_25_04_88/xs xdc.tools.configuro --generationOnly -o obj/tci6636k2h-evm/c6xdsp/release/edma3_drv_EVMtci6636k2h_sample_configuro -t ti.targets.elf.C66 -p ti.platforms.evmTCI6636K2H -r release -c C:/ti/ccsv5/tools/compiler/c6000_7.4.2 -b C:/data/project/edma3-lld/edma3_lld_development/packages/_config.bld rtsc_config/edma3_drv_bios6_tci6636k2h_st_sample.cfg

diff --git a/makerules/common.mk b/makerules/common.mk
index b710b39e416ae96a3bf884374294968c59547b6e..fed909a7d9bb0d7a955c30251c0502bb4cfc08e4 100755 (executable)
--- a/makerules/common.mk
+++ b/makerules/common.mk
@@ -199,10 +199,14 @@ clean :
 
 # Create dependencies list to ultimately create module archive library file
 ifeq ($(PLATFORM), $(filter $(PLATFORM),tci6636k2h-evm tci6638k2k-evm tci6630k2l-evm c66ak2e-evm))
+ifeq ($(CORE),a15host)
 $(CORE) : $(OBJDIR) $(DEPDIR) $(LIBDIR) $(LIBDIR)/$(MODULE_NAME).$(LIBEXT) $(LIBDIR)/$(MODULE_NAME).$(LIBEXT_SO)
 else
 $(CORE) : $(OBJDIR) $(DEPDIR) $(LIBDIR) $(LIBDIR)/$(MODULE_NAME).$(LIBEXT)
 endif
+else
+$(CORE) : $(OBJDIR) $(DEPDIR) $(LIBDIR) $(LIBDIR)/$(MODULE_NAME).$(LIBEXT)
+endif
 
 else
 # Rules for application; this iteration is for an app

diff --git a/packages/makefile b/packages/makefile
index 2a9da4c79c6c3dae97ffe6e6dfe76c90b945191c..9c0eba9c6af0b7a69029050021d731ac16ee987a 100755 (executable)
--- a/packages/makefile
+++ b/packages/makefile
@@ -2312,7 +2312,7 @@ ifeq ($(FORMAT),ELF)
        $(MAKE) -C $(edma3_lld_rm_PATH) PLATFORM=tci6630k2l-evm CORE=a15host PROFILE_a15host=release
 endif
 
-#To Clean libs For Platform tda2xx-evm Target a15
+#To Clean libs For Platform tci6630k2l-evm Target a15
 edma3_lld_tci6630k2l-evm_a15_libs_clean: edma3_lld_tci6630k2l-evm_a15_libs_drv_clean edma3_lld_tci6630k2l-evm_a15_libs_rm_clean
 edma3_lld_tci6630k2l-evm_a15_libs_drv_clean:
        $(ECHO) \# Cleaning a15:debug:edma3_lld_drv
@@ -2343,7 +2343,7 @@ ifeq ($(FORMAT),ELF)
        $(MAKE) -C $(edma3_lld_rm_PATH) PLATFORM=c66ak2e-evm CORE=a15host PROFILE_a15host=release
 endif
 
-#To Clean libs For Platform tda2xx-evm Target a15
+#To Clean libs For Platform c66ak2e-evm Target a15
 edma3_lld_c66ak2e-evm_a15_libs_clean: edma3_lld_c66ak2e-evm_a15_libs_drv_clean edma3_lld_c66ak2e-evm_a15_libs_rm_clean
 edma3_lld_c66ak2e-evm_a15_libs_drv_clean:
        $(ECHO) \# Cleaning a15:debug:edma3_lld_drv
@@ -2374,7 +2374,7 @@ ifeq ($(FORMAT),ELF)
        $(MAKE) -C $(edma3_lld_rm_PATH) PLATFORM=tci6636k2h-evm CORE=a15host PROFILE_a15host=release
 endif
 
-#To Clean libs For Platform tda2xx-evm Target a15
+#To Clean libs For Platform tci6636k2h-evm Target a15
 edma3_lld_tci6636k2h-evm_a15_libs_clean: edma3_lld_tci6636k2h-evm_a15_libs_drv_clean edma3_lld_tci6636k2h-evm_a15_libs_rm_clean
 edma3_lld_tci6636k2h-evm_a15_libs_drv_clean:
        $(ECHO) \# Cleaning a15:debug:edma3_lld_drv
@@ -2405,7 +2405,7 @@ ifeq ($(FORMAT),ELF)
        $(MAKE) -C $(edma3_lld_rm_PATH) PLATFORM=tci6638k2k-evm CORE=a15host PROFILE_a15host=release
 endif
 
-#To Clean libs For Platform tda2xx-evm Target a15
+#To Clean libs For Platform tci6638k2k-evm Target a15
 edma3_lld_tci6638k2k-evm_a15_libs_clean: edma3_lld_tci6638k2k-evm_a15_libs_drv_clean edma3_lld_tci6638k2k-evm_a15_libs_rm_clean
 edma3_lld_tci6638k2k-evm_a15_libs_drv_clean:
        $(ECHO) \# Cleaning a15:debug:edma3_lld_drv

diff --git a/packages/ti/sdo/edma3/drv/sample/package.bld b/packages/ti/sdo/edma3/drv/sample/package.bld
index 8d120c809b3cc804fe75d6083ce5e625a3d945a3..cc616b843bf9bdf527f65e898a9ab177fd250cbb 100755 (executable)
--- a/packages/ti/sdo/edma3/drv/sample/package.bld
+++ b/packages/ti/sdo/edma3/drv/sample/package.bld
@@ -155,6 +155,20 @@ var objListEVMTCI6636K2H = [
     "src/sample_init.c",
 ];
 
+var objListEVMTCI6630K2L = [
+    "src/platforms/sample_tci6630k2l_cfg.c",
+    "src/platforms/sample_tci6630k2l_int_reg.c",
+    "src/sample_cs.c",
+    "src/sample_init.c",
+];
+
+var objListEVMC66AK2E = [
+    "src/platforms/sample_c66ak2e_cfg.c",
+    "src/platforms/sample_c66ak2e_int_reg.c",
+    "src/sample_cs.c",
+    "src/sample_init.c",
+];
+
 var objListSimTI816X = [
     "src/platforms/sample_ti816x_cfg.c",
     "src/platforms/sample_ti816x_int_reg.c",
@@ -214,6 +228,10 @@ var chipdefines = [
                     'CHIP_TCI6638K2K',
                     'CHIP_TCI6636K2H',
                     'CHIP_TCI6636K2H',
+                    'CHIP_TCI6630K2L',
+                    'CHIP_TCI6630K2L',
+                    'CHIP_C66AK2E',
+                    'CHIP_C66AK2E',
                     'CHIP_C6748',
                     'CHIP_OMAPL138',
                     'CHIP_OMAPL138',
@@ -299,6 +317,18 @@ var plat_supported = [
                         {
                             platform: 'ti.platforms.evmTCI6636K2H', targ : 'C66_big_endian',objList: objListEVMTCI6636K2H, dir : 'tci6636k2h-evm/66'
                         },
+                        {
+                            platform: 'ti.platforms.evmTCI6630K2L', targ : 'C66',objList: objListEVMTCI6630K2L, dir : 'tci6630k2l-evm/66'
+                        },
+                        {
+                            platform: 'ti.platforms.evmTCI6630K2L', targ : 'C66_big_endian',objList: objListEVMTCI6630K2L, dir : 'tci6630k2l-evm/66'
+                        },
+                        {
+                            platform: 'ti.platforms.evmC66AK2E', targ : 'C66',objList: objListEVMC66AK2E, dir : 'c66ak2e-evm/66'
+                        },
+                        {
+                            platform: 'ti.platforms.evmC66AK2E', targ : 'C66_big_endian',objList: objListEVMC66AK2E, dir : 'c66ak2e-evm/66'
+                        },
                         {
                             platform: 'ti.platforms.evm6748',    targ : 'C674', objList: objListC6748, dir : 'c6748-evm/674/'
                         },

diff --git a/packages/ti/sdo/edma3/rm/package.bld b/packages/ti/sdo/edma3/rm/package.bld
index 654d4118c488e45f663c8706184f89042374a740..e3f6e584a539d772728d120b64315e085725acfa 100755 (executable)
--- a/packages/ti/sdo/edma3/rm/package.bld
+++ b/packages/ti/sdo/edma3/rm/package.bld
@@ -172,7 +172,7 @@ var objListEVMTCI6630K2L = [
     /* File defining internal data structures. */
     "src/edma3_rm_gbl_data.c",
 ];
-var objListEVM66AK2E = [
+var objListEVMC66AK2E = [
     /* The configuration file. */
     "src/configs/edma3_c66ak2e_cfg.c",
     /* Common file. */
@@ -319,10 +319,10 @@ var plat_supported = [
                             platform: 'ti.platforms.evmTCI6630K2L', targ : 'C66_big_endian',objList: objListEVMTCI6630K2L, dir : 'tci6630k2l-evm/66/'
                         },
                         {
-                            platform: 'ti.platforms.evm66ak2e', targ : 'C66',objList: objListEVM66AK2E, dir : 'c66ak2e-evm/66/'
+                            platform: 'ti.platforms.evmC66AK2E', targ : 'C66',objList: objListEVMC66AK2E, dir : 'c66ak2e-evm/66/'
                         },
                         {
-                            platform: 'ti.platforms.evm66ak2e', targ : 'C66_big_endian',objList: objListEVM66AK2E, dir : 'c66ak2e-evm/66/'
+                            platform: 'ti.platforms.evmC66AK2E', targ : 'C66_big_endian',objList: objListEVMC66AK2E, dir : 'c66ak2e-evm/66/'
                         },
                         {
                             platform: 'ti.platforms.evm6748',    targ : 'C674', objList: objListC6748, dir : 'c6748-evm/674/'