From a04c5d27ed83f2f0ea798dd62a166bb2aad40c2d Mon Sep 17 00:00:00 2001 From: Hao Zhang Date: Thu, 15 Oct 2015 15:26:08 -0400 Subject: [PATCH] rm: keystone 2: add A15 library build for Keystone II devices. Signed-off-by: Hao Zhang --- Settings.xdc.xdt | 14 + build/buildlib.xs | 268 +++++++++++++----- config.bld | 200 ++++++++++++- device/k2h/global-resource-list.c | 4 + device/k2h/policy_dsp-only.c | 4 + package.bld | 24 +- package.xs | 28 +- src/Module.xs | 35 ++- .../rmK2EArmv7LinuxDspClientTestProject.txt | 2 +- .../c66/bios/rmK2EC66DspMtBiosTestProject.txt | 2 +- .../rmK2HArmv7LinuxDspClientTestProject.txt | 2 +- test/k2h/c66/bios/rmK2HC66BiosTestProject.txt | 2 +- .../c66/bios/rmK2HC66DspMtBiosTestProject.txt | 2 +- .../c66/bios/rmMemK2HC66BiosTestProject.txt | 2 +- .../bios/rmSharedK2HC66BiosTestProject.txt | 2 +- .../rmK2KArmv7LinuxDspClientTestProject.txt | 2 +- test/k2k/c66/bios/rmK2KC66BiosTestProject.txt | 2 +- .../c66/bios/rmK2KC66DspMtBiosTestProject.txt | 2 +- .../c66/bios/rmMemK2KC66BiosTestProject.txt | 2 +- .../bios/rmSharedK2KC66BiosTestProject.txt | 2 +- .../rmK2LArmv7LinuxDspClientTestProject.txt | 2 +- test/k2l/c66/bios/rmK2LC66BiosTestProject.txt | 2 +- .../c66/bios/rmK2LC66DspMtBiosTestProject.txt | 2 +- .../c66/bios/rmMemK2LC66BiosTestProject.txt | 2 +- .../bios/rmSharedK2LC66BiosTestProject.txt | 2 +- 25 files changed, 503 insertions(+), 108 deletions(-) mode change 100644 => 100755 Settings.xdc.xdt mode change 100644 => 100755 build/buildlib.xs mode change 100644 => 100755 config.bld mode change 100644 => 100755 device/k2h/global-resource-list.c mode change 100644 => 100755 device/k2h/policy_dsp-only.c mode change 100644 => 100755 package.bld mode change 100644 => 100755 package.xs mode change 100644 => 100755 src/Module.xs mode change 100644 => 100755 test/k2e/c66/bios/rmK2EArmv7LinuxDspClientTestProject.txt mode change 100644 => 100755 test/k2e/c66/bios/rmK2EC66DspMtBiosTestProject.txt mode change 100644 => 100755 test/k2h/c66/bios/rmK2HArmv7LinuxDspClientTestProject.txt mode change 100644 => 100755 test/k2h/c66/bios/rmK2HC66BiosTestProject.txt mode change 100644 => 100755 test/k2h/c66/bios/rmK2HC66DspMtBiosTestProject.txt mode change 100644 => 100755 test/k2h/c66/bios/rmMemK2HC66BiosTestProject.txt mode change 100644 => 100755 test/k2h/c66/bios/rmSharedK2HC66BiosTestProject.txt mode change 100644 => 100755 test/k2k/c66/bios/rmK2KArmv7LinuxDspClientTestProject.txt mode change 100644 => 100755 test/k2k/c66/bios/rmK2KC66BiosTestProject.txt mode change 100644 => 100755 test/k2k/c66/bios/rmK2KC66DspMtBiosTestProject.txt mode change 100644 => 100755 test/k2k/c66/bios/rmMemK2KC66BiosTestProject.txt mode change 100644 => 100755 test/k2k/c66/bios/rmSharedK2KC66BiosTestProject.txt mode change 100644 => 100755 test/k2l/c66/bios/rmK2LArmv7LinuxDspClientTestProject.txt mode change 100644 => 100755 test/k2l/c66/bios/rmK2LC66BiosTestProject.txt mode change 100644 => 100755 test/k2l/c66/bios/rmK2LC66DspMtBiosTestProject.txt mode change 100644 => 100755 test/k2l/c66/bios/rmMemK2LC66BiosTestProject.txt mode change 100644 => 100755 test/k2l/c66/bios/rmSharedK2LC66BiosTestProject.txt diff --git a/Settings.xdc.xdt b/Settings.xdc.xdt old mode 100644 new mode 100755 index a56b44d..133e0c3 --- a/Settings.xdc.xdt +++ b/Settings.xdc.xdt @@ -20,5 +20,19 @@ module Settings { config string rmVersionString = `packageVersion`; + + /*! This variable is to control the device type selection. + * By default this variable is set to NULL. + * + * To use RM for the selected device, add the following lines to config + * file and set the deviceType correctly: + * + * var rm = xdc.useModule ('ti.drv.rm.Settings'); + * rm.deviceType = "k2k"; + * + * If this is not set, then hyperlink will use device independent + * library where user must supply compiled qmss_device.obj + */ + metaonly config string deviceType = ""; } diff --git a/build/buildlib.xs b/build/buildlib.xs old mode 100644 new mode 100755 index 822f99a..97b7aa5 --- a/build/buildlib.xs +++ b/build/buildlib.xs @@ -7,7 +7,7 @@ * This file contains common routines that are used by the various RM * components. * - * Copyright (C) 2012-2013, Texas Instruments, Inc. + * Copyright (C) 2012-2015, Texas Instruments, Inc. *****************************************************************************/ /************************************************************************** @@ -110,11 +110,11 @@ function createMake(makefile) var file = xdc.module('xdc.services.io.File'); - var xdcTargetType = java.lang.System.getenv("XDCTARGET"); - var toolsBaseDir = java.lang.System.getenv("XDCCGROOT"); makefile.writeLine("\n# Output for prebuilt generated libraries"); makefile.writeLine("export LIBDIR ?= ./lib"); + /* use sectti.exe from path */ + makefile.writeLine("export SECTTI ?= sectti"); /* Create INCDIR from XDCPATH */ @@ -194,7 +194,8 @@ function createMake(makefile) makefile.writeLine("\n# Clean Rule"); makefile.writeLine("clean:: clean_package"); makefile.writeLine("# Clean Top Level Object Directory "); - makefile.writeLine("clean_package :\n\t$(RMDIR) $(LIBDIR)/*/"); + makefile.writeLine("clean_package:") + makefile.writeLine("\t$(RMDIR) $(LIBDIR)/*"); makefile.writeLine("\t$(RMDIR) package/cfg"); } else @@ -212,28 +213,56 @@ function createMake(makefile) return makefile; } -function createLibMake(makelibname,targetname, objectPath) +function createLibMake(device, makelibname,targetname, objectPath) { var tooldir; + var cmdprefix; + var targetDir; var stringname=String(targetname).replace("(xdc.bld.ITarget.Module)",""); - if(stringname.match("ARM11")) - { - tooldir="TI_ARM11_GEN_INSTALL_PATH"; - } - else - { - tooldir="C6X_GEN_INSTALL_PATH"; - } + switch(stringname) { case String(C66LE): + tooldir="C6X_GEN_INSTALL_PATH"; + cmdprefix=""; + targetDir="c66"; targetname=C66LE; break; case String(C66BE): + tooldir="C6X_GEN_INSTALL_PATH"; + cmdprefix=""; + targetDir="c66"; targetname=C66BE; break; - + case String(A15LE): + tooldir="TOOLCHAIN_PATH_A15"; + cmdprefix="CROSS_TOOL_PRFX"; + targetDir="armv7"; + targetname=A15LE; + break; + case String(A9LE): + tooldir="TOOLCHAIN_PATH_A9"; + cmdprefix="CROSS_TOOL_PRFX"; + targetDir="armv7"; + targetname=A9LE; + break; + case String(A8LE): + tooldir="TOOLCHAIN_PATH_A8"; + cmdprefix="CROSS_TOOL_PRFX"; + targetDir="armv7"; + targetname=A8LE; + break; + case String(M4LE): + tooldir="TOOLCHAIN_PATH_M4"; + cmdprefix=""; + targetDir="m4"; + targetname=M4LE; + break; + case String(ARM11): + tooldir="TI_ARM11_GEN_INSTALL_PATH"; + break; } + var fileModule = xdc.module('xdc.services.io.File'); try{ var dstFile = new java.io.File(makelibname); @@ -262,45 +291,82 @@ function createLibMake(makelibname,targetname, objectPath) libmakefile.writeLine("empty ="); libmakefile.writeLine("space =$(empty) $(empty)"); - if(stringname.match("ti.targets")) + if ((targetname.name == "A15F") || (targetname.name == "A9F") || (targetname.name == "A8F")) { + + if(stringname.match("gnu.targets")) + { + libmakefile.writeLine("CC = $("+tooldir+")/bin/$("+cmdprefix+")gcc"); + libmakefile.writeLine("AC = $("+tooldir+")/bin/$("+cmdprefix+")as"); + libmakefile.writeLine("ARIN = $("+tooldir+")/bin/$("+cmdprefix+")ar"); + libmakefile.writeLine("LD = $("+tooldir+")/bin/$("+cmdprefix+")gcc"); + } + else + { + print("Error: Non-GNU targets are not currently supported "); + java.lang.System.exit(1); - var rtslibtemp = targetname.lnkOpts.suffix.toString().split("/"); - var rtslib; - for(n=0;n> $@.dep; \\"); - makefilename.writeLine(" $(RM) $@.pp "); + if ((targetName.name == "A15F") || (targetName.name == "A9F") || (targetName.name == "A8F")) + { + makefilename.writeLine("\t$(RM) $@.dep"); + makefilename.writeLine("\t$(CC) $(CFLAGS_INTERNAL) $("+compileflagstring+") $(INTERNALDEFS) $(INCS) $< -o $@"); + /* + TBD + */ + } + else + { + makefilename.writeLine("\t$(RM) $@.dep"); + makefilename.writeLine("\t$(CC) $(CFLAGS_INTERNAL) $("+compileflagstring+") $(INTERNALDEFS) $(INCS) -fc $< "); + makefilename.writeLine("\t-@$(CP) $@.dep $@.pp; \\"); + makefilename.writeLine(" $(SED) -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\\\$$//' \\"); + makefilename.writeLine(" -e '/^$$/ d' -e 's/$$/ :/' < $@.pp >> $@.dep; \\"); + makefilename.writeLine(" $(RM) $@.pp "); + } } else if(fileExt == "asm") { - makefilename.writeLine("\t$(AC) $("+compileflagstring+") $(INTERNALDEFS) $(INCS) -fa $< "); + makefilename.writeLine("\t$(AC) $(ASFLAGS_INTERNAL) $("+compileflagstring+") $(INTERNALDEFS) $(INCS) -fa $< "); } else if(fileExt == "sa") { - makefilename.writeLine("\t$(AC) $("+compileflagstring+") $(INTERNALDEFS) $(INCS) $< "); + makefilename.writeLine("\t$(AC) $(ASFLAGS_INTERNAL) $("+compileflagstring+") $(INTERNALDEFS) $(INCS) $< "); } + makefilename.writeLine("\n#Create Empty rule for dependency"); makefilename.writeLine("$("+objectliststring+"):"+makefilename.$private.fd); makefilename.writeLine(makefilename.$private.fd+":"); @@ -381,11 +459,47 @@ function makeAddObjects(srcString, makefilename, srcfiles, flags,fileExt, target * Utility function which will build a specific library **************************************************************************/ var makefilelocal; -function buildLibrary (libOptions, libName, target, libFiles) +function buildLibrary (socName, isDmaSoc, isSoc, libOptions, libName, target, libFiles) { - var lldFullLibraryPath = "./lib/c66/" + libName; - var lldFullBuildPath = "./build/c66/" + libName; - var lldFullLibraryPathMake = "$(LIBDIR)/" + "c66/" + libName; + var targetDir; + + if (target.name == "A15F") + { + targetDir = "armv7"; + } + else if (target.name == "A9F") + { + targetDir = "armv7"; + } + else if (target.name == "A8F") + { + targetDir = "armv7"; + } + else if (target.name == "M4") + { + targetDir = "m4"; + } + else + { + targetDir = "c66"; + } + + /* Derive the operating system and soc names */ + if (isDmaSoc == "true") { + var libNameExp = libName+"."+socName+".dma"; + targetDir = socName+"/"+targetDir; + } + else if (isSoc == "true") { + var libNameExp = libName+"."+socName; + targetDir = socName+"/"+targetDir; + } + else { + var libNameExp = libName; + } + + var lldFullLibraryPath = "./lib/" + targetDir +"/" + libNameExp; + var lldFullBuildPath = "./build/" + targetDir +"/" + libNameExp; + var lldFullLibraryPathMake = "$(LIBDIR)/" + targetDir +"/" + libNameExp; /* Create Main make file in the root of package folder */ makefilelocal = createMake(makefilelocal); @@ -399,7 +513,7 @@ function buildLibrary (libOptions, libName, target, libFiles) makefilelocal.writeLine(libMake+": FORCE\n\t$(MAKE) -f "+lib+".mk $@"); /* Create Library make file in the lib folder */ - var makefilelib= createLibMake(lib+".mk",target,objectPath); + var makefilelib= createLibMake(socName, lib+".mk",target,objectPath); /* Rule to clean library in main makefile */ makefilelocal.writeLine("# Rule to clean "+libMake+" library"); @@ -436,42 +550,60 @@ function buildLibrary (libOptions, libName, target, libFiles) } if(cfiles.length > 0) { - makeAddObjects("COMMONSRC",makefilelib,cfiles,libOptions,"c",target); + makeAddObjects("COMMONSRC",makefilelib,cfiles,libOptions,"c",target, "$(OBJDIR)"); librule += " $(COMMONSRCCOBJS)"; } if(afiles.length > 0) { - makeAddObjects("COMMONSRC",makefilelib,afiles,libOptions,"asm",target); + makeAddObjects("COMMONSRC",makefilelib,afiles,libOptions,"asm",target, "$(OBJDIR)"); librule += " $(COMMONSRCASMOBJS)"; } if(safiles.length > 0) { - makeAddObjects("COMMONSRC",makefilelib,safiles,libOptions,"sa",target); + makeAddObjects("COMMONSRC",makefilelib,safiles,libOptions,"sa",target, "$(OBJDIR)"); librule += " $(COMMONSRCSAOBJS)"; } makefilelib.writeLine(librule); makefilelib.writeLine("\t@echo archiving $? into $@ ..."); - makefilelib.writeLine("\tif [ ! -d $(LIBDIR)/c66 ]; then $(MKDIR) $(LIBDIR)/c66 ; fi;"); - makefilelib.writeLine("\t$(ARIN) $@ $?"); + makefilelib.writeLine("\tif [ ! -d $(LIBDIR)/" + targetDir + " ]; then $(MKDIR) $(LIBDIR)/" + targetDir + " ; fi;"); + makefilelib.writeLine("\t$(ARIN) $(ARFLAGS_INTERNAL) $@ $?"); makefilelib.close(); /* Create the Epilogue; which executes after all the builds are completed. * This is used to generate the benchmark information for the built library. * Also add the benchmarking information file to the package. */ - Pkg.makeEpilogue += ".libraries: benchmarking_" + target.suffix + "\n"; - Pkg.makeEpilogue += "benchmarking_" + target.suffix + ":"; - Pkg.makeEpilogue += "\n\t ofd6x.exe -x " + lldFullLibraryPath + ".a" + target.suffix + " > tmp.xml"; - Pkg.makeEpilogue += "\n\t sectti.exe tmp.xml > " + lldFullLibraryPath + ".a" + target.suffix + "_size.txt"; - Pkg.makeEpilogue += "\n\t $(RM) tmp.xml\n\n"; + + /* Put the temp file in object directory since javascript doesn't have a built in tmpname, + * and don't want --jobs=# with # > 1 to result in collisions */ + var libFullName = lldFullLibraryPath + ".a" + target.suffix; + var tempFile = libFullName + ".xml"; + Pkg.makeEpilogue += ".libraries: " + libFullName + "_size.txt\n"; + Pkg.makeEpilogue += libFullName + "_size.txt: " + libFullName + "\n"; + if ( java.lang.String(target.name).contains('66') ) + { + Pkg.makeEpilogue += "\n\t $(C6X_GEN_INSTALL_PATH)/bin/ofd6x -x " + libFullName + " > " + tempFile; + Pkg.makeEpilogue += "\n\t $(SECTTI) " + tempFile + " > " + libFullName + "_size.txt"; + Pkg.makeEpilogue += "\n\t $(RM) " + tempFile + "\n\n"; + } + else if (target.name == "M4") + { + Pkg.makeEpilogue += "\n\t $(TOOLCHAIN_PATH_M4)/bin/armofd -x " + libFullName + " > " + tempFile; + Pkg.makeEpilogue += "\n\t $(SECTTI) " + tempFile + " > " + libFullName + "_size.txt"; + Pkg.makeEpilogue += "\n\t $(RM) " + tempFile + "\n\n"; + } + else + { + Pkg.makeEpilogue += "\n\t $(TOOLCHAIN_PATH_A15)/bin/$(CROSS_TOOL_PRFX)size " + libFullName + " > " + libFullName + "_size.txt"; + } Pkg.otherFiles[Pkg.otherFiles.length++] = lldFullLibraryPath + ".a" + target.suffix + "_size.txt"; Pkg.otherFiles[Pkg.otherFiles.length++] = lldFullBuildPath + ".a" + target.suffix + ".mk"; Pkg.otherFiles[Pkg.otherFiles.length++] = lldFullLibraryPath + ".a" + target.suffix; /* We need to clean after ourselves; extend the 'clean' target to take care of this. */ - Pkg.makeEpilogue += "clean::\n"; + Pkg.makeEpilogue += "\nclean::\n"; Pkg.makeEpilogue += "\t$(RM) " + lldFullBuildPath + ".a" + target.suffix + "_size.txt\n"; - Pkg.makeEpilogue += "\t$(RMDIR) " + "$(LIBDIR)/" + "c66/ \n\n"; + Pkg.makeEpilogue += "\t$(RMDIR) " + "$(LIBDIR)/" + targetDir + "/ \n\n"; return lib; } diff --git a/config.bld b/config.bld old mode 100644 new mode 100755 index 0d31b4e..24dbbc2 --- a/config.bld +++ b/config.bld @@ -8,11 +8,31 @@ * and is responsible for configuration of the paths for the various tools * required to build RM. * - * Copyright (C) 2012-2013, Texas Instruments, Inc. + * Copyright (C) 2012-2015, Texas Instruments, Inc. *****************************************************************************/ /* Get the Tools Base directory from the Environment Variable. */ -var toolsBaseDir = java.lang.System.getenv("XDCCGROOT"); +var c66ToolsBaseDir = java.lang.System.getenv("C6X_GEN_INSTALL_PATH"); +var m4ToolsBaseDir = java.lang.System.getenv("TOOLCHAIN_PATH_M4"); +var a15ToolsBaseDir = java.lang.System.getenv("TOOLCHAIN_PATH_A15"); +var a9ToolsBaseDir = java.lang.System.getenv("TOOLCHAIN_PATH_A9"); +var a8ToolsBaseDir = java.lang.System.getenv("TOOLCHAIN_PATH_A8"); + +/* Get the extended debug flags for C66x, + * did not change the name for backwards compatibilty */ +var extDbgFlags = java.lang.System.getenv("EXTDBGFLAGS"); + +/* Get the extended debug flags for A15 */ +var extDbgFlags_a15 = java.lang.System.getenv("EXTDBGFLAGS_A15"); + +/* Get the extended debug flags for A8 */ +var extDbgFlags_a8 = java.lang.System.getenv("EXTDBGFLAGS_A8"); + +/* Get the extended debug flags for A9 */ +var extDbgFlags_a9 = java.lang.System.getenv("EXTDBGFLAGS_A9"); + +/* Get the extended debug flags for M4 */ +var extDbgFlags_m4 = java.lang.System.getenv("EXTDBGFLAGS_M4"); /* Get the base directory for the RM Package */ var lldPath = new java.io.File(".//").getPath(); @@ -23,7 +43,7 @@ var lldInstallType; var lldPartNumber = java.lang.System.getenv("PARTNO"); /* Include Path */ -var lldIncludePath = " -i" + lldPath + "/src" + " -i" + lldPath + " -i" + lldPath + "/test" + " -i" + lldPath + "/util/libfdt"; +var lldIncludePath = " -I" + lldPath + "/src" + " -I" + lldPath + " -I" + lldPath + "/test" + " -I" + lldPath + "/util/libfdt"; /* Configure the RM Release Version Information */ /* 3 steps: remove SPACE and TAB, convert to string and split to make array */ @@ -35,13 +55,45 @@ var lldCoverityAnalysis = java.lang.System.getenv("LLDCOV"); /* C66 ELF compiler configuration for Little Endian Mode. */ var C66LE = xdc.useModule('ti.targets.elf.C66'); -C66LE.rootDir = toolsBaseDir; +C66LE.rootDir = c66ToolsBaseDir; C66LE.ccOpts.prefix = "-mo -o3 --gcc -q -k -eo.o"; +if(extDbgFlags) + C66LE.ccOpts.prefix = C66LE.ccOpts.prefix + " " + extDbgFlags; /* C66 ELF compiler configuration for Big Endian Mode. */ var C66BE = xdc.useModule('ti.targets.elf.C66_big_endian'); -C66BE.rootDir = toolsBaseDir; +C66BE.rootDir = c66ToolsBaseDir; C66BE.ccOpts.prefix = "-mo -o3 --gcc -q -k -eo.o -DBIGENDIAN"; +if(extDbgFlags) + C66BE.ccOpts.prefix = C66BE.ccOpts.prefix + " " + extDbgFlags; + +/* ARMv7 A15 compiler configuration */ +var A15LE = xdc.useModule('gnu.targets.arm.A15F'); +A15LE.rootDir = a15ToolsBaseDir; +A15LE.ccOpts.prefix = "-mno-unaligned-access -c -mtune=cortex-a15 -marm -DDRA7xx -gstrict-dwarf -Wall -D__ARMv7 -D_LITTLE_ENDIAN=1"; +if(extDbgFlags_a15) + A15LE.ccOpts.prefix = A15LE.ccOpts.prefix + " " + extDbgFlags_a15; + +/* ARMv7 A9 compiler configuration */ +var A9LE = xdc.useModule('gnu.targets.arm.A9F'); +A9LE.rootDir = a9ToolsBaseDir; +A9LE.ccOpts.prefix = "-mno-unaligned-access -c -mtune=cortex-a9 -marm -DDRA7xx -gstrict-dwarf -Wall -D__ARMv7 -D_LITTLE_ENDIAN=1"; +if(extDbgFlags_a9) + A9LE.ccOpts.prefix = A9LE.ccOpts.prefix + " " + extDbgFlags_a9; + +/* ARMv7 A8 compiler configuration */ +var A8LE = xdc.useModule('gnu.targets.arm.A8F'); +A8LE.rootDir = a8ToolsBaseDir; +A8LE.ccOpts.prefix = "-mno-unaligned-access -c -mtune=cortex-a8 -marm -DDRA7xx -gstrict-dwarf -Wall -D__ARMv7 -D_LITTLE_ENDIAN=1"; +if(extDbgFlags_a8) + A8LE.ccOpts.prefix = A8LE.ccOpts.prefix + " " + extDbgFlags_a8; + +/* M4 ELF compiler configuration for Little Endian Mode. */ +var M4LE = xdc.useModule('ti.targets.arm.elf.M4'); +M4LE.rootDir = m4ToolsBaseDir; +M4LE.ccOpts.prefix = "-o4 -qq -pdsw255 -DMAKEFILE_BUILD"; +if(extDbgFlags_m4) + M4LE.ccOpts.prefix = M4LE.ccOpts.prefix + " " + extDbgFlags_m4; /* Check if we need to run the STATIC Analysis or not? */ var coverityAnalysis = java.lang.System.getenv("STATIC_ANALYZE"); @@ -94,5 +146,139 @@ if (miniBuild == "ON") } -/* List all the build targets here. */ -Build.targets = [ C66LE, C66BE ]; +/* Create the SoC List */ +var socs = { + /* device independent libraries */ + all : + { + /* Build this library */ + build: "true", + /* SoC lib enabled */ + socDevLib: "false", + /* dma lib enabled */ + dmaDevLib: "false", + /* Library options */ + copts: "", + /* target lists, kept blank now, would be updated based on argument lists */ + targets: [] + }, + k2h : + { + /* this variable would be reinitialized to true, if XDCARGS contains k2h */ + build: "false", + /* SoC lib enabled */ + socDevLib: "false", + /* dma lib enabled */ + dmaDevLib: "false", + /* Library options */ + copts: " -DSOC_K2H", + /* target list */ + targets: [ C66LE, C66BE, A15LE] + }, + k2k : + { + /* this variable would be reinitialized to true, if XDCARGS contains k2k */ + build: "false", + /* SoC lib enabled */ + socDevLib: "false", + /* dma lib enabled */ + dmaDevLib: "false", + /* Library options */ + copts: " -DSOC_K2K", + /* target list */ + targets: [ C66LE, C66BE, A15LE] + }, + k2e : + { + /* this variable would be reinitialized to true, if XDCARGS contains k2e */ + build: "false", + /* SoC lib enabled */ + socDevLib: "false", + /* dma lib enabled */ + dmaDevLib: "false", + /* Library options */ + copts: " -DSOC_K2E", + /* target list */ + targets: [ C66LE, C66BE, A15LE] + }, + k2l : + { + /* this variable would be reinitialized to true, if XDCARGS contains k2l */ + build: "false", + /* SoC lib enabled */ + socDevLib: "false", + /* dma lib enabled */ + dmaDevLib: "false", + /* Library options */ + copts: " -DSOC_K2L", + /* target list */ + targets: [ C66LE, C66BE, A15LE] + } +}; + +/************************************************************************** + * FUNCTION NAME : merge + ************************************************************************** + * DESCRIPTION : + * The function is used to merge two arrarys + **************************************************************************/ +function merge() { + var args = arguments; + var hash = {}; + var arr = []; + for (var i = 0; i < args.length; i++) { + for (var j = 0; j < args[i].length; j++) { + if (hash[args[i][j]] !== true) { + arr[arr.length] = args[i][j]; + hash[args[i][j]] = true; + } + } + } + return arr; +} + +/* Grab input from XDCARGS */ +var buildArguments = []; + +/* Construct the build arguments */ +for (var tmp=0; arguments[tmp] != undefined; tmp++) +{ + + /* If no arguments are provided, override for building all */ + if ( ( arguments.length == 1) && (arguments[tmp].equals("./config.bld")) ) + buildArguments[buildArguments.length++] = "all"; + else + buildArguments[buildArguments.length++] = arguments[tmp]; +} + +/* Build targets on this build */ +var build_targets = []; +var soc_names = Object.keys(socs); + +for (var i=0; i < buildArguments.length; i++ ) { + /* Build it for all targets */ + if (buildArguments[i] == "all") { + for (var j = 0; j < soc_names.length; j++) { + build_targets = merge (build_targets.slice(0), socs[soc_names[j]].targets.slice(0)); + /* Set build to "true" for that SoC */ + socs[soc_names[j]].build = "true"; + } + } + else { + /* Skip the first argument, which is ./config.bld to get to next SoCs */ + if (i == 0) continue; + /* Set that build to true if it is found in supported build socs */ + for (j = 0; j < soc_names.length; j++) { + if (buildArguments[i] == soc_names[j]) { + socs[buildArguments[i]].build = "true"; + build_targets = merge (build_targets.slice(0), socs[buildArguments[i]].targets.slice(0)); + break; + } + } + } +} + +/* Update the Build target generated list */ +socs["all"].targets = build_targets; +Build.targets = build_targets; + diff --git a/device/k2h/global-resource-list.c b/device/k2h/global-resource-list.c old mode 100644 new mode 100755 index 1ebcda8..f8a2255 --- a/device/k2h/global-resource-list.c +++ b/device/k2h/global-resource-list.c @@ -1,6 +1,10 @@ +#ifdef _TMS320C6X #pragma DATA_SECTION (rmGlobalResourceList, ".sharedGRL"); #pragma DATA_ALIGN (rmGlobalResourceList, 128) const char rmGlobalResourceList[] = { +#else +const char rmGlobalResourceList[] __attribute__ ((aligned (128))) = { +#endif 0xd0, 0x0d, 0xfe, diff --git a/device/k2h/policy_dsp-only.c b/device/k2h/policy_dsp-only.c old mode 100644 new mode 100755 index 7ed9ec7..8e1fcfa --- a/device/k2h/policy_dsp-only.c +++ b/device/k2h/policy_dsp-only.c @@ -1,6 +1,10 @@ +#ifdef _TMS320C6X #pragma DATA_SECTION (rmDspOnlyPolicy, ".sharedPolicy"); #pragma DATA_ALIGN (rmDspOnlyPolicy, 128) const char rmDspOnlyPolicy[] = { +#else +const char rmDspOnlyPolicy[] __attribute__ ((aligned (128))) = { +#endif 0xd0, 0x0d, 0xfe, diff --git a/package.bld b/package.bld old mode 100644 new mode 100755 index d0c82a8..44fdc2c --- a/package.bld +++ b/package.bld @@ -15,7 +15,7 @@ * Example for a valid command: * xdc XDCARGS="SETUP" release * - * Copyright (C) 2012-2014, Texas Instruments, Inc. + * Copyright (C) 2012-2015, Texas Instruments, Inc. *****************************************************************************/ /* List of all subdirectories that combine to make the RM Package. */ @@ -49,14 +49,18 @@ var lldRTSCFileName = "rm" + "_" + lldPartNumber + "_" + ******************************************************************/ print ("*************** RM Build Information ****************"); -print ("RM Install : " + lldInstallType); -print ("RM Version : " + lldReleaseVersion); -print ("Tools Directory : " + toolsBaseDir); -print ("RTSC File Name : " + lldRTSCFileName); -print ("RM Path : " + lldPath); -print ("Coverity Analysis : " + (coverityAnalysis == "ON" ? "ON" : "OFF")); -print ("CC LE opts : " + C66LE.ccOpts.prefix); -print ("CC BE opts : " + C66BE.ccOpts.prefix); +print ("RM Install : " + lldInstallType); +print ("RM Version : " + lldReleaseVersion); +print ("C66 Tools Directory : " + c66ToolsBaseDir); +print ("M4 Tools Directory : " + m4ToolsBaseDir); +print ("A15 Tools Directory : " + a15ToolsBaseDir); +print ("RTSC File Name : " + lldRTSCFileName); +print ("RM Path : " + lldPath); +print ("Coverity Analysis : " + (coverityAnalysis == "ON" ? "ON" : "OFF")); +print ("CC LE opts : " + C66LE.ccOpts.prefix); +print ("CC BE opts : " + C66BE.ccOpts.prefix); +print ("M4 LE opts : " + M4LE.ccOpts.prefix); +print ("A15 basic opts : " + A15LE.ccOpts.prefix); print ("***********************************************************"); /* Create the release package for the RM */ @@ -175,7 +179,7 @@ if (lldInstallType == "SETUP") Pkg.makeEpilogue += "\t tar -xf ./packages/" + lldRTSCFileName + ".tar" + " -Ctmp/packages \n"; Pkg.makeEpilogue += "\t installjammer " + InstallJammerVersion + PackageBaseDir + WinInstallDir + " --output-dir packages/ --build install/rm.mpi\n"; - Pkg.makeEpilogue += "\t -$(RMDIR) tmp\n\n"; + Pkg.makeEpilogue += "\t -$(RMDIR) /S /Q tmp\n\n"; } /* We need to clean after ourselves; extend the 'clean' target to take care of this. */ diff --git a/package.xs b/package.xs old mode 100644 new mode 100755 index 37b1ffc..e75fa47 --- a/package.xs +++ b/package.xs @@ -14,8 +14,10 @@ function getLibs(prog) { var suffix = prog.build.target.suffix; - var name = this.$name + ".a" + suffix; + var socType = this.Settings.deviceType; + + socType = socType.toLowerCase(); /* Read LIBDIR variable */ var lib = java.lang.System.getenv("LIBDIR"); @@ -28,13 +30,37 @@ function getLibs(prog) print ("\tSystem environment LIBDIR variable defined : " + lib); } + /* SoC types supported */ + var socTypes = [ + 'k2k', + 'k2h', + 'k2l', + 'k2e', + ]; + + /* Get the SOC */ + for each (var soc in socTypes) + { + if (socType.equals(soc)) + { + lib = lib + "/" + soc; + name = this.$name + "." + soc + ".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('m4') ) + lib = lib + "/m4"; + else + lib = lib + "/armv7"; /* 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; } diff --git a/src/Module.xs b/src/Module.xs old mode 100644 new mode 100755 index 0037345..8c44862 --- a/src/Module.xs +++ b/src/Module.xs @@ -12,7 +12,7 @@ /* Load the library utility. */ var libUtility = xdc.loadCapsule ("../build/buildlib.xs"); -var rmFile = [ +var rmlldFile = [ "src/rm.c", "src/rm_nameserver.c", "src/rm_policy.c", @@ -37,14 +37,39 @@ var rmFile = [ **************************************************************************/ function modBuild() { - /* Build the libraries for all the targets specified. */ - for (var targets=0; targets < Build.targets.length; targets++) + /* Build the device independent libraries for all the targets specified. */ + for (var targets=0; targets < socs["all"].targets.length; targets++) { + var targetFiles = rmlldFile.slice(); /* make copy */ var libOptions = { - incs: lldIncludePath, + copts: socs["all"].copts, + incs: lldIncludePath, }; + libUtility.buildLibrary ("", "false", "false", libOptions, Pkg.name, socs["all"].targets[targets], targetFiles); + } + + /* Build library targets for device dependent SoCs */ + for (var soc=0; soc < soc_names.length; soc++) + { + var dev = socs[soc_names[soc]]; - libUtility.buildLibrary (libOptions, "ti.drv.rm", Build.targets[targets], rmFile); + /* do not proceed if this SoC is not configured to be built */ + if (dev.build == "false") + continue; + + if (dev.socDevLib == "true") + { + var targetFiles_soc = rmlldFile.slice(); /* make copy */ + /* Build the libraries for all the targets specified. */ + for (var targets=0; targets < dev.targets.length; targets++) + { + var libOptions = { + copts: dev.copts, + incs: lldIncludePath, + }; + libUtility.buildLibrary (soc_names[soc], "false", "true", libOptions, Pkg.name, dev.targets[targets], targetFiles_soc); + } + } } /* Add all the .c files to the release package. */ diff --git a/test/k2e/c66/bios/rmK2EArmv7LinuxDspClientTestProject.txt b/test/k2e/c66/bios/rmK2EArmv7LinuxDspClientTestProject.txt old mode 100644 new mode 100755 index a127c12..a511854 --- a/test/k2e/c66/bios/rmK2EArmv7LinuxDspClientTestProject.txt +++ b/test/k2e/c66/bios/rmK2EArmv7LinuxDspClientTestProject.txt @@ -2,6 +2,6 @@ -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/dts_files/static-policy.c" -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2e/c66/bios/rm_osal.c" -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2e/c66/bios/dsp_client.cfg" --ccs.setCompilerOptions "-mv6600 -g -DDEVICE_K2E --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" +-ccs.setCompilerOptions "-mv6600 -g -DSOC_K2E --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" -rtsc.enableRtsc diff --git a/test/k2e/c66/bios/rmK2EC66DspMtBiosTestProject.txt b/test/k2e/c66/bios/rmK2EC66DspMtBiosTestProject.txt old mode 100644 new mode 100755 index dfbf638..6da3a57 --- a/test/k2e/c66/bios/rmK2EC66DspMtBiosTestProject.txt +++ b/test/k2e/c66/bios/rmK2EC66DspMtBiosTestProject.txt @@ -3,6 +3,6 @@ -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/dts_files/server-policy.c" -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2e/c66/bios/rm_osal.c" -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2e/c66/bios/rm_test_sc.cfg" --ccs.setCompilerOptions "-mv6600 -g -DDEVICE_K2E --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" +-ccs.setCompilerOptions "-mv6600 -g -DSOC_K2E --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" -rtsc.enableRtsc diff --git a/test/k2h/c66/bios/rmK2HArmv7LinuxDspClientTestProject.txt b/test/k2h/c66/bios/rmK2HArmv7LinuxDspClientTestProject.txt old mode 100644 new mode 100755 index 80d4d3c..49d6169 --- a/test/k2h/c66/bios/rmK2HArmv7LinuxDspClientTestProject.txt +++ b/test/k2h/c66/bios/rmK2HArmv7LinuxDspClientTestProject.txt @@ -2,6 +2,6 @@ -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/dts_files/static-policy.c" -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2h/c66/bios/rm_osal.c" -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2h/c66/bios/dsp_client.cfg" --ccs.setCompilerOptions "-mv6600 -g -DDEVICE_K2H --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" +-ccs.setCompilerOptions "-mv6600 -g -DSOC_K2H --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" -rtsc.enableRtsc diff --git a/test/k2h/c66/bios/rmK2HC66BiosTestProject.txt b/test/k2h/c66/bios/rmK2HC66BiosTestProject.txt old mode 100644 new mode 100755 index 54cbf60..cc9ea67 --- a/test/k2h/c66/bios/rmK2HC66BiosTestProject.txt +++ b/test/k2h/c66/bios/rmK2HC66BiosTestProject.txt @@ -5,6 +5,6 @@ -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/dts_files/static-policy.c" -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2h/c66/bios/rm_osal.c" -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2h/c66/bios/rm_test.cfg" --ccs.setCompilerOptions "-mv6600 -g -DDEVICE_K2H --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" +-ccs.setCompilerOptions "-mv6600 -g -DSOC_K2H --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" -rtsc.enableRtsc diff --git a/test/k2h/c66/bios/rmK2HC66DspMtBiosTestProject.txt b/test/k2h/c66/bios/rmK2HC66DspMtBiosTestProject.txt old mode 100644 new mode 100755 index 4000122..a1e4305 --- a/test/k2h/c66/bios/rmK2HC66DspMtBiosTestProject.txt +++ b/test/k2h/c66/bios/rmK2HC66DspMtBiosTestProject.txt @@ -3,6 +3,6 @@ -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/dts_files/server-policy.c" -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2h/c66/bios/rm_osal.c" -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2h/c66/bios/rm_test_sc.cfg" --ccs.setCompilerOptions "-mv6600 -g -DDEVICE_K2H --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" +-ccs.setCompilerOptions "-mv6600 -g -DSOC_K2H --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" -rtsc.enableRtsc diff --git a/test/k2h/c66/bios/rmMemK2HC66BiosTestProject.txt b/test/k2h/c66/bios/rmMemK2HC66BiosTestProject.txt old mode 100644 new mode 100755 index 12db031..b132ec0 --- a/test/k2h/c66/bios/rmMemK2HC66BiosTestProject.txt +++ b/test/k2h/c66/bios/rmMemK2HC66BiosTestProject.txt @@ -8,6 +8,6 @@ -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/rm_transport_setup.c" -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2h/c66/bios/rm_osal.c" -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2h/c66/bios/rm_mem_test.cfg" --ccs.setCompilerOptions "-mv6600 -g -DDEVICE_K2H --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" +-ccs.setCompilerOptions "-mv6600 -g -DSOC_K2H --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" -rtsc.enableRtsc diff --git a/test/k2h/c66/bios/rmSharedK2HC66BiosTestProject.txt b/test/k2h/c66/bios/rmSharedK2HC66BiosTestProject.txt old mode 100644 new mode 100755 index f818aaf..a6eaf21 --- a/test/k2h/c66/bios/rmSharedK2HC66BiosTestProject.txt +++ b/test/k2h/c66/bios/rmSharedK2HC66BiosTestProject.txt @@ -4,6 +4,6 @@ -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/dts_files/server-policy.c" -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2h/c66/bios/rm_shared_osal.c" -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2h/c66/bios/rm_shared_test.cfg" --ccs.setCompilerOptions "-mv6600 -g -DDEVICE_K2H --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" +-ccs.setCompilerOptions "-mv6600 -g -DSOC_K2H --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" -rtsc.enableRtsc diff --git a/test/k2k/c66/bios/rmK2KArmv7LinuxDspClientTestProject.txt b/test/k2k/c66/bios/rmK2KArmv7LinuxDspClientTestProject.txt old mode 100644 new mode 100755 index 8effadc..d448371 --- a/test/k2k/c66/bios/rmK2KArmv7LinuxDspClientTestProject.txt +++ b/test/k2k/c66/bios/rmK2KArmv7LinuxDspClientTestProject.txt @@ -2,6 +2,6 @@ -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/dts_files/static-policy.c" -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2k/c66/bios/rm_osal.c" -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2k/c66/bios/dsp_client.cfg" --ccs.setCompilerOptions "-mv6600 -g -DDEVICE_K2K --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" +-ccs.setCompilerOptions "-mv6600 -g -DSOC_K2K --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" -rtsc.enableRtsc diff --git a/test/k2k/c66/bios/rmK2KC66BiosTestProject.txt b/test/k2k/c66/bios/rmK2KC66BiosTestProject.txt old mode 100644 new mode 100755 index a55ad38..f751fa3 --- a/test/k2k/c66/bios/rmK2KC66BiosTestProject.txt +++ b/test/k2k/c66/bios/rmK2KC66BiosTestProject.txt @@ -5,6 +5,6 @@ -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/dts_files/static-policy.c" -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2k/c66/bios/rm_osal.c" -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2k/c66/bios/rm_test.cfg" --ccs.setCompilerOptions "-mv6600 -g -DDEVICE_K2K --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" +-ccs.setCompilerOptions "-mv6600 -g -DSOC_K2K --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" -rtsc.enableRtsc diff --git a/test/k2k/c66/bios/rmK2KC66DspMtBiosTestProject.txt b/test/k2k/c66/bios/rmK2KC66DspMtBiosTestProject.txt old mode 100644 new mode 100755 index be2bf9f..3dd1dc7 --- a/test/k2k/c66/bios/rmK2KC66DspMtBiosTestProject.txt +++ b/test/k2k/c66/bios/rmK2KC66DspMtBiosTestProject.txt @@ -3,6 +3,6 @@ -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/dts_files/server-policy.c" -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2k/c66/bios/rm_osal.c" -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2k/c66/bios/rm_test_sc.cfg" --ccs.setCompilerOptions "-mv6600 -g -DDEVICE_K2K --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" +-ccs.setCompilerOptions "-mv6600 -g -DSOC_K2K --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" -rtsc.enableRtsc diff --git a/test/k2k/c66/bios/rmMemK2KC66BiosTestProject.txt b/test/k2k/c66/bios/rmMemK2KC66BiosTestProject.txt old mode 100644 new mode 100755 index d6c79b9..0de0c34 --- a/test/k2k/c66/bios/rmMemK2KC66BiosTestProject.txt +++ b/test/k2k/c66/bios/rmMemK2KC66BiosTestProject.txt @@ -8,6 +8,6 @@ -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/rm_transport_setup.c" -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2k/c66/bios/rm_osal.c" -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2k/c66/bios/rm_mem_test.cfg" --ccs.setCompilerOptions "-mv6600 -g -DDEVICE_K2K --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" +-ccs.setCompilerOptions "-mv6600 -g -DSOC_K2K --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" -rtsc.enableRtsc diff --git a/test/k2k/c66/bios/rmSharedK2KC66BiosTestProject.txt b/test/k2k/c66/bios/rmSharedK2KC66BiosTestProject.txt old mode 100644 new mode 100755 index 85458e1..e6ae07d --- a/test/k2k/c66/bios/rmSharedK2KC66BiosTestProject.txt +++ b/test/k2k/c66/bios/rmSharedK2KC66BiosTestProject.txt @@ -4,6 +4,6 @@ -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/dts_files/server-policy.c" -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2k/c66/bios/rm_shared_osal.c" -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2k/c66/bios/rm_shared_test.cfg" --ccs.setCompilerOptions "-mv6600 -g -DDEVICE_K2K --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" +-ccs.setCompilerOptions "-mv6600 -g -DSOC_K2K --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" -rtsc.enableRtsc diff --git a/test/k2l/c66/bios/rmK2LArmv7LinuxDspClientTestProject.txt b/test/k2l/c66/bios/rmK2LArmv7LinuxDspClientTestProject.txt old mode 100644 new mode 100755 index f781caa..ec2c08e --- a/test/k2l/c66/bios/rmK2LArmv7LinuxDspClientTestProject.txt +++ b/test/k2l/c66/bios/rmK2LArmv7LinuxDspClientTestProject.txt @@ -2,6 +2,6 @@ -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/dts_files/static-policy.c" -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2l/c66/bios/rm_osal.c" -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2l/c66/bios/dsp_client.cfg" --ccs.setCompilerOptions "-mv6600 -g -DDEVICE_K2L --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" +-ccs.setCompilerOptions "-mv6600 -g -DSOC_K2L --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" -rtsc.enableRtsc diff --git a/test/k2l/c66/bios/rmK2LC66BiosTestProject.txt b/test/k2l/c66/bios/rmK2LC66BiosTestProject.txt old mode 100644 new mode 100755 index f062ec5..ce50012 --- a/test/k2l/c66/bios/rmK2LC66BiosTestProject.txt +++ b/test/k2l/c66/bios/rmK2LC66BiosTestProject.txt @@ -5,6 +5,6 @@ -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/dts_files/static-policy.c" -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2l/c66/bios/rm_osal.c" -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2l/c66/bios/rm_test.cfg" --ccs.setCompilerOptions "-mv6600 -g -DDEVICE_K2L --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" +-ccs.setCompilerOptions "-mv6600 -g -DSOC_K2L --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" -rtsc.enableRtsc diff --git a/test/k2l/c66/bios/rmK2LC66DspMtBiosTestProject.txt b/test/k2l/c66/bios/rmK2LC66DspMtBiosTestProject.txt old mode 100644 new mode 100755 index 6c13611..bb51317 --- a/test/k2l/c66/bios/rmK2LC66DspMtBiosTestProject.txt +++ b/test/k2l/c66/bios/rmK2LC66DspMtBiosTestProject.txt @@ -3,6 +3,6 @@ -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/dts_files/server-policy.c" -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2l/c66/bios/rm_osal.c" -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2l/c66/bios/rm_test_sc.cfg" --ccs.setCompilerOptions "-mv6600 -g -DDEVICE_K2L --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" +-ccs.setCompilerOptions "-mv6600 -g -DSOC_K2L --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" -rtsc.enableRtsc diff --git a/test/k2l/c66/bios/rmMemK2LC66BiosTestProject.txt b/test/k2l/c66/bios/rmMemK2LC66BiosTestProject.txt old mode 100644 new mode 100755 index 35a5680..d1ddd14 --- a/test/k2l/c66/bios/rmMemK2LC66BiosTestProject.txt +++ b/test/k2l/c66/bios/rmMemK2LC66BiosTestProject.txt @@ -8,6 +8,6 @@ -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/rm_transport_setup.c" -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2l/c66/bios/rm_osal.c" -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2l/c66/bios/rm_mem_test.cfg" --ccs.setCompilerOptions "-mv6600 -g -DDEVICE_K2L --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" +-ccs.setCompilerOptions "-mv6600 -g -DSOC_K2L --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" -rtsc.enableRtsc diff --git a/test/k2l/c66/bios/rmSharedK2LC66BiosTestProject.txt b/test/k2l/c66/bios/rmSharedK2LC66BiosTestProject.txt old mode 100644 new mode 100755 index 9db2895..dda1407 --- a/test/k2l/c66/bios/rmSharedK2LC66BiosTestProject.txt +++ b/test/k2l/c66/bios/rmSharedK2LC66BiosTestProject.txt @@ -4,6 +4,6 @@ -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/dts_files/server-policy.c" -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2l/c66/bios/rm_shared_osal.c" -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/rm/test/k2l/c66/bios/rm_shared_test.cfg" --ccs.setCompilerOptions "-mv6600 -g -DDEVICE_K2L --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" +-ccs.setCompilerOptions "-mv6600 -g -DSOC_K2L --diag_warning=225 -I${PDK_INSTALL_PATH}/ti/drv/rm" -rtsc.enableRtsc -- 2.39.2