From f8ccdb5e7919edd8e85b7c76be87b5828cd0e93c Mon Sep 17 00:00:00 2001 From: Prasad Konnur Date: Wed, 26 Jun 2013 18:51:49 +0530 Subject: [PATCH] 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 --- .../edma3_drv_bios6_tda2xx_st_sample.cfg | 1 + .../edma3_drv_bios6_tda2xx_a15_st_sample.cfg | 4 +- ...edma3_drv_bios6_tda2xx_m4_c0_st_sample.cfg | 2 +- ...edma3_drv_bios6_tda2xx_m4_c1_st_sample.cfg | 2 +- .../evmtda2xx_M4/rtsc_config/platform.xs | 16 ---- makerules/rules_66.mk | 7 +- makerules/rules_a15.mk | 13 +-- makerules/rules_m4.mk | 15 ++-- packages/makefile | 16 ++-- .../src/platforms/sample_tda2xx_arm_int_reg.c | 6 +- .../sample/src/platforms/sample_tda2xx_cfg.c | 88 +++++++++---------- .../src/platforms/sample_tda2xx_int_reg.c | 2 +- 12 files changed, 81 insertions(+), 91 deletions(-) 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 42be85c..68d843e 100644 --- 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 f5eb28c..ca2d40b 100644 --- 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"; var Cache1 = xdc.useModule('ti.sysbios.family.arm.a15.Cache'); var Mmu = xdc.useModule('ti.sysbios.family.arm.a15.Mmu'); -var InitXbar = xdc.useModule('ti.sysbios.hal.vayu.IntXbar'); - +var InitXbar = xdc.useModule("ti.sysbios.family.shared.vayu.IntXbar"); +var GnuSupport = xdc.useModule('ti.sysbios.rts.gnu.SemiHostSupport'); /* Enable the cache */ Cache1.enableCache = false; 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 215f348..3042cb9 100644 --- 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 7781ebc..34b11d0 100644 --- 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 c4408f7..8ca2143 100644 --- 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 cf9e9db..c4a58b4 100644 --- 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 a2b376c..7e0929f 100644 --- a/makerules/rules_a15.mk +++ b/makerules/rules_a15.mk @@ -13,7 +13,8 @@ CODEGEN_INCLUDE = $(CODEGEN_PATH_A15)/arm-none-eabi/include CC = $(CODEGEN_PATH_A15)/bin/arm-none-eabi-gcc AR = $(CODEGEN_PATH_A15)/bin/arm-none-eabi-ar -LNK = $(CODEGEN_PATH_A15)/bin/arm-none-eabi-ld +#LNK = $(CODEGEN_PATH_A15)/bin/arm-none-eabi-ld +LNK = $(CODEGEN_PATH_A15)/bin/arm-none-eabi-gcc # XDC Specific defines ifneq ($(XDC_CFG_FILE_$(CORE)),) @@ -43,11 +44,11 @@ ifneq ($(XDC_CFG_FILE_$(CORE)),) # XDC_GREP_STRING += \|$(CONFIGURO_DIRNAME) endif # Internal CFLAGS - normally doesn't change -CFLAGS_INTERNAL = -Wall -Wunknown-pragmas -c -mcpu=cortex-a15 -g -mfpu=neon -mfloat-abi=hard -mabi=aapcs -mapcs-frame +CFLAGS_INTERNAL = -Wall -Wunknown-pragmas -c -mcpu=cortex-a15 -g -mfpu=neon -mfloat-abi=hard -mabi=aapcs -mapcs-frame -Wswitch #-ffunction-sections -fdata-sections CFLAGS_DIROPTS = -#LNKFLAGS_INTERNAL = -nostartfiles -static -Wl,--gc-sections +LNKFLAGS_INTERNAL = -nostartfiles -static -Wl,--gc-sections -mfloat-abi=hard # CFLAGS based on profile selected 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' @@ -118,7 +119,7 @@ _LNKFLAGS = $(LNKFLAGS_INTERNAL) $(LNKFLAGS_INTERNAL_COMMON) $(LNKFLAGS_INTERNAL # Path of the RTS library - normally doesn't change for a given tool-chain RTSLIB_PATH = -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 +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 LNK_LIBS = $(addprefix -l,$(LIB_PATHS)) @@ -137,7 +138,7 @@ endif $(EXE_NAME) : $(OBJ_PATHS_ASM) $(OBJ_PATHS) $(LIB_PATHS) $(LNKCMD_FILE) $(CONFIGURO_DIR)/package/cfg/$(CFG_COBJ_XDC) $(ECHO) \# Linking into $(EXE_NAME)... $(ECHO) \# - $(LNK) $(_LNKFLAGS) $(OBJ_PATHS_ASM) $(OBJ_PATHS) -T $(LNKCMD_FILE) -Map $@.map $(LIB_PATHS) -o $@ + $(LNK) $(_LNKFLAGS) $(OBJ_PATHS_ASM) $(OBJ_PATHS) -Wl,-T,$(LNKCMD_FILE) -Wl,-Map,$@.map $(LIB_PATHS) -o $@ $(ECHO) \# $(ECHO) \# $@ created. $(ECHO) \# @@ -155,7 +156,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 debug -c $(CODEGEN_PATH_A15) -b $(CONFIG_BLD_FILE) $(XDC_CFG_FILE_NAME) + -r $(PROFILE_$(CORE)) -c $(CODEGEN_PATH_A15) -b $(CONFIG_BLD_FILE) $(XDC_CFG_FILE_NAME) _XDC_GREP_STRING = \"$(XDC_GREP_STRING)\" EGREP_CMD = $(EGREP) -ivw $(XDC_GREP_STRING) $(XDCLNKCMD_FILE) diff --git a/makerules/rules_m4.mk b/makerules/rules_m4.mk index 40e5a68..25227ce 100644 --- 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)),) ifeq ($(PROFILE_$(CORE)),debug) CFG_CFILENAMEPART_XDC =p$(FORMAT_EXT)$(ISA) + CFG_LNKFILENAMEPART_XDC= endif ifeq ($(PROFILE_$(CORE)),release) CFG_CFILENAMEPART_XDC =p$(FORMAT_EXT)$(ISA) + CFG_LNKFILENAMEPART_XDC= endif ifeq ($(PROFILE_$(CORE)),whole_program_debug) CFG_CFILENAMEPART_XDC =p$(FORMAT_EXT)$(ISA)$(ENDIAN_EXT) -# CFG_LNKFILENAMEPART_XDC=_x - CFG_LNKFILENAMEPART_XDC= + CFG_LNKFILENAMEPART_XDC=_x 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 @@ -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)) # Path of the RTS library - normally doesn't change for a given tool-chain -RTSLIB_PATH = $(CODEGEN_PATH_M4)/lib/rtsv7M4_T_$(RTSLIB_ENDIAN)_$(RTSLIB_FORMAT).lib +RTSLIB_PATH = $(CODEGEN_PATH_M4)/lib/libc.a +#RTSLIB_PATH += $(CODEGEN_PATH_M4)/lib/rtsv7M4_T_$(RTSLIB_ENDIAN)_$(RTSLIB_FORMAT).lib LIB_PATHS += $(RTSLIB_PATH) LNK_LIBS = $(addprefix -l,$(LIB_PATHS)) @@ -163,7 +165,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) \# @@ -183,7 +185,7 @@ endif #CONFIGURO_CMD = $(xdc_PATH)/xs xdc.tools.configuro --generationOnly -o $(CONFIGURO_DIR) -t $(TARGET_XDC) -p $(PLATFORM_XDC) \ # $(CFGARGS_XDC) -r $(PROFILE_$(CORE)) -b $(CONFIG_BLD_XDC_$(ISA)) $(XDC_CFG_FILE_NAME) 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_M4) -b $(CONFIG_BLD_FILE) $(XDC_CFG_FILE_NAME) + -r $(PROFILE_$(CORE)) -c $(CODEGEN_PATH_M4) -b $(CONFIG_BLD_FILE) $(XDC_CFG_FILE_NAME) _XDC_GREP_STRING = \"$(XDC_GREP_STRING)\" EGREP_CMD = $(EGREP) -ivw $(XDC_GREP_STRING) $(XDCLNKCMD_FILE) @@ -227,6 +229,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/packages/makefile b/packages/makefile index bea2a3c..653522b 100755 --- 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 79348c3..dbecdcf 100644 --- 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 @@ #include #include -#include +#include #include #include #include @@ -319,8 +319,8 @@ EDMA3_DRV_Result sampleInitXbarEvt(EDMA3_DRV_Handle hEdma, { retVal = EDMA3_DRV_initXbarEventMap(hEdma, sampleXbarToChanConfig, - &sampleMapXbarEvtToChan, - &sampleConfigScr); + (EDMA3_DRV_mapXbarEvtToChan)&sampleMapXbarEvtToChan, + (EDMA3_DRV_xbarConfigScr)&sampleConfigScr); } return retVal; 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 e3b10c9..6026d9d 100644 --- 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; unsigned short determineProcId() { +unsigned short regionNo; #ifdef BUILD_TDA2XX_MPU asm (" push {r0-r2} \n\t" @@ -69,33 +70,32 @@ unsigned short determineProcId() " STR r0, [r1]\n\t" " pop {r0-r2}\n\t"); if((myCoreNum & 0x03) == 1) - return 1; + regionNo = 1; else - return 0; + regionNo = 0; #elif defined(BUILD_TDA2XX_IPU) myCoreNum = (*(unsigned int *)(PID0_ADDRESS)); if(Core_getIpuId() == 1){ if(myCoreNum == CORE_ID_C0) - return 4; + regionNo = 4; else if (myCoreNum == CORE_ID_C1) - return 5; + regionNo = 5; } if(Core_getIpuId() == 2){ if(myCoreNum == CORE_ID_C0) - return 6; + regionNo = 6; else if (myCoreNum == CORE_ID_C1) - return 7; + regionNo = 7; } #elif defined BUILD_TDA2XX_DSP extern __cregister volatile unsigned int DNUM; myCoreNum = DNUM; if(myCoreNum == 0) - return 2; + regionNo = 2; else - return 3; -#else - return 0; + regionNo = 3; #endif + return regionNo; } signed char* getGlobalAddr(signed char* addr) @@ -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 #else -#define EDMA3_CC_XFER_COMPLETION_INT {0u} -#define EDMA3_CC_ERROR_INT {0u} -#define CC_ERROR_INT_XBAR_INST_NO {0u} +#define EDMA3_CC_XFER_COMPLETION_INT (0u) +#define EDMA3_CC_ERROR_INT (0u) +#define CC_ERROR_INT_XBAR_INST_NO (0u) #define EDMA3_TC0_ERROR_INT (0u) #define EDMA3_TC1_ERROR_INT (0u) #define TC0_ERROR_INT_XBAR_INST_NO TC0_ERROR_INT_A15_XBAR_INST_NO @@ -214,7 +214,7 @@ EDMA3_OS_Sem_Handle semHandle[NUM_EDMA3_INSTANCES] = {NULL}; #define DSP1_EDMA3_CC_XFER_COMPLETION_INT (19u) #define DSP2_EDMA3_CC_XFER_COMPLETION_INT (20u) -#define DSP1_EDMA3_CC_ERROR_INT {27u} +#define DSP1_EDMA3_CC_ERROR_INT (27u) #define DSP1_EDMA3_TC0_ERROR_INT (28u) #define DSP1_EDMA3_TC1_ERROR_INT (29u) @@ -930,11 +930,11 @@ EDMA3_DRV_InstanceInitConfig sampleInstInitConfig[NUM_EDMA3_INSTANCES][EDMA3_MAX {0x00u, 0x00u}, }, - /* Resources owned/reserved by region 2 (Associated to any IPU1 core 0)*/ + /* Resources owned/reserved by region 2 (Associated to any DSP1)*/ { /* ownPaRAMSets */ /* 31 0 63 32 95 64 127 96 */ - {0xFFFFFFFFu, 0x00000000u, 0xFFFFFFFFu, 0xFFFFFFFFu, + {0xFFFFFFFFu, 0xFFFFFFFFu, 0xFFFFFFFFu, 0xFFFFFFFFu, /* 159 128 191 160 223 192 255 224 */ 0xFFFFFFFFu, 0xFFFFFFFFu, 0xFFFFFFFFu, 0xFFFFFFFFu, /* 287 256 319 288 351 320 383 352 */ @@ -944,15 +944,15 @@ EDMA3_DRV_InstanceInitConfig sampleInstInitConfig[NUM_EDMA3_INSTANCES][EDMA3_MAX /* ownDmaChannels */ /* 31 0 63 32 */ - {0xFFFFFFFFu, 0x00000000u}, + {0xFFFFFFFFu, 0xFFFFFFFFu}, /* ownQdmaChannels */ /* 31 0 */ - {0x0000000Fu}, + {0x000000FFu}, /* ownTccs */ /* 31 0 63 32 */ - {0xFFFFFFFFu, 0x00000000u}, + {0xFFFFFFFFu, 0xFFFFFFFFu}, /* resvdPaRAMSets */ /* 31 0 63 32 95 64 127 96 */ @@ -977,11 +977,11 @@ EDMA3_DRV_InstanceInitConfig sampleInstInitConfig[NUM_EDMA3_INSTANCES][EDMA3_MAX {0x00u, 0x00u}, }, - /* Resources owned/reserved by region 3 (Associated to any IPU1 core 1)*/ + /* Resources owned/reserved by region 3 (Associated to any DSP2)*/ { /* ownPaRAMSets */ /* 31 0 63 32 95 64 127 96 */ - {0x00000000u, 0xFFFFFFFFu, 0xFFFFFFFFu, 0xFFFFFFFFu, + {0xFFFFFFFFu, 0xFFFFFFFFu, 0xFFFFFFFFu, 0xFFFFFFFFu, /* 159 128 191 160 223 192 255 224 */ 0xFFFFFFFFu, 0xFFFFFFFFu, 0xFFFFFFFFu, 0xFFFFFFFFu, /* 287 256 319 288 351 320 383 352 */ @@ -991,15 +991,15 @@ EDMA3_DRV_InstanceInitConfig sampleInstInitConfig[NUM_EDMA3_INSTANCES][EDMA3_MAX /* ownDmaChannels */ /* 31 0 63 32 */ - {0x00000000u, 0xFFFFFFFFu}, + {0xFFFFFFFFu, 0xFFFFFFFFu}, /* ownQdmaChannels */ /* 31 0 */ - {0x000000F0u}, + {0x000000FFu}, /* ownTccs */ /* 31 0 63 32 */ - {0x00000000u, 0xFFFFFFFFu}, + {0xFFFFFFFFu, 0xFFFFFFFFu}, /* resvdPaRAMSets */ /* 31 0 63 32 95 64 127 96 */ @@ -1024,7 +1024,7 @@ EDMA3_DRV_InstanceInitConfig sampleInstInitConfig[NUM_EDMA3_INSTANCES][EDMA3_MAX {0x00u, 0x00u}, }, - /* Resources owned/reserved by region 4 (Associated to any IPU2 core 0)*/ + /* Resources owned/reserved by region 4 (Associated to any IPU1 core 0)*/ { /* ownPaRAMSets */ /* 31 0 63 32 95 64 127 96 */ @@ -1071,7 +1071,7 @@ EDMA3_DRV_InstanceInitConfig sampleInstInitConfig[NUM_EDMA3_INSTANCES][EDMA3_MAX {0x00u, 0x00u}, }, - /* Resources owned/reserved by region 5 (Associated to any IPU2 core 1)*/ + /* Resources owned/reserved by region 5 (Associated to any IPU1 core 1)*/ { /* ownPaRAMSets */ /* 31 0 63 32 95 64 127 96 */ @@ -1118,7 +1118,7 @@ EDMA3_DRV_InstanceInitConfig sampleInstInitConfig[NUM_EDMA3_INSTANCES][EDMA3_MAX {0x00u, 0x00u}, }, - /* Resources owned/reserved by region 6 (Associated to any DSP core 0)*/ + /* Resources owned/reserved by region 6 (Associated to any IPU2 core 0)*/ { /* ownPaRAMSets */ /* 31 0 63 32 95 64 127 96 */ @@ -1165,7 +1165,7 @@ EDMA3_DRV_InstanceInitConfig sampleInstInitConfig[NUM_EDMA3_INSTANCES][EDMA3_MAX {0x00u, 0x00u}, }, - /* Resources owned/reserved by region 7 (Associated to any DSP core 1)*/ + /* Resources owned/reserved by region 7 (Associated to any IPU2 core 1)*/ { /* ownPaRAMSets */ /* 31 0 63 32 95 64 127 96 */ @@ -1599,91 +1599,91 @@ EDMA3_DRV_GblXbarToChanConfigParams sampleXbarChanInitConfig[NUM_EDMA3_INSTANCES { /* Event to channel map for region 0 */ { + {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1 + -1, -1, -1, -1, -1, -1, -1} }, /* Event to channel map for region 1 */ { + {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1 + -1, -1, -1, -1, -1, -1, -1} }, /* Event to channel map for region 2 */ { + {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1 + -1, -1, -1, -1, -1, -1, -1} }, /* Event to channel map for region 3 */ { + {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1 + -1, -1, -1, -1, -1, -1, -1} }, /* Event to channel map for region 4 */ { + {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1 + -1, -1, -1, -1, -1, -1, -1} }, /* Event to channel map for region 5 */ { + {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1 + -1, -1, -1, -1, -1, -1, -1} }, /* Event to channel map for region 6 */ { + {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1 + -1, -1, -1, -1, -1, -1, -1} }, /* Event to channel map for region 7 */ { + {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1 + -1, -1, -1, -1, -1, -1, -1} }, } }; 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 e874441..1073b29 100644 --- 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 #include #include -#include +#include #include -- 2.39.2