Skip to content

Commit

Permalink
drivers: Fix makefiles issue for windows
Browse files Browse the repository at this point in the history
Vitis 2020.1 toolchain is complaining about *.c/*o in
compilation/archiver command on windows. This patch fixes
usage of *c/*.o in compiler/archiver command from makefiles.

Also, removed unused variables and fixed usage of *.h as well.

Signed-off-by: Mubin Usman Sayyed <mubin.usman.sayyed@xilinx.com>
Acked-by: Siva Durga Prasad Paladugu <siva.durga.paladugu@xilinx.com>
  • Loading branch information
mubinsyed authored and Meena Paleti committed Jun 4, 2020
1 parent 1eac7d1 commit e7c6ed7
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 10 deletions.
5 changes: 2 additions & 3 deletions XilinxProcessorIPLib/drivers/axipcie/src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,13 @@ INCLUDES=-I./. -I${INCLUDEDIR}

INCLUDEFILES=xaxipcie_hw.h xaxipcie.h

LIBSOURCES=*.c
OUTS = *.o
LIBSOURCES=$(wildcard *.c)
OBJECTS = $(addsuffix .o, $(basename $(wildcard *.c)))

libs:
echo "Compiling axipcie"
$(COMPILER) $(COMPILER_FLAGS) $(EXTRA_COMPILER_FLAGS) $(INCLUDES) $(LIBSOURCES)
$(ARCHIVER) -r ${RELEASEDIR}/${LIB} $(OUTS)
$(ARCHIVER) -r ${RELEASEDIR}/${LIB} $(OBJECTS)
make clean

include:
Expand Down
7 changes: 3 additions & 4 deletions XilinxProcessorIPLib/drivers/mbox/src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,14 @@ RELEASEDIR=../../../lib
INCLUDEDIR=../../../include
INCLUDES=-I./. -I${INCLUDEDIR}

OUTS = *.o
OBJECTS = $(addsuffix .o, $(basename $(wildcard *.c)))
LIBSOURCES=*.c
INCLUDEFILES=*.h
LIBSOURCES=$(wildcard *.c)
INCLUDEFILES=$(wildcard *.h)

libs:
echo "Compiling mbox"
$(COMPILER) $(COMPILER_FLAGS) $(EXTRA_COMPILER_FLAGS) $(INCLUDES) $(LIBSOURCES)
$(ARCHIVER) -r ${RELEASEDIR}/${LIB} ${OUTS}
$(ARCHIVER) -r ${RELEASEDIR}/${LIB} ${OBJECTS}
make clean

include:
Expand Down
5 changes: 2 additions & 3 deletions XilinxProcessorIPLib/drivers/xdmapcie/src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,13 @@ INCLUDES=-I./. -I${INCLUDEDIR}

INCLUDEFILES=xdmapcie_hw.h xdmapcie.h

LIBSOURCES=*.c
OUTS = *.o
LIBSOURCES=$(wildcard *.c)
OBJECTS = $(addsuffix .o, $(basename $(wildcard *.c)))

libs:
echo "Compiling axipcie"
$(COMPILER) $(COMPILER_FLAGS) $(EXTRA_COMPILER_FLAGS) $(INCLUDES) $(LIBSOURCES)
$(ARCHIVER) -r ${RELEASEDIR}/${LIB} $(OUTS)
$(ARCHIVER) -r ${RELEASEDIR}/${LIB} $(OBJECTS)
make clean

include:
Expand Down

0 comments on commit e7c6ed7

Please sign in to comment.