Changes to compile with devkit

[keystone-rtos/netapi.git] / ti / runtime / netapi / test / build / Makefile

diff --git a/ti/runtime/netapi/test/build/Makefile b/ti/runtime/netapi/test/build/Makefile
index ac555b90e3a5e006cc3b75daaf99b9297a2d1e12..5482c1932c57ee2fe42e05b6d6a5a92b22143b34 100755 (executable)
--- a/ti/runtime/netapi/test/build/Makefile
+++ b/ti/runtime/netapi/test/build/Makefile
@@ -5,6 +5,7 @@ space =$(empty) $(empty)
 export ARMV7OBJDIR ?= ./obj
 export ARMV7BINDIR ?= ./bin
 export ARMV7LIBDIR ?= ./lib
+export ARMV7SALIBDIR ?= ./lib
 export ARMV7LIBDIRLOCAL ?= ../../lib
 # INCLUDE Directories
 WORKDIR ?= $(TRANS_SDK_INSTALL_PATH)
@@ -17,35 +18,26 @@ NWAL_INSTALL_PATH ?= $(PDK_INSTALL_PATH)/ti/drv/nwal
 PKTLIB_INSTALL_PATH ?= $(PDK_INSTALL_PATH)/ti/runtime/pktlib
 
 
-#NETAPI_INC_DIR = $(NETAPI_INSTALL_PATH)/ti/runtime/netapi
-#HPLIB_INC_DIR = $()/ti/runtime/hplib
 
 #NETAPI LIB Build directory
 NETAPI_BUILD_DIR = $(NETAPI_INC_DIR)/ti/runtime/netapi/build
-#NETAPI_BUILD_DIR = $(NETAPI_INC_DIR)/build
 
 
 # Set NETAPI INSTALL PATH to Transport SDK for default
-#export NETAPI_INSTALL_PATH ?= $(TRANS_SDK_INSTALL_PATH)
 
 CSL_DEVICE ?= -DDEVICE_K2H
-export CPU ?= cortex-a15
 
 ifeq ($(CPU),  cortex-a8)
         CFLAGS += -DCORTEX_A8
 endif
-ifeq ($(CPU),  cortex-a15)
-        CFLAGS += -DCORTEX_A15
-endif
 
 TRIE_OBJS=$(ARMV7OBJDIR)/netapi/test/trie.o
-NT_OBJS= $(ARMV7OBJDIR)/netapi/test/net_test.o  $(ARMV7OBJDIR)/netapi/test/stubs.o $(ARMV7OBJDIR)/netapi/test/net_test_utils.o $(ARMV7OBJDIR)/netapi/test/net_test_sa_utils.o $(ARMV7OBJDIR)/netapi/test/net_test_thread_utils.o
+NT_OBJS= $(ARMV7OBJDIR)/netapi/test/net_test_loopback.o  $(ARMV7OBJDIR)/netapi/test/stubs.o $(ARMV7OBJDIR)/netapi/test/net_test_utils.o $(ARMV7OBJDIR)/netapi/test/net_test_sa_utils.o $(ARMV7OBJDIR)/netapi/test/net_test_thread_utils.o
 #
 NT_ROUTER_OBJS= $(ARMV7OBJDIR)/netapi/test/net_test_router.o  $(ARMV7OBJDIR)/netapi/test/stubs.o $(ARMV7OBJDIR)/netapi/test/net_test_utils.o $(ARMV7OBJDIR)/netapi/test/net_test_sa_utils.o $(ARMV7OBJDIR)/netapi/test/net_test_thread_utils.o
 #
 NT_MAX_PARAMS_OBJS= $(ARMV7OBJDIR)/netapi/test/net_test_max_params.o  $(ARMV7OBJDIR)/netapi/test/stubs.o $(ARMV7OBJDIR)/netapi/test/net_test_utils.o $(ARMV7OBJDIR)/netapi/test/net_test_sa_utils.o $(ARMV7OBJDIR)/netapi/test/net_test_thread_utils.o
 #
-#IFDMA_OBJS= $(ARMV7OBJDIR)/netapi/test/ifdma_test.o  $(ARMV7OBJDIR)/netapi/test/stubs.o $(ARMV7OBJDIR)/netapi/test/net_test_utils.o $(ARMV7OBJDIR)/netapi/test/net_test_sa_utils.o $(ARMV7OBJDIR)/netapi/test/net_test_thread_utils.o
 
 IFDMA_OBJS= $(ARMV7OBJDIR)/netapi/test/ifdma_test.o
 
@@ -65,10 +57,6 @@ SA_LIB = -lsa
 #
 #with security enabled..
 NWAL_LIB = -lnwalsa
-#SA_LIB=$(SA_INSTALL_PATH)/ti/drv/sa/lib/salld_c.av7A
-#AES_LIB=$(SA_INSTALL_PATH)/ti/mas/aes/gcarmv7a/aes_c.av7A
-#SHA1_LIB=$(SA_INSTALL_PATH)/ti/mas/sha1/gcarmv7a/sha1_c.av7A
-#PKTUTL_LIB=$(SA_INSTALL_PATH)/ti/mas/pktutl/gcarmv7a/pktutl_c.av7A
 
 ifdef CROSS_TOOL_INSTALL_PATH
 ## Support backwards compatibility with KeyStone1 approach
@@ -84,12 +72,12 @@ endif
 
 CFLAGS+= $(DEBUG_FLAG) -I../ -I. -I$(NETAPI_INC_DIR) -I$(NETAPI_INC_DIR)/src -I$(HPLIB_INC_DIR) -I$(PDK_INSTALL_PATH)  -I$(NWAL_INSTALL_PATH) -I$(PKTLIB_INSTALL_PATH) -I$(SA_INSTALL_PATH) -I$(QMSS_INC_DIR) -I$(CPPI_INC_DIR) -I$(SA_INC_DIR) $(CSL_DEVICE) -D__ARMv7 -D_VIRTUAL_ADDR_SUPPORT -D__LINUX_USER_SPACE -D_LITTLE_ENDIAN=1 -DNWAL_ENABLE_SA -DMAKEFILE_BUILD -D _GNU_SOURCE
 # Linker options
-INTERNALLINKDEFS = -Wl,--start-group -L$(ARMV7LIBDIR) -L$(ARMV7LIBDIR) -L$(ARMV7LIBDIRLOCAL)-L$(PDK_ARMV7LIBDIR) $(NETAPI_LIB) $(PKTLIB_LIB) $(HP_LIB) $(QMSS_LIB) $(CPPI_LIB) $(NWAL_LIB) $(PA_LIB) $(SA_LIB) -Wl,--end-group -lrt -pthread 
+INTERNALLINKDEFS = -Wl,--start-group $(NETAPI_LIB) $(PKTLIB_LIB) $(HP_LIB) $(QMSS_LIB) $(CPPI_LIB) $(NWAL_LIB) $(PA_LIB) $(SA_LIB) -Wl,--end-group -lrt -pthread  -L$(ARMV7LIBDIR)  -L$(ARMV7LIBDIRLOCAL) -L$(ARMV7SALIBDIR)
 
 
 all: tests 
 
-tests: $(ARMV7BINDIR)/netapi/test/.created $(ARMV7BINDIR)/netapi/test/net_test $(ARMV7BINDIR)/netapi/test/net_test_router $(ARMV7BINDIR)/netapi/test/net_test_max_params $(ARMV7BINDIR)/netapi/test/ifdma_test
+tests: $(ARMV7BINDIR)/netapi/test/.created $(ARMV7BINDIR)/netapi/test/net_test_loopback $(ARMV7BINDIR)/netapi/test/net_test_router $(ARMV7BINDIR)/netapi/test/net_test_max_params $(ARMV7BINDIR)/netapi/test/ifdma_test
 
 
 api_clean:
@@ -99,15 +87,14 @@ api_clean:
 clean: 
        rm -f $(ARMV7OBJDIR)/netapi/test/*.o
        rm -f $(ARMV7LIBDIR)/libnetapi.a
-       rm -f $(ARMV7BINDIR)/netapi/test/net_test 
+       rm -f $(ARMV7BINDIR)/netapi/test/net_test_loopback
        rm -f $(ARMV7BINDIR)/netapi/test/net_test_router 
        rm -f $(ARMV7BINDIR)/netapi/test/net_test_max_params
        rm -f $(ARMV7BINDIR)/netapi/test/ifdma_test
 
 
 $(ARMV7OBJDIR)/netapi/test/%.o: $(NETAPI_INC_DIR)/ti/runtime/netapi/test/%.c $(ARMV7OBJDIR)/netapi/test/.created
-       @echo netapi inc dir = $(NETAPI_INC_DIR)
-       @echo compiling $< ..............
+       @echo compiling $<
        @echo workdir = $(WORKDIR)
        $(CC) -c  $(CFLAGS)  $<  -o $@
 
@@ -119,17 +106,17 @@ $(ARMV7BINDIR)/netapi/test/.created:
 
 
 
-$(ARMV7BINDIR)/netapi/test/net_test:  $(NT_OBJS) $(TRIE_OBJS)
-       $(CC) $(LDFLAGS)  $(NT_OBJS) $(TRIE_OBJS) $(INTERNALLINKDEFS)  -o $(ARMV7BINDIR)/netapi/test/net_test
+$(ARMV7BINDIR)/netapi/test/net_test_loopback:  $(NT_OBJS) $(TRIE_OBJS)
+       $(CC) $(LDFLAGS)  $(NT_OBJS) $(TRIE_OBJS) $(INTERNALLINKDEFS)  -o $(ARMV7BINDIR)/netapi/test/net_test_loopback
 
-$(ARMV7BINDIR)/netapi/test/net_test_max_params:  $(NT_MAX_PARAMS_OBJS) $(TRIE_OBJS) $(ARMV7LIBDIR)/libnetapi.a
+$(ARMV7BINDIR)/netapi/test/net_test_max_params:  $(NT_MAX_PARAMS_OBJS) $(TRIE_OBJS)
        $(CC) $(LDFLAGS)  $(NT_MAX_PARAMS_OBJS) $(TRIE_OBJS) $(INTERNALLINKDEFS)  -o $(ARMV7BINDIR)/netapi/test/net_test_max_params
-$(ARMV7BINDIR)/netapi/test/net_test_router:  $(NT_ROUTER_OBJS) $(TRIE_OBJS) $(ARMV7LIBDIR)/libnetapi.a
+$(ARMV7BINDIR)/netapi/test/net_test_router:  $(NT_ROUTER_OBJS) $(TRIE_OBJS)
        $(CC) $(LDFLAGS)  $(NT_ROUTER_OBJS) $(TRIE_OBJS) $(INTERNALLINKDEFS)  -o $(ARMV7BINDIR)/netapi/test/net_test_router
 
-$(ARMV7BINDIR)/netapi/test/nt_bridge:  $(NTB_OBJS) $(TRIE_OBJS) $(ARMV7LIBDIR)/libnetapi.a
+$(ARMV7BINDIR)/netapi/test/nt_bridge:  $(NTB_OBJS) $(TRIE_OBJS)
        $(CC) $(LDFLAGS)  $(NTB_OBJS) $(TRIE_OBJS) $(INTERNALLINKDEFS)  -o $(ARMV7BINDIR)/netapi/test/nt_bridge
 
-$(ARMV7BINDIR)/netapi/test/ifdma_test:  $(IFDMA_OBJS) $(ARMV7LIBDIR)/libnetapi.a
+$(ARMV7BINDIR)/netapi/test/ifdma_test:  $(IFDMA_OBJS)
        $(CC) $(LDFLAGS)  $(IFDMA_OBJS) $(INTERNALLINKDEFS)  -o $(ARMV7BINDIR)/netapi/test/ifdma_test