Change required for moving to new BIOS version

Changed the IntXbar module header include path
Build M4 with Configuro in debug and release insted of whole_program

Signed-off-by: Prasad Konnur <prasadkonnur@ti.com>

diff --git a/examples/edma3_driver/evmtda2xx/rtsc_config/edma3_drv_bios6_tda2xx_st_sample.cfg b/examples/edma3_driver/evmtda2xx/rtsc_config/edma3_drv_bios6_tda2xx_st_sample.cfg
index 42be85cae6952d4be81564e631ced0d1198ec140..68d843e96dfa9da3ae66d872b845435ce898f3a5 100644 (file)
--- a/examples/edma3_driver/evmtda2xx/rtsc_config/edma3_drv_bios6_tda2xx_st_sample.cfg
+++ b/examples/edma3_driver/evmtda2xx/rtsc_config/edma3_drv_bios6_tda2xx_st_sample.cfg
@@ -9,6 +9,7 @@ var Log       = xdc.useModule ("xdc.runtime.Log");
 var Hwi = xdc.useModule('ti.sysbios.hal.Hwi');
 var Semaphore = xdc.useModule('ti.sysbios.knl.Semaphore');
 var Cache = xdc.useModule('ti.sysbios.hal.Cache');
+var InitXbar    = xdc.useModule("ti.sysbios.family.shared.vayu.IntXbar");
 
 ECM.eventGroupHwiNum[0] = 7;
 ECM.eventGroupHwiNum[1] = 8;

diff --git a/examples/edma3_driver/evmtda2xx_A15/rtsc_config/edma3_drv_bios6_tda2xx_a15_st_sample.cfg b/examples/edma3_driver/evmtda2xx_A15/rtsc_config/edma3_drv_bios6_tda2xx_a15_st_sample.cfg
index f5eb28c951ed0f2f18c8d85385a461c8ce3383c7..ca2d40bc2b03fd210d5d977b80604ca05604cf2d 100644 (file)
--- a/examples/edma3_driver/evmtda2xx_A15/rtsc_config/edma3_drv_bios6_tda2xx_a15_st_sample.cfg
+++ b/examples/edma3_driver/evmtda2xx_A15/rtsc_config/edma3_drv_bios6_tda2xx_a15_st_sample.cfg
@@ -27,8 +27,8 @@ Program.sectMap[".cio"].loadSegment = "EXT_RAM";
 \r
 var Cache1  = xdc.useModule('ti.sysbios.family.arm.a15.Cache');\r
 var Mmu    = xdc.useModule('ti.sysbios.family.arm.a15.Mmu');\r
-var InitXbar = xdc.useModule('ti.sysbios.hal.vayu.IntXbar');\r
-\r
+var InitXbar    = xdc.useModule("ti.sysbios.family.shared.vayu.IntXbar");\r
+var GnuSupport = xdc.useModule('ti.sysbios.rts.gnu.SemiHostSupport');\r
 \r
 /* Enable the cache                                                           */\r
 Cache1.enableCache = false;\r

diff --git a/examples/edma3_driver/evmtda2xx_M4/rtsc_config/edma3_drv_bios6_tda2xx_m4_c0_st_sample.cfg b/examples/edma3_driver/evmtda2xx_M4/rtsc_config/edma3_drv_bios6_tda2xx_m4_c0_st_sample.cfg
index 215f348ed281e9e2865b806045ba7c662ee15a3a..3042cb992019e8a8f6cb4f4076046527d60d120a 100644 (file)
--- a/examples/edma3_driver/evmtda2xx_M4/rtsc_config/edma3_drv_bios6_tda2xx_m4_c0_st_sample.cfg
+++ b/examples/edma3_driver/evmtda2xx_M4/rtsc_config/edma3_drv_bios6_tda2xx_m4_c0_st_sample.cfg
@@ -10,7 +10,7 @@ var Cache0 = xdc.useModule('ti.sysbios.hal.Cache');
 var Error = xdc.useModule('xdc.runtime.Error');
 var HwiM3       = xdc.useModule('ti.sysbios.family.arm.m3.Hwi');
 var Program     = xdc.useModule("xdc.cfg.Program");
-var InitXbar    = xdc.useModule("ti.sysbios.hal.vayu.IntXbar");
+var InitXbar    = xdc.useModule("ti.sysbios.family.shared.vayu.IntXbar");
 
 /* ISR/SWI stack        */
 Program.stack           = 0x4000;

diff --git a/examples/edma3_driver/evmtda2xx_M4/rtsc_config/edma3_drv_bios6_tda2xx_m4_c1_st_sample.cfg b/examples/edma3_driver/evmtda2xx_M4/rtsc_config/edma3_drv_bios6_tda2xx_m4_c1_st_sample.cfg
index 7781ebcacb0625ac5f6277a5f3a89934e0e3f29c..34b11d0f8fc99346116b172b7eb0a71fe4d243fc 100644 (file)
--- a/examples/edma3_driver/evmtda2xx_M4/rtsc_config/edma3_drv_bios6_tda2xx_m4_c1_st_sample.cfg
+++ b/examples/edma3_driver/evmtda2xx_M4/rtsc_config/edma3_drv_bios6_tda2xx_m4_c1_st_sample.cfg
@@ -10,7 +10,7 @@ var Cache0 = xdc.useModule('ti.sysbios.hal.Cache');
 var Error = xdc.useModule('xdc.runtime.Error');
 var HwiM3       = xdc.useModule('ti.sysbios.family.arm.m3.Hwi');
 var Program     = xdc.useModule("xdc.cfg.Program");
-var InitXbar    = xdc.useModule("ti.sysbios.hal.vayu.IntXbar");
+var InitXbar    = xdc.useModule("ti.sysbios.family.shared.vayu.IntXbar");
 
 /* ISR/SWI stack        */
 Program.stack           = 0x4000;

diff --git a/examples/edma3_driver/evmtda2xx_M4/rtsc_config/platform.xs b/examples/edma3_driver/evmtda2xx_M4/rtsc_config/platform.xs
index c4408f701117d5348b52dd84bdee05c3f3c6374a..8ca214377f237fbb59c20d6d0211fd558be60559 100644 (file)
--- a/examples/edma3_driver/evmtda2xx_M4/rtsc_config/platform.xs
+++ b/examples/edma3_driver/evmtda2xx_M4/rtsc_config/platform.xs
@@ -37,22 +37,6 @@ Build.platformTable["ti.platforms.simVayu:DSP_1"] =
     stackMemory:"PRIVATE_DATA_CORE_DSP1"
 };
 
-Build.platformTable["ti.platforms.simVayu:EVE_1"] =
-{
-    externalMemoryMap: MemSegDefine.getMemSegmentDefinitionEVE_1(),
-    codeMemory:"CODE_CORE_EVE1",
-    dataMemory:"PRIVATE_DATA_CORE_EVE1",
-    stackMemory:"PRIVATE_DATA_CORE_EVE1"
-};
-
-Build.platformTable["ti.platforms.simVayu:EVE_2"] =
-{
-       externalMemoryMap: MemSegDefine.getMemSegmentDefinitionEVE_2(),
-    codeMemory:"CODE_CORE_EVE2",
-    dataMemory:"PRIVATE_DATA_CORE_EVE2",
-    stackMemory:"PRIVATE_DATA_CORE_EVE2"
-};
-
 Build.platformTable["ti.platforms.simVayu:Cortex_A15"] =
 {
     externalMemoryMap: MemSegDefine.getMemSegmentDefinitionHOST(),

diff --git a/makerules/rules_66.mk b/makerules/rules_66.mk
index cf9e9dba7b995cd3df05a34fbe97b4824be2d32b..c4a58b49a7d5522bcd2342a9223f5f6dff815a62 100644 (file)
--- a/makerules/rules_66.mk
+++ b/makerules/rules_66.mk
@@ -62,7 +62,7 @@ ifneq ($(XDC_CFG_FILE_$(CORE)),)
   endif
   CFG_CFILE_XDC =$(patsubst %.cfg,%_$(CFG_CFILENAMEPART_XDC).c,$(notdir $(XDC_CFG_FILE_$(CORE))))
   CFG_C_XDC = $(addprefix $(CONFIGURO_DIR)/package/cfg/,$(CFG_CFILE_XDC))
-  XDCLNKCMD_FILE =$(patsubst %.c, %$(CFG_LNKFILENAMEPART_XDC)_x.xdl, $(CFG_C_XDC))
+  XDCLNKCMD_FILE =$(patsubst %.c, %$(CFG_LNKFILENAMEPART_XDC).xdl, $(CFG_C_XDC))
   CFG_COBJ_XDC = $(patsubst %.c,%.$(OBJEXT),$(CFG_CFILE_XDC))
 #  OBJ_PATHS += $(CFG_COBJ_XDC)
   LNKCMD_FILE = $(CONFIGURO_DIR)/linker_mod.cmd
@@ -173,7 +173,7 @@ endif
 $(BINDIR)/$(APP_NAME)_$(CORE)_$(PROFILE_$(CORE)).$(EXEEXT) : $(OBJ_PATHS) $(LIB_PATHS) $(LNKCMD_FILE) $(OBJDIR)/$(CFG_COBJ_XDC)
        $(ECHO) \# Linking into $@
        $(ECHO) \#
-       cd $(TMPOBJDIR) && $(LNK) $(_LNKFLAGS) $(OBJ_PATHS) $(OBJDIR)/$(CFG_COBJ_XDC) -l$(LNKCMD_FILE) sample_app/linker.cmd -o $@ -m $@.map $(LNK_LIBS)
+       cd $(TMPOBJDIR) && $(LNK) $(_LNKFLAGS) $(OBJ_PATHS) -l$(LNKCMD_FILE) sample_app/linker.cmd -o $@ -m $@.map $(LNK_LIBS)
        $(ECHO) \#
        $(ECHO) \# $@ created.
        $(ECHO) \#
@@ -192,7 +192,7 @@ endif
 
 # XDC specific - assemble XDC-Configuro command
 CONFIGURO_CMD = $(xdc_PATH)/xs xdc.tools.configuro --generationOnly -o $(CONFIGURO_DIR) -t $(TARGET_XDC) -p $(PLATFORM_XDC_NAME) \
-               -r whole_program -c $(CODEGEN_PATH) -b $(CONFIG_BLD_FILE) $(XDC_CFG_FILE_NAME)
+               -r $(PROFILE_$(CORE)) -c $(CODEGEN_PATH) -b $(CONFIG_BLD_FILE) $(XDC_CFG_FILE_NAME)
 _XDC_GREP_STRING = \"$(XDC_GREP_STRING)\"
 EGREP_CMD = $(EGREP) -ivw $(XDC_GREP_STRING) $(XDCLNKCMD_FILE)
 
@@ -236,6 +236,7 @@ $(OBJDIR)/$(CFG_COBJ_XDC) : $(CFG_C_XDC)
        $(ECHO) \# Compiling generated $< to $@ ...
        $(CC) -ppd=$(DEPFILE).P $(_CFLAGS) $(INCLUDES) $(CFLAGS_DIROPTS) -fc $(CFG_C_XDC)
        $(CC) $(_CFLAGS) $(INCLUDES) $(CFLAGS_DIROPTS) -fc $(CFG_C_XDC)
+       $(CP) $(OBJDIR)/$(CFG_COBJ_XDC) $(CONFIGURO_DIR)/package/cfg/$(CFG_COBJ_XDC)
 endif
 
 # Include dependency make files that were generated by $(CC)

diff --git a/makerules/rules_a15.mk b/makerules/rules_a15.mk
index a2b376c9c1ede7452c1dc2869ba766cfaee96ab3..7e0929f731e4da4b91037023e7d26ce5f66a2b2c 100644 (file)
--- a/makerules/rules_a15.mk
+++ b/makerules/rules_a15.mk
@@ -13,7 +13,8 @@
 CODEGEN_INCLUDE = $(CODEGEN_PATH_A15)/arm-none-eabi/include\r
 CC = $(CODEGEN_PATH_A15)/bin/arm-none-eabi-gcc \r
 AR = $(CODEGEN_PATH_A15)/bin/arm-none-eabi-ar\r
-LNK = $(CODEGEN_PATH_A15)/bin/arm-none-eabi-ld\r
+#LNK = $(CODEGEN_PATH_A15)/bin/arm-none-eabi-ld\r
+LNK = $(CODEGEN_PATH_A15)/bin/arm-none-eabi-gcc\r
 \r
 # XDC Specific defines\r
 ifneq ($(XDC_CFG_FILE_$(CORE)),)\r
@@ -43,11 +44,11 @@ ifneq ($(XDC_CFG_FILE_$(CORE)),)
 #  XDC_GREP_STRING += \|$(CONFIGURO_DIRNAME)\r
 endif\r
 # Internal CFLAGS - normally doesn't change\r
-CFLAGS_INTERNAL = -Wall -Wunknown-pragmas -c -mcpu=cortex-a15 -g -mfpu=neon -mfloat-abi=hard -mabi=aapcs -mapcs-frame  \r
+CFLAGS_INTERNAL = -Wall -Wunknown-pragmas -c -mcpu=cortex-a15 -g -mfpu=neon -mfloat-abi=hard -mabi=aapcs -mapcs-frame  -Wswitch\r
 #-ffunction-sections -fdata-sections\r
 CFLAGS_DIROPTS =\r
 \r
-#LNKFLAGS_INTERNAL = -nostartfiles -static -Wl,--gc-sections\r
+LNKFLAGS_INTERNAL = -nostartfiles -static -Wl,--gc-sections -mfloat-abi=hard\r
 \r
 # CFLAGS based on profile selected\r
 CFLAGS_XDCINTERNAL = -Dxdc_target_name__=A15F -Dxdc_target_types__=gnu/targets/arm/std.h -Dxdc_cfg__header__='$(CONFIGURO_DIR)/package/cfg/$(XDC_CFG_BASE_FILE_NAME)_xem3.h'\r
@@ -118,7 +119,7 @@ _LNKFLAGS = $(LNKFLAGS_INTERNAL) $(LNKFLAGS_INTERNAL_COMMON) $(LNKFLAGS_INTERNAL
 \r
 # Path of the RTS library - normally doesn't change for a given tool-chain\r
 RTSLIB_PATH =\r
-LIB_PATHS += $(EXT_LIB_a15host) $(CODEGEN_PATH_A15)/arm-none-eabi/lib/fpu/libc.a $(CODEGEN_PATH_A15)/arm-none-eabi/lib/fpu/libg.a $(CODEGEN_PATH_A15)/arm-none-eabi/lib/fpu/libm.a $(CODEGEN_PATH_A15)/arm-none-eabi/lib/fpu/librdimon.a $(CODEGEN_PATH_A15)/lib/gcc/arm-none-eabi/4.7.3/fpu/libgcc.a\r
+LIB_PATHS += $(EXT_LIB_a15host) $(CODEGEN_PATH_A15)/lib/gcc/arm-none-eabi/4.7.3/fpu/libgcc.a $(CODEGEN_PATH_A15)/arm-none-eabi/lib/fpu/libc.a $(CODEGEN_PATH_A15)/arm-none-eabi/lib/fpu/libm.a  $(CODEGEN_PATH_A15)/arm-none-eabi/lib/fpu/librdimon.a $(CODEGEN_PATH_A15)/arm-none-eabi/lib/fpu/libg.a\r
 \r
 \r
 LNK_LIBS = $(addprefix -l,$(LIB_PATHS))\r
@@ -137,7 +138,7 @@ endif
 $(EXE_NAME) : $(OBJ_PATHS_ASM) $(OBJ_PATHS) $(LIB_PATHS) $(LNKCMD_FILE)  $(CONFIGURO_DIR)/package/cfg/$(CFG_COBJ_XDC)\r
        $(ECHO) \# Linking into $(EXE_NAME)...\r
        $(ECHO) \#\r
-       $(LNK) $(_LNKFLAGS) $(OBJ_PATHS_ASM) $(OBJ_PATHS) -T $(LNKCMD_FILE) -Map $@.map $(LIB_PATHS) -o $@ \r
+       $(LNK) $(_LNKFLAGS) $(OBJ_PATHS_ASM) $(OBJ_PATHS) -Wl,-T,$(LNKCMD_FILE) -Wl,-Map,$@.map $(LIB_PATHS) -o $@\r
        $(ECHO) \#\r
        $(ECHO) \# $@ created.\r
        $(ECHO) \#\r
@@ -155,7 +156,7 @@ endif
 \r
 # XDC specific - assemble XDC-Configuro command\r
 CONFIGURO_CMD = $(xdc_PATH)/xs xdc.tools.configuro --generationOnly -o $(CONFIGURO_DIR) -t $(TARGET_XDC) -p "$(PLATFORM_XDC_NAME)" \\r
-               -r debug -c $(CODEGEN_PATH_A15) -b $(CONFIG_BLD_FILE) $(XDC_CFG_FILE_NAME)\r
+               -r $(PROFILE_$(CORE)) -c $(CODEGEN_PATH_A15) -b $(CONFIG_BLD_FILE) $(XDC_CFG_FILE_NAME)\r
 _XDC_GREP_STRING = \"$(XDC_GREP_STRING)\"\r
 EGREP_CMD = $(EGREP) -ivw $(XDC_GREP_STRING) $(XDCLNKCMD_FILE)\r
 \r

diff --git a/makerules/rules_m4.mk b/makerules/rules_m4.mk
index 40e5a68bc7753b0e531e430cfc26701142528086..25227ce663c625e4e254e2286a6b3489dffacafc 100644 (file)
--- a/makerules/rules_m4.mk
+++ b/makerules/rules_m4.mk
@@ -40,18 +40,19 @@ CFLAGS_DIROPTS = -fr=$(OBJDIR) -fs=$(OBJDIR)
 ifneq ($(XDC_CFG_FILE_$(CORE)),)\r
   ifeq ($(PROFILE_$(CORE)),debug)\r
     CFG_CFILENAMEPART_XDC =p$(FORMAT_EXT)$(ISA)\r
+       CFG_LNKFILENAMEPART_XDC=\r
   endif\r
   ifeq ($(PROFILE_$(CORE)),release)\r
     CFG_CFILENAMEPART_XDC =p$(FORMAT_EXT)$(ISA)\r
+       CFG_LNKFILENAMEPART_XDC=\r
   endif\r
   ifeq ($(PROFILE_$(CORE)),whole_program_debug)\r
     CFG_CFILENAMEPART_XDC =p$(FORMAT_EXT)$(ISA)$(ENDIAN_EXT)\r
-#    CFG_LNKFILENAMEPART_XDC=_x\r
-       CFG_LNKFILENAMEPART_XDC=\r
+    CFG_LNKFILENAMEPART_XDC=_x\r
   endif\r
   CFG_CFILE_XDC =$(patsubst %.cfg,%_$(CFG_CFILENAMEPART_XDC).c,$(notdir $(XDC_CFG_FILE_$(CORE))))\r
   CFG_C_XDC = $(addprefix $(CONFIGURO_DIR)/package/cfg/,$(CFG_CFILE_XDC))\r
-  XDCLNKCMD_FILE =$(patsubst %.c, %$(CFG_LNKFILENAMEPART_XDC)_x.xdl, $(CFG_C_XDC))\r
+  XDCLNKCMD_FILE =$(patsubst %.c, %$(CFG_LNKFILENAMEPART_XDC).xdl, $(CFG_C_XDC))\r
   CFG_COBJ_XDC = $(patsubst %.c,%.$(OBJEXT),$(CFG_CFILE_XDC))\r
 #  OBJ_PATHS += $(CFG_COBJ_XDC)\r
   LNKCMD_FILE = $(CONFIGURO_DIR)/linker_mod.cmd\r
@@ -150,7 +151,8 @@ LNKFLAGS_INTERNAL_COMMON = -w -q -u _c_int00 --silicon_version=7M4 -c --dynamic
 _LNKFLAGS = $(LNKFLAGS_INTERNAL_COMMON) $(LNKFLAGS_INTERNAL_PROFILE) $(LNKFLAGS_GLOBAL_$(CORE)) $(LNKFLAGS_LOCAL_COMMON) $(LNKFLAGS_LOCAL_$(CORE)) \r
 \r
 # Path of the RTS library - normally doesn't change for a given tool-chain\r
-RTSLIB_PATH = $(CODEGEN_PATH_M4)/lib/rtsv7M4_T_$(RTSLIB_ENDIAN)_$(RTSLIB_FORMAT).lib\r
+RTSLIB_PATH = $(CODEGEN_PATH_M4)/lib/libc.a\r
+#RTSLIB_PATH += $(CODEGEN_PATH_M4)/lib/rtsv7M4_T_$(RTSLIB_ENDIAN)_$(RTSLIB_FORMAT).lib\r
 LIB_PATHS += $(RTSLIB_PATH)\r
 \r
 LNK_LIBS = $(addprefix -l,$(LIB_PATHS))\r
@@ -163,7 +165,7 @@ endif
 $(BINDIR)/$(APP_NAME)_$(CORE)_$(PROFILE_$(CORE)).$(EXEEXT) : $(OBJ_PATHS) $(LIB_PATHS) $(LNKCMD_FILE) $(OBJDIR)/$(CFG_COBJ_XDC)\r
        $(ECHO) \# Linking into $@\r
        $(ECHO) \#\r
-       cd $(TMPOBJDIR) && $(LNK) $(_LNKFLAGS) $(OBJ_PATHS) $(OBJDIR)/$(CFG_COBJ_XDC) -l$(LNKCMD_FILE) sample_app/linker.cmd -o $@ -m $@.map $(LNK_LIBS)\r
+       cd $(TMPOBJDIR) && $(LNK) $(_LNKFLAGS) $(OBJ_PATHS) -l$(LNKCMD_FILE) sample_app/linker.cmd -o $@ -m $@.map $(LNK_LIBS)\r
        $(ECHO) \#\r
        $(ECHO) \# $@ created.\r
        $(ECHO) \#\r
@@ -183,7 +185,7 @@ endif
 #CONFIGURO_CMD = $(xdc_PATH)/xs xdc.tools.configuro --generationOnly -o $(CONFIGURO_DIR) -t $(TARGET_XDC) -p $(PLATFORM_XDC) \\r
 #               $(CFGARGS_XDC) -r $(PROFILE_$(CORE)) -b $(CONFIG_BLD_XDC_$(ISA)) $(XDC_CFG_FILE_NAME)\r
 CONFIGURO_CMD = $(xdc_PATH)/xs xdc.tools.configuro --generationOnly -o $(CONFIGURO_DIR) -t $(TARGET_XDC) -p $(PLATFORM_XDC_NAME) \\r
-               -r whole_program -c $(CODEGEN_PATH_M4) -b $(CONFIG_BLD_FILE) $(XDC_CFG_FILE_NAME)                          \r
+               -r $(PROFILE_$(CORE)) -c $(CODEGEN_PATH_M4) -b $(CONFIG_BLD_FILE) $(XDC_CFG_FILE_NAME)                     \r
 _XDC_GREP_STRING = \"$(XDC_GREP_STRING)\"\r
 EGREP_CMD = $(EGREP) -ivw $(XDC_GREP_STRING) $(XDCLNKCMD_FILE)\r
 \r
@@ -227,6 +229,7 @@ $(OBJDIR)/$(CFG_COBJ_XDC) : $(CFG_C_XDC)
        $(ECHO) \# Compiling generated $< to $@ ...\r
        $(CC) -ppd=$(DEPFILE).P $(_CFLAGS) $(INCLUDES) $(CFLAGS_DIROPTS) -fc $(CFG_C_XDC)\r
        $(CC) $(_CFLAGS) $(INCLUDES) $(CFLAGS_DIROPTS) -fc $(CFG_C_XDC)\r
+       $(CP) $(OBJDIR)/$(CFG_COBJ_XDC) $(CONFIGURO_DIR)/package/cfg/$(CFG_COBJ_XDC)\r
 endif\r
 \r
 # Include dependency make files that were generated by $(CC)\r

diff --git a/packages/makefile b/packages/makefile
index bea2a3c4aaa622a509c2ee67f09c28878956aec2..653522be07b3b43d14b60da870c189f3fa90d14e 100755 (executable)
--- a/packages/makefile
+++ b/packages/makefile
@@ -2547,20 +2547,20 @@ ifeq ($(FORMAT),ELF)
        $(ECHO) \# Making example $@:debug
        $(MAKE) -C $($@_EXAMPLES_PATH) PLATFORM=tda2xx-evm CORE=m4 PROFILE_m4=debug     IPUCORE=0
 
-#      $(ECHO) \# Configuring XDC packages for $@:m4:release 
-#      $(MAKE) -C $($@_EXAMPLES_PATH) xdc_configuro PLATFORM=tda2xx-evm CORE=m4 PROFILE_m4=release IPUCORE=0
-#      $(ECHO) \# Making example $@:release
-#      $(MAKE) -C $($@_EXAMPLES_PATH) PLATFORM=tda2xx-evm CORE=m4 PROFILE_m4=release IPUCORE=0
+       $(ECHO) \# Configuring XDC packages for $@:m4:release 
+       $(MAKE) -C $($@_EXAMPLES_PATH) xdc_configuro PLATFORM=tda2xx-evm CORE=m4 PROFILE_m4=release IPUCORE=0
+       $(ECHO) \# Making example $@:release
+       $(MAKE) -C $($@_EXAMPLES_PATH) PLATFORM=tda2xx-evm CORE=m4 PROFILE_m4=release IPUCORE=0
 
        $(ECHO) \# Configuring XDC packages for $@:m4:debug 
        $(MAKE) -C $($@_EXAMPLES_PATH) xdc_configuro PLATFORM=tda2xx-evm CORE=m4 PROFILE_m4=debug IPUCORE=1
        $(ECHO) \# Making example $@:debug
        $(MAKE) -C $($@_EXAMPLES_PATH) PLATFORM=tda2xx-evm CORE=m4 PROFILE_m4=debug IPUCORE=1
 
-#      $(ECHO) \# Configuring XDC packages for $@:m4:release 
-#      $(MAKE) -C $($@_EXAMPLES_PATH) xdc_configuro PLATFORM=tda2xx-evm CORE=m4 PROFILE_m4=release IPUCORE=1
-#      $(ECHO) \# Making example $@:release
-#      $(MAKE) -C $($@_EXAMPLES_PATH) PLATFORM=tda2xx-evm CORE=m4 PROFILE_m4=release IPUCORE=1
+       $(ECHO) \# Configuring XDC packages for $@:m4:release 
+       $(MAKE) -C $($@_EXAMPLES_PATH) xdc_configuro PLATFORM=tda2xx-evm CORE=m4 PROFILE_m4=release IPUCORE=1
+       $(ECHO) \# Making example $@:release
+       $(MAKE) -C $($@_EXAMPLES_PATH) PLATFORM=tda2xx-evm CORE=m4 PROFILE_m4=release IPUCORE=1
 endif
 
 edma3_drv_tda2xx-evm_a15_example:

diff --git a/packages/ti/sdo/edma3/drv/sample/src/platforms/sample_tda2xx_arm_int_reg.c b/packages/ti/sdo/edma3/drv/sample/src/platforms/sample_tda2xx_arm_int_reg.c
index 79348c3aa8547d599ab1d030a7964acf722aa789..dbecdcf4dd6dde46c1cbf671eb14aa6fa3b137b7 100644 (file)
--- a/packages/ti/sdo/edma3/drv/sample/src/platforms/sample_tda2xx_arm_int_reg.c
+++ b/packages/ti/sdo/edma3/drv/sample/src/platforms/sample_tda2xx_arm_int_reg.c
@@ -38,7 +38,7 @@
 \r
 #include <ti/sysbios/knl/Semaphore.h>\r
 #include <ti/sysbios/hal/Hwi.h>\r
-#include <ti/sysbios/hal/vayu/IntXbar.h>\r
+#include <ti/sysbios/family/shared/vayu/IntXbar.h>\r
 #include <ti/sysbios/family/arm/a15/Mmu.h>\r
 #include <xdc/runtime/Error.h>\r
 #include <xdc/runtime/System.h>\r
@@ -319,8 +319,8 @@ EDMA3_DRV_Result sampleInitXbarEvt(EDMA3_DRV_Handle hEdma,
         {\r
         retVal = EDMA3_DRV_initXbarEventMap(hEdma, \r
                                                                        sampleXbarToChanConfig, \r
-                                                                       &sampleMapXbarEvtToChan, \r
-                                                                       &sampleConfigScr);\r
+                                                                       (EDMA3_DRV_mapXbarEvtToChan)&sampleMapXbarEvtToChan, \r
+                                                                       (EDMA3_DRV_xbarConfigScr)&sampleConfigScr);\r
         }\r
     \r
     return retVal;\r

diff --git a/packages/ti/sdo/edma3/drv/sample/src/platforms/sample_tda2xx_cfg.c b/packages/ti/sdo/edma3/drv/sample/src/platforms/sample_tda2xx_cfg.c
index e3b10c95edf8131165c996bbb8ba59022ffb1772..6026d9d5a62c40dc6624c11dce9bfe186a35c93f 100644 (file)
--- a/packages/ti/sdo/edma3/drv/sample/src/platforms/sample_tda2xx_cfg.c
+++ b/packages/ti/sdo/edma3/drv/sample/src/platforms/sample_tda2xx_cfg.c
@@ -61,6 +61,7 @@ int myCoreNum;
 \r
 unsigned short determineProcId()\r
 {\r
+unsigned short regionNo;\r
 #ifdef BUILD_TDA2XX_MPU\r
 \r
     asm ("    push    {r0-r2} \n\t"\r
@@ -69,33 +70,32 @@ unsigned short determineProcId()
                 "    STR      r0, [r1]\n\t"\r
                 "    pop    {r0-r2}\n\t");\r
        if((myCoreNum & 0x03) == 1)\r
-               return 1;\r
+               regionNo = 1;\r
        else\r
-               return 0;\r
+               regionNo = 0;\r
 #elif defined(BUILD_TDA2XX_IPU)\r
 myCoreNum = (*(unsigned int *)(PID0_ADDRESS));\r
 if(Core_getIpuId() == 1){\r
        if(myCoreNum == CORE_ID_C0)\r
-               return 4;\r
+               regionNo = 4;\r
        else if (myCoreNum == CORE_ID_C1)\r
-               return 5;\r
+               regionNo = 5;\r
 }\r
 if(Core_getIpuId() == 2){\r
        if(myCoreNum == CORE_ID_C0)\r
-               return 6;\r
+               regionNo = 6;\r
        else if (myCoreNum == CORE_ID_C1)\r
-               return 7;\r
+               regionNo = 7;\r
 }\r
 #elif defined BUILD_TDA2XX_DSP\r
 extern __cregister volatile unsigned int DNUM;\r
        myCoreNum = DNUM;\r
        if(myCoreNum == 0)\r
-               return 2;\r
+               regionNo = 2;\r
        else\r
-               return 3;\r
-#else\r
-       return 0;\r
+               regionNo = 3;\r
 #endif\r
+       return regionNo;\r
 }\r
 \r
 signed char*  getGlobalAddr(signed char* addr)\r
@@ -196,9 +196,9 @@ EDMA3_OS_Sem_Handle semHandle[NUM_EDMA3_INSTANCES] = {NULL};
 #define TC1_ERROR_INT_XBAR_INST_NO                      TC1_ERROR_INT_IPU_XBAR_INST_NO\r
 \r
 #else\r
-#define EDMA3_CC_XFER_COMPLETION_INT                    {0u}\r
-#define EDMA3_CC_ERROR_INT                              {0u}\r
-#define CC_ERROR_INT_XBAR_INST_NO                       {0u}\r
+#define EDMA3_CC_XFER_COMPLETION_INT                    (0u)\r
+#define EDMA3_CC_ERROR_INT                              (0u)\r
+#define CC_ERROR_INT_XBAR_INST_NO                       (0u)\r
 #define EDMA3_TC0_ERROR_INT                             (0u)\r
 #define EDMA3_TC1_ERROR_INT                             (0u)\r
 #define TC0_ERROR_INT_XBAR_INST_NO                      TC0_ERROR_INT_A15_XBAR_INST_NO\r
@@ -214,7 +214,7 @@ EDMA3_OS_Sem_Handle semHandle[NUM_EDMA3_INSTANCES] = {NULL};
 \r
 #define DSP1_EDMA3_CC_XFER_COMPLETION_INT               (19u)\r
 #define DSP2_EDMA3_CC_XFER_COMPLETION_INT               (20u)\r
-#define DSP1_EDMA3_CC_ERROR_INT                         {27u}\r
+#define DSP1_EDMA3_CC_ERROR_INT                         (27u)\r
 #define DSP1_EDMA3_TC0_ERROR_INT                        (28u)\r
 #define DSP1_EDMA3_TC1_ERROR_INT                        (29u)\r
 \r
@@ -930,11 +930,11 @@ EDMA3_DRV_InstanceInitConfig sampleInstInitConfig[NUM_EDMA3_INSTANCES][EDMA3_MAX
                                {0x00u, 0x00u},\r
                        },\r
 \r
-               /* Resources owned/reserved by region 2 (Associated to any IPU1 core 0)*/\r
+               /* Resources owned/reserved by region 2 (Associated to any DSP1)*/\r
                        {\r
                                /* ownPaRAMSets */\r
                                /* 31     0     63    32     95    64     127   96 */\r
-                               {0xFFFFFFFFu, 0x00000000u, 0xFFFFFFFFu, 0xFFFFFFFFu,\r
+                               {0xFFFFFFFFu, 0xFFFFFFFFu, 0xFFFFFFFFu, 0xFFFFFFFFu,\r
                                /* 159  128     191  160     223  192     255  224 */\r
                                 0xFFFFFFFFu, 0xFFFFFFFFu, 0xFFFFFFFFu, 0xFFFFFFFFu,\r
                                /* 287  256     319  288     351  320     383  352 */\r
@@ -944,15 +944,15 @@ EDMA3_DRV_InstanceInitConfig sampleInstInitConfig[NUM_EDMA3_INSTANCES][EDMA3_MAX
 \r
                                /* ownDmaChannels */\r
                                /* 31     0     63    32 */\r
-                               {0xFFFFFFFFu, 0x00000000u},\r
+                               {0xFFFFFFFFu, 0xFFFFFFFFu},\r
 \r
                                /* ownQdmaChannels */\r
                                /* 31     0 */\r
-                               {0x0000000Fu},\r
+                               {0x000000FFu},\r
 \r
                                /* ownTccs */\r
                                /* 31     0     63    32 */\r
-                               {0xFFFFFFFFu, 0x00000000u},\r
+                               {0xFFFFFFFFu, 0xFFFFFFFFu},\r
 \r
                                /* resvdPaRAMSets */\r
                                /* 31     0     63    32     95    64     127   96 */\r
@@ -977,11 +977,11 @@ EDMA3_DRV_InstanceInitConfig sampleInstInitConfig[NUM_EDMA3_INSTANCES][EDMA3_MAX
                                {0x00u, 0x00u},\r
                        },\r
 \r
-               /* Resources owned/reserved by region 3 (Associated to any IPU1 core 1)*/\r
+               /* Resources owned/reserved by region 3 (Associated to any DSP2)*/\r
                        {\r
                                /* ownPaRAMSets */\r
                                /* 31     0     63    32     95    64     127   96 */\r
-                               {0x00000000u, 0xFFFFFFFFu, 0xFFFFFFFFu, 0xFFFFFFFFu,\r
+                               {0xFFFFFFFFu, 0xFFFFFFFFu, 0xFFFFFFFFu, 0xFFFFFFFFu,\r
                                /* 159  128     191  160     223  192     255  224 */\r
                                 0xFFFFFFFFu, 0xFFFFFFFFu, 0xFFFFFFFFu, 0xFFFFFFFFu,\r
                                /* 287  256     319  288     351  320     383  352 */\r
@@ -991,15 +991,15 @@ EDMA3_DRV_InstanceInitConfig sampleInstInitConfig[NUM_EDMA3_INSTANCES][EDMA3_MAX
 \r
                                /* ownDmaChannels */\r
                                /* 31     0     63    32 */\r
-                               {0x00000000u, 0xFFFFFFFFu},\r
+                               {0xFFFFFFFFu, 0xFFFFFFFFu},\r
 \r
                                /* ownQdmaChannels */\r
                                /* 31     0 */\r
-                               {0x000000F0u},\r
+                               {0x000000FFu},\r
 \r
                                /* ownTccs */\r
                                /* 31     0     63    32 */\r
-                               {0x00000000u, 0xFFFFFFFFu},\r
+                               {0xFFFFFFFFu, 0xFFFFFFFFu},\r
 \r
                                /* resvdPaRAMSets */\r
                                /* 31     0     63    32     95    64     127   96 */\r
@@ -1024,7 +1024,7 @@ EDMA3_DRV_InstanceInitConfig sampleInstInitConfig[NUM_EDMA3_INSTANCES][EDMA3_MAX
                                {0x00u, 0x00u},\r
                        },\r
 \r
-               /* Resources owned/reserved by region 4 (Associated to any IPU2 core 0)*/\r
+               /* Resources owned/reserved by region 4 (Associated to any IPU1 core 0)*/\r
                        {\r
                                /* ownPaRAMSets */\r
                                /* 31     0     63    32     95    64     127   96 */\r
@@ -1071,7 +1071,7 @@ EDMA3_DRV_InstanceInitConfig sampleInstInitConfig[NUM_EDMA3_INSTANCES][EDMA3_MAX
                                {0x00u, 0x00u},\r
                        },\r
 \r
-               /* Resources owned/reserved by region 5 (Associated to any IPU2 core 1)*/\r
+               /* Resources owned/reserved by region 5 (Associated to any IPU1 core 1)*/\r
                        {\r
                                /* ownPaRAMSets */\r
                                /* 31     0     63    32     95    64     127   96 */\r
@@ -1118,7 +1118,7 @@ EDMA3_DRV_InstanceInitConfig sampleInstInitConfig[NUM_EDMA3_INSTANCES][EDMA3_MAX
                                {0x00u, 0x00u},\r
                        },\r
 \r
-               /* Resources owned/reserved by region 6 (Associated to any DSP core 0)*/\r
+               /* Resources owned/reserved by region 6 (Associated to any IPU2 core 0)*/\r
                        {\r
                                /* ownPaRAMSets */\r
                                /* 31     0     63    32     95    64     127   96 */\r
@@ -1165,7 +1165,7 @@ EDMA3_DRV_InstanceInitConfig sampleInstInitConfig[NUM_EDMA3_INSTANCES][EDMA3_MAX
                                {0x00u, 0x00u},\r
                        },\r
 \r
-               /* Resources owned/reserved by region 7 (Associated to any DSP core 1)*/\r
+               /* Resources owned/reserved by region 7 (Associated to any IPU2 core 1)*/\r
                        {\r
                                /* ownPaRAMSets */\r
                                /* 31     0     63    32     95    64     127   96 */\r
@@ -1599,91 +1599,91 @@ EDMA3_DRV_GblXbarToChanConfigParams sampleXbarChanInitConfig[NUM_EDMA3_INSTANCES
     {\r
         /* Event to channel map for region 0 */\r
         {\r
+            {-1, -1, -1, -1, -1, -1, -1, -1,\r
             -1, -1, -1, -1, -1, -1, -1, -1,\r
             -1, -1, -1, -1, -1, -1, -1, -1,\r
             -1, -1, -1, -1, -1, -1, -1, -1,\r
             -1, -1, -1, -1, -1, -1, -1, -1,\r
             -1, -1, -1, -1, -1, -1, -1, -1,\r
             -1, -1, -1, -1, -1, -1, -1, -1,\r
-            -1, -1, -1, -1, -1, -1, -1, -1,\r
-            -1, -1, -1, -1, -1, -1, -1\r
+            -1, -1, -1, -1, -1, -1, -1}\r
         },\r
         /* Event to channel map for region 1 */\r
         {\r
+            {-1, -1, -1, -1, -1, -1, -1, -1,\r
             -1, -1, -1, -1, -1, -1, -1, -1,\r
             -1, -1, -1, -1, -1, -1, -1, -1,\r
             -1, -1, -1, -1, -1, -1, -1, -1,\r
             -1, -1, -1, -1, -1, -1, -1, -1,\r
             -1, -1, -1, -1, -1, -1, -1, -1,\r
             -1, -1, -1, -1, -1, -1, -1, -1,\r
-            -1, -1, -1, -1, -1, -1, -1, -1,\r
-            -1, -1, -1, -1, -1, -1, -1\r
+            -1, -1, -1, -1, -1, -1, -1}\r
         },\r
         /* Event to channel map for region 2 */\r
         {\r
+            {-1, -1, -1, -1, -1, -1, -1, -1,\r
             -1, -1, -1, -1, -1, -1, -1, -1,\r
             -1, -1, -1, -1, -1, -1, -1, -1,\r
             -1, -1, -1, -1, -1, -1, -1, -1,\r
             -1, -1, -1, -1, -1, -1, -1, -1,\r
             -1, -1, -1, -1, -1, -1, -1, -1,\r
             -1, -1, -1, -1, -1, -1, -1, -1,\r
-            -1, -1, -1, -1, -1, -1, -1, -1,\r
-            -1, -1, -1, -1, -1, -1, -1\r
+            -1, -1, -1, -1, -1, -1, -1}\r
         },\r
         /* Event to channel map for region 3 */\r
         {\r
+            {-1, -1, -1, -1, -1, -1, -1, -1,\r
             -1, -1, -1, -1, -1, -1, -1, -1,\r
             -1, -1, -1, -1, -1, -1, -1, -1,\r
             -1, -1, -1, -1, -1, -1, -1, -1,\r
             -1, -1, -1, -1, -1, -1, -1, -1,\r
             -1, -1, -1, -1, -1, -1, -1, -1,\r
             -1, -1, -1, -1, -1, -1, -1, -1,\r
-            -1, -1, -1, -1, -1, -1, -1, -1,\r
-            -1, -1, -1, -1, -1, -1, -1\r
+            -1, -1, -1, -1, -1, -1, -1}\r
         },\r
         /* Event to channel map for region 4 */\r
         {\r
+            {-1, -1, -1, -1, -1, -1, -1, -1,\r
             -1, -1, -1, -1, -1, -1, -1, -1,\r
             -1, -1, -1, -1, -1, -1, -1, -1,\r
             -1, -1, -1, -1, -1, -1, -1, -1,\r
             -1, -1, -1, -1, -1, -1, -1, -1,\r
             -1, -1, -1, -1, -1, -1, -1, -1,\r
             -1, -1, -1, -1, -1, -1, -1, -1,\r
-            -1, -1, -1, -1, -1, -1, -1, -1,\r
-            -1, -1, -1, -1, -1, -1, -1\r
+            -1, -1, -1, -1, -1, -1, -1}\r
         },\r
         /* Event to channel map for region 5 */\r
         {\r
+            {-1, -1, -1, -1, -1, -1, -1, -1,\r
             -1, -1, -1, -1, -1, -1, -1, -1,\r
             -1, -1, -1, -1, -1, -1, -1, -1,\r
             -1, -1, -1, -1, -1, -1, -1, -1,\r
             -1, -1, -1, -1, -1, -1, -1, -1,\r
             -1, -1, -1, -1, -1, -1, -1, -1,\r
             -1, -1, -1, -1, -1, -1, -1, -1,\r
-            -1, -1, -1, -1, -1, -1, -1, -1,\r
-            -1, -1, -1, -1, -1, -1, -1\r
+            -1, -1, -1, -1, -1, -1, -1}\r
         },\r
         /* Event to channel map for region 6 */\r
         {\r
+            {-1, -1, -1, -1, -1, -1, -1, -1,\r
             -1, -1, -1, -1, -1, -1, -1, -1,\r
             -1, -1, -1, -1, -1, -1, -1, -1,\r
             -1, -1, -1, -1, -1, -1, -1, -1,\r
             -1, -1, -1, -1, -1, -1, -1, -1,\r
             -1, -1, -1, -1, -1, -1, -1, -1,\r
             -1, -1, -1, -1, -1, -1, -1, -1,\r
-            -1, -1, -1, -1, -1, -1, -1, -1,\r
-            -1, -1, -1, -1, -1, -1, -1\r
+            -1, -1, -1, -1, -1, -1, -1}\r
         },\r
         /* Event to channel map for region 7 */\r
         {\r
+            {-1, -1, -1, -1, -1, -1, -1, -1,\r
             -1, -1, -1, -1, -1, -1, -1, -1,\r
             -1, -1, -1, -1, -1, -1, -1, -1,\r
             -1, -1, -1, -1, -1, -1, -1, -1,\r
             -1, -1, -1, -1, -1, -1, -1, -1,\r
             -1, -1, -1, -1, -1, -1, -1, -1,\r
             -1, -1, -1, -1, -1, -1, -1, -1,\r
-            -1, -1, -1, -1, -1, -1, -1, -1,\r
-            -1, -1, -1, -1, -1, -1, -1\r
+            -1, -1, -1, -1, -1, -1, -1}\r
         },\r
     }\r
 };\r

diff --git a/packages/ti/sdo/edma3/drv/sample/src/platforms/sample_tda2xx_int_reg.c b/packages/ti/sdo/edma3/drv/sample/src/platforms/sample_tda2xx_int_reg.c
index e8744410fa55f457e25f7c843e38d2e9b502dc9e..1073b29f147086a36066502e1741a3da84e7bb84 100644 (file)
--- a/packages/ti/sdo/edma3/drv/sample/src/platforms/sample_tda2xx_int_reg.c
+++ b/packages/ti/sdo/edma3/drv/sample/src/platforms/sample_tda2xx_int_reg.c
@@ -39,7 +39,7 @@
 #include <ti/sysbios/knl/Semaphore.h>
 #include <ti/sysbios/family/c64p/EventCombiner.h>
 #include <ti/sysbios/family/c64p/Hwi.h>
-#include <ti/sysbios/hal/vayu/IntXbar.h>
+#include <ti/sysbios/family/shared/vayu/IntXbar.h>
 
 #include <ti/sdo/edma3/drv/sample/bios6_edma3_drv_sample.h>