Update to build for Keystone-2 and Linaro Tool chain

diff --git a/ti/runtime/netapi/build/Makefile b/ti/runtime/netapi/build/Makefile
index 7d878710fcacd9d85f2b028f46aecfd4c45dac47..f6b0976f8b908fc093658a7ac806bf188bccb30d 100755 (executable)
--- a/ti/runtime/netapi/build/Makefile
+++ b/ti/runtime/netapi/build/Makefile
@@ -51,7 +51,7 @@ COMMONSRCC = \
     pktio.c \
     netapi_navig.c\
 
-CFLAGS+= $(DEBUG_FLAG) -I$(NETAPI_INC_DIR) -I.  -I $(SRCDIR) -I$(PDK_INSTALL_PATH) -I$(NWAL_INSTALL_PATH) -I$(PKTLIB_INSTALL_PATH) -I$(TRANS_SDK_INSTALL_PATH) -I$(QMSS_INC_DIR) -I$(CPPI_INC_DIR) -I$(HPLIB_INC_DIR) -I$(QMSS_DEV_DIR) -I$(CPPI_DEV_DIR) -I$(NETAPI_NAVIG_INIT_SRC) -I$(SA_INSTALL_PATH) -D__ARMv7 -D_VIRTUAL_ADDR_SUPPORT -D__LINUX_USER_SPACE -D_LITTLE_ENDIAN=1 -DMAKEFILE_BUILD -pthread -D _GNU_SOURCE
+CFLAGS+= $(DEBUG_FLAG) -I$(NETAPI_INC_DIR) -I.  -I $(SRCDIR) -I$(PDK_INSTALL_PATH) -I$(NWAL_INSTALL_PATH) -I$(PKTLIB_INSTALL_PATH) -I$(TRANS_SDK_INSTALL_PATH) -I$(QMSS_INC_DIR) -I$(CPPI_INC_DIR) -I$(HPLIB_INC_DIR) -I$(QMSS_DEV_DIR) -I$(CPPI_DEV_DIR) -I$(NETAPI_NAVIG_INIT_SRC) -I$(SA_INSTALL_PATH) $(CSL_DEVICE)  -D__ARMv7 -D_VIRTUAL_ADDR_SUPPORT -D__LINUX_USER_SPACE -D_LITTLE_ENDIAN=1 -DMAKEFILE_BUILD -pthread -D _GNU_SOURCE
 INCS = -I$(strip $(subst ;, -I,$(subst $(space),\$(space),$(INCDIR))))
 all: lib
 

diff --git a/ti/runtime/netapi/src/pdkv3/netapi_navig.c b/ti/runtime/netapi/src/pdkv3/netapi_navig.c
index 2ba03ecac5d7009793a7e8f8293d8f438f1f62bc..017f194ae5805892378538512bca187dd9284021 100755 (executable)
--- a/ti/runtime/netapi/src/pdkv3/netapi_navig.c
+++ b/ti/runtime/netapi/src/pdkv3/netapi_navig.c
@@ -202,7 +202,7 @@ int netapi_init_qm(int max_descriptors)
                                  (uint32_t)netapi_qmssGblCfgParams.groupRegs[count].qmConfigReg);
 
         netapi_qmssGblCfgParams.groupRegs[count].qmDescReg =
-            NETAPI_GET_REG_VADDRnetapi_VM_VirtAddr->qmssCfgVaddr,
+            NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
                                  QMSS_CFG_BASE_ADDR,
                                  (uint32_t)netapi_qmssGblCfgParams.groupRegs[count].qmDescReg);
 

diff --git a/ti/runtime/netapi/test/build/Makefile b/ti/runtime/netapi/test/build/Makefile
index 483fb0a1ece8c17e39823f3f66578dd896380187..ca172c305a6f148edfa13c76abeab255cdbcc2c9 100755 (executable)
--- a/ti/runtime/netapi/test/build/Makefile
+++ b/ti/runtime/netapi/test/build/Makefile
@@ -42,9 +42,9 @@ PKTUTL_LIB=$(SA_INSTALL_PATH)/ti/mas/pktutl/gcarmv7a/pktutl_c.av7A
 CC = $(CROSS_TOOL_INSTALL_PATH)/$(CROSS_TOOL_PRFX)gcc
 AR = $(CROSS_TOOL_INSTALL_PATH)/$(CROSS_TOOL_PRFX)ar -r
 
-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$(HPLIB_INSTALL_PATH) -I$(TRANS_SDK_INSTALL_PATH) -I$(QMSS_INC_DIR) -I$(CPPI_INC_DIR) -I$(SA_INC_DIR) -D__ARMv7 -D_VIRTUAL_ADDR_SUPPORT -D__LINUX_USER_SPACE -D_LITTLE_ENDIAN=1 -DMAKEFILE_BUILD -pthread -D _GNU_SOURCE
+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$(HPLIB_INSTALL_PATH) -I$(TRANS_SDK_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 -DMAKEFILE_BUILD -D _GNU_SOURCE
 # Linker options
-INTERNALLINKDEFS = --start-group -L$(ARMV7LIBDIR) -L$(PDK_ARMV7LIBDIR) $(NETAPI_LIB) $(PKTLIB_LIB) $(HP_LIB) $(QMSS_LIB) $(CPPI_LIB) $(NWAL_LIB) $(PA_LIB) $(SA_LIB) $(AES_LIB) $(SHA1_LIB) $(PKTUTL_LIB) -lrt --end-group
+INTERNALLINKDEFS = --start-group -L$(ARMV7LIBDIR) -L$(PDK_ARMV7LIBDIR) $(NETAPI_LIB) $(PKTLIB_LIB) $(HP_LIB) $(QMSS_LIB) $(CPPI_LIB) $(NWAL_LIB) $(PA_LIB) $(SA_LIB) $(AES_LIB) $(SHA1_LIB) $(PKTUTL_LIB) -lrt --end-group -pthread 
 
 
 all: tests 

diff --git a/ti/runtime/netapi/test/net_test.c b/ti/runtime/netapi/test/net_test.c
index 7657ec6d13a4408985b956c0d4d65d2551bf736b..3e1b8f1c06ff8c449a110a7c585e69621638d67f 100755 (executable)
--- a/ti/runtime/netapi/test/net_test.c
+++ b/ti/runtime/netapi/test/net_test.c
@@ -2864,7 +2864,7 @@ void fast_path_thread(int coreid)
     printf("fast_path_thread, mypid: %d\n", gettid());
     hplib_Util_SetupCore(coreid, &cpu_set);
     worker_nh[coreid]=netapi_init(NETAPI_NO_MASTER,NULL);
-    netapi_setCookie(worker_nh[coreid],coreid);
+    netapi_setCookie(worker_nh[coreid],(void *)coreid);
     our_core=coreid;
     scheduler[coreid] =netapi_schedOpen(worker_nh[coreid],&our_sched_cfg, &err);
     if (!scheduler[coreid]) {printf("sched create failed for core%d\n",coreid); exit(1);}