summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: df32b6e)
raw | patch | inline | side by side (parent: df32b6e)
author | John Dowdal <jdowdal@ti.com> | |
Thu, 9 Jul 2015 17:28:16 +0000 (13:28 -0400) | ||
committer | John Dowdal <jdowdal@ti.com> | |
Thu, 9 Jul 2015 17:28:16 +0000 (13:28 -0400) |
.gitignore | patch | blob | history | |
build/armv7/ti.drv.pcie.aa15fg.mk | [deleted file] | patch | blob | history |
build/buildlib.xs | [changed mode: 0755->0644] | patch | blob | history |
build/m4/ti.drv.pcie.aem4.mk | [deleted file] | patch | blob | history |
diff --git a/.gitignore b/.gitignore
index d05c20fddb95ff807ef133d3de7cf59ccb535055..9994f87e91b95f388d92bffc9e3746dc74336fd0 100644 (file)
--- a/.gitignore
+++ b/.gitignore
build/c66/
build/k2[heklg]/
build/am57*/
+build/m4/ti.drv.*.mk
+build/armv7/ti.drv.*.mk
docs/Doxyfile
docs/doxygen/
docs/pcieDocs.chm
diff --git a/build/armv7/ti.drv.pcie.aa15fg.mk b/build/armv7/ti.drv.pcie.aa15fg.mk
+++ /dev/null
@@ -1,72 +0,0 @@
-#*******************************************************************************
-#* FILE PURPOSE: Lower level makefile for Creating Component Libraries
-#*******************************************************************************
-#* FILE NAME: ./build//armv7/ti.drv.pcie.aa15fg.mk
-#*
-#* DESCRIPTION: Defines Source Files, Compilers flags and build rules
-#*
-#*
-#*******************************************************************************
-#
-
-#
-# Macro definitions referenced below
-#
-empty =
-space =$(empty) $(empty)
-CC = $(TOOLCHAIN_PATH_A15)/bin/$(CROSS_TOOL_PRFX)gcc
-AC = $(TOOLCHAIN_PATH_A15)/bin/$(CROSS_TOOL_PRFX)as
-ARIN = $(TOOLCHAIN_PATH_A15)/bin/$(CROSS_TOOL_PRFX)ar
-LD = $(TOOLCHAIN_PATH_A15)/bin/$(CROSS_TOOL_PRFX)gcc
-INCS = -I. -I$(strip $(subst ;, -I,$(subst $(space),\$(space),$(INCDIR)))) -I$(TOOLCHAIN_PATH_A15)/include
-OBJEXT = oa15fg
-AOBJEXT = sa15fg
-CFLAGS_INTERNAL = -mno-unaligned-access -c -mtune=cortex-a15 -marm -DDRA7xx -gstrict-dwarf -Wall -D__ARMv7 -D_LITTLE_ENDIAN=1 -mcpu=cortex-a15 -mfpu=neon -mfloat-abi=hard -mabi=aapcs -g
-ASFLAGS_INTERNAL = -mcpu=cortex-a15 -mfpu=neon -mfloat-abi=hard
-ARFLAGS_INTERNAL = cr
-LNKFLAGS_INTERNAL =
-INTERNALDEFS = -MD -MF $@.dep
-INTERNALLINKDEFS = -o $@ -m $@.map
-OBJDIR = $(LIBDIR)//armv7/obj
-DEVOBJDIR = $(LIBDIR)//armv7/obj
-
-#List the COMMONSRC Files
-COMMONSRCC= \
- src/pcie.c\
- src/pcieinit.c\
- src/v0/pciev0.c\
- src/v0/pciev0_app.c\
- src/v0/pciev0_cfg.c\
- src/v1/pciev1.c\
- src/v1/pciev1_ticonf.c\
- src/v1/pciev1_plconf.c\
- src/v1/pciev1_ep.c\
- src/v1/pciev1_rc.c\
- src/v1/pciev1_cfg.c
-
-# FLAGS for the COMMONSRC Files
-COMMONSRCCFLAGS = -I.
-
-# Make Rule for the COMMONSRC Files
-COMMONSRCCOBJS = $(patsubst %.c, $(OBJDIR)/%.$(OBJEXT), $(COMMONSRCC))
-
-$(COMMONSRCCOBJS): $(OBJDIR)/%.$(OBJEXT): %.c
- -@echo cla15fg $< ...
- if [ ! -d $(@D) ]; then $(MKDIR) $(@D) ; fi;
- $(RM) $@.dep
- $(CC) $(CFLAGS_INTERNAL) $(COMMONSRCCFLAGS) $(INTERNALDEFS) $(INCS) $< -o $@
-
-#Create Empty rule for dependency
-$(COMMONSRCCOBJS):.\build\armv7\ti.drv.pcie.aa15fg.mk
-.\build\armv7\ti.drv.pcie.aa15fg.mk:
-
-#Include Depedency for COMMONSRC Files
-ifneq (clean,$(MAKECMDGOALS))
- -include $(COMMONSRCCOBJS:%.$(OBJEXT)=%.$(OBJEXT).dep)
-endif
-
-
-$(LIBDIR)//armv7/ti.drv.pcie.aa15fg : $(COMMONSRCCOBJS)
- @echo archiving $? into $@ ...
- if [ ! -d $(LIBDIR)//armv7 ]; then $(MKDIR) $(LIBDIR)//armv7 ; fi;
- $(ARIN) $(ARFLAGS_INTERNAL) $@ $?
diff --git a/build/buildlib.xs b/build/buildlib.xs
--- a/build/buildlib.xs
+++ b/build/buildlib.xs
\r
/* Put the temp file in object directory since javascript doesn't have a built in tmpname, \r
* and don't want --jobs=# with # > 1 to result in collisions */\r
- var tempFile = "$(LIBDIR)/" + device.toString() + "/obj/tmp_" + target.suffix + ".xml";\r
- Pkg.makeEpilogue += ".libraries: benchmarking_" + device + "_" + target.suffix + "\n";\r
- Pkg.makeEpilogue += "benchmarking_" + device + "_" + target.suffix + ":";\r
+ var libName = lldFullLibraryPath + ".a" + target.suffix;\r
+ var tempFile = libName + ".xml";\r
+ Pkg.makeEpilogue += ".libraries: benchmarking_" + device.toString() + "_" + target.suffix + "\n";\r
+ Pkg.makeEpilogue += "benchmarking_" + device + "_" + target.suffix + ": " + libName;\r
if ( java.lang.String(target.name).contains('66') )\r
{ \r
- Pkg.makeEpilogue += "\n\t $(C6X_GEN_INSTALL_PATH)/bin/ofd6x -x " + lldFullLibraryPath + ".a" + target.suffix + " > tempFile";\r
- Pkg.makeEpilogue += "\n\t sectti tempFile > " + lldFullLibraryPath + ".a" + target.suffix + "_size.txt";\r
+ Pkg.makeEpilogue += "\n\t $(C6X_GEN_INSTALL_PATH)/bin/ofd6x -x " + libName + " > " + tempFile;\r
+ Pkg.makeEpilogue += "\n\t sectti " + tempFile + " > " + libName + "_size.txt";\r
+ Pkg.makeEpilogue += "\n\t $(RM) " + tempFile + "\n\n";\r
} \r
else if (target.name == "M4")\r
{\r
- Pkg.makeEpilogue += "\n\t $(TOOLCHAIN_PATH_M4)/bin/armofd -x " + lldFullLibraryPath + ".a" + target.suffix + " > tempFile";\r
- Pkg.makeEpilogue += "\n\t sectti tempFile > " + lldFullLibraryPath + ".a" + target.suffix + "_size.txt";\r
+ Pkg.makeEpilogue += "\n\t $(TOOLCHAIN_PATH_M4)/bin/armofd -x " + libName + " > " + tempFile;\r
+ Pkg.makeEpilogue += "\n\t sectti " + tempFile + " > " + libName + "_size.txt";\r
+ Pkg.makeEpilogue += "\n\t $(RM) " + tempFile + "\n\n";\r
}\r
else\r
{\r
- Pkg.makeEpilogue += "\n\t $(TOOLCHAIN_PATH_A15)/bin/$(CROSS_TOOL_PRFX)size " + lldFullLibraryPath + ".a" + target.suffix + " > tempFile";\r
- Pkg.makeEpilogue += "\n\t $(MV) tempFile " + lldFullLibraryPath + ".a" + target.suffix + "_size.txt";\r
+ Pkg.makeEpilogue += "\n\t $(TOOLCHAIN_PATH_A15)/bin/$(CROSS_TOOL_PRFX)size " + libName + " > " + libName + "_size.txt";\r
} \r
- Pkg.makeEpilogue += "\n\t $(RM) tmp.xml\n\n";\r
Pkg.otherFiles[Pkg.otherFiles.length++] = lldFullLibraryPath + ".a" + target.suffix + "_size.txt";\r
Pkg.otherFiles[Pkg.otherFiles.length++] = lldFullBuildPath + ".a" + target.suffix + ".mk";\r
Pkg.otherFiles[Pkg.otherFiles.length++] = lldFullLibraryPath + ".a" + target.suffix;\r
\r
/* We need to clean after ourselves; extend the 'clean' target to take care of this. */\r
- Pkg.makeEpilogue += "clean::\n";\r
+ Pkg.makeEpilogue += "\nclean::\n";\r
Pkg.makeEpilogue += "\t$(RM) " + lldFullBuildPath + ".a" + target.suffix + "_size.txt\n"; \r
Pkg.makeEpilogue += "\t$(RMDIR) " + "$(LIBDIR)/" + device.toString() + "/" + targetDir +" \n\n";\r
\r
diff --git a/build/m4/ti.drv.pcie.aem4.mk b/build/m4/ti.drv.pcie.aem4.mk
+++ /dev/null
@@ -1,77 +0,0 @@
-#*******************************************************************************
-#* FILE PURPOSE: Lower level makefile for Creating Component Libraries
-#*******************************************************************************
-#* FILE NAME: ./build//m4/ti.drv.pcie.aem4.mk
-#*
-#* DESCRIPTION: Defines Source Files, Compilers flags and build rules
-#*
-#*
-#*******************************************************************************
-#
-
-#
-# Macro definitions referenced below
-#
-empty =
-space =$(empty) $(empty)
-CC = $(TOOLCHAIN_PATH_M4)/bin/armcl -c
-AC = $(TOOLCHAIN_PATH_M4)/bin/armcl -c
-ARIN = $(TOOLCHAIN_PATH_M4)/bin/armar
-LD = $(TOOLCHAIN_PATH_M4)/bin/armlnk
-RTSLIB = -l $(TOOLCHAIN_PATH_M4)/lib/undefined
-INCS = -I. -I$(strip $(subst ;, -I,$(subst $(space),\$(space),$(INCDIR)))) -I$(TOOLCHAIN_PATH_M4)/include
-OBJEXT = oem4
-AOBJEXT = sem4
-CFLAGS_INTERNAL = -o4 -qq -pdsw255 -DMAKEFILE_BUILD --endian=little -mv7M4 --float_support=vfplib --abi=eabi
-ASFLAGS_INTERNAL = -qq --endian=little -mv7M4 --float_support=vfplib --abi=eabi
-ARFLAGS_INTERNAL = rq
-LNKFLAGS_INTERNAL = --silicon_version=7M4 --strict_compatibility=on
-INTERNALDEFS = -Dti_targets_arm_elf_M4 -DMAKEFILE_BUILD -eo.$(OBJEXT) -ea.$(AOBJEXT) -fr=$(@D) -fs=$(@D) -ppa -ppd=$@.dep
-INTERNALLINKDEFS = -o $@ -m $@.map
-OBJDIR = $(LIBDIR)//m4/obj
-DEVOBJDIR = $(LIBDIR)//m4/obj
-
-#List the COMMONSRC Files
-COMMONSRCC= \
- src/pcie.c\
- src/pcieinit.c\
- src/v0/pciev0.c\
- src/v0/pciev0_app.c\
- src/v0/pciev0_cfg.c\
- src/v1/pciev1.c\
- src/v1/pciev1_ticonf.c\
- src/v1/pciev1_plconf.c\
- src/v1/pciev1_ep.c\
- src/v1/pciev1_rc.c\
- src/v1/pciev1_cfg.c
-
-# FLAGS for the COMMONSRC Files
-COMMONSRCCFLAGS = -I.
-
-# Make Rule for the COMMONSRC Files
-COMMONSRCCOBJS = $(patsubst %.c, $(OBJDIR)/%.$(OBJEXT), $(COMMONSRCC))
-
-$(COMMONSRCCOBJS): $(OBJDIR)/%.$(OBJEXT): %.c
- -@echo clem4 $< ...
- if [ ! -d $(@D) ]; then $(MKDIR) $(@D) ; fi;
- $(RM) $@.dep
- $(CC) $(CFLAGS_INTERNAL) $(COMMONSRCCFLAGS) $(INTERNALDEFS) $(INCS) -fc $<
- -@$(CP) $@.dep $@.pp; \
- $(SED) -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
- -e '/^$$/ d' -e 's/$$/ :/' < $@.pp >> $@.dep; \
- $(RM) $@.pp
-
-#Create Empty rule for dependency
-$(COMMONSRCCOBJS):.\build\m4\ti.drv.pcie.aem4.mk
-.\build\m4\ti.drv.pcie.aem4.mk:
-
-#Include Depedency for COMMONSRC Files
-ifneq (clean,$(MAKECMDGOALS))
- -include $(COMMONSRCCOBJS:%.$(OBJEXT)=%.$(OBJEXT).dep)
-endif
-
-
-$(LIBDIR)//m4/ti.drv.pcie.aem4 : $(COMMONSRCCOBJS)
- @echo archiving $? into $@ ...
- if [ ! -d $(LIBDIR)//m4 ]; then $(MKDIR) $(LIBDIR)//m4 ; fi;
- $(ARIN) $(ARFLAGS_INTERNAL) $@ $?