Merge pull request #4 in PROCESSOR-SDK/pdk from review_PRSDK-7310 to master
authorMahesh Radhakrishnan <a0875154@ti.com>
Wed, 13 Nov 2019 19:58:35 +0000 (13:58 -0600)
committerMahesh Radhakrishnan <a0875154@ti.com>
Wed, 13 Nov 2019 19:58:35 +0000 (13:58 -0600)
* commit '179e7631fee079f7636e07349581bbb490fe2858':
  Inclusion of fw config files only required for ICSSG use case
  Fix package issue for emac_ioctl.h
  PRSDK-7310: emac: Remove compile of ICSSG test app and FW for J7

packages/ti/drv/emac/build/makefile.mk
packages/ti/drv/emac/emac_component.mk
packages/ti/drv/emac/test/EmacLoopbackTest/test_utils_k3.c

index 19ebb140641ea80d886e6bcf0acba38c8c8ffd19..15b17e01f9f45cf197271123ad0a6b9a5332864b 100644 (file)
@@ -60,7 +60,7 @@ ifeq ($(MAKERULEDIR), )
 endif
 include $(MAKERULEDIR)/common.mk
 
-ifeq ($(SOC), $(filter $(SOC), am65xx j721e))
+ifeq ($(SOC), $(filter $(SOC), am65xx))
 ifeq ($(CORE), $(filter $(CORE), mpu1_0))
 .PHONY: dualmac_fw
 
index e40bcb6229bff98598b34abeca8be5ae9cc2f49c..be90f56c3e0b0da13487b7ef9fa8dbe405a477a4 100644 (file)
@@ -220,26 +220,19 @@ Emac_Icssg_TestApp_PATH = $(PDK_EMAC_COMP_PATH)/test/EmacLoopbackTest
 Emac_Icssg_TestApp_BOARD_DEPENDENCY = yes
 Emac_Icssg_TestApp_CORE_DEPENDENCY = no
 Emac_Icssg_TestApp_XDC_CONFIGURO = yes
-ifeq ($(SOC),$(filter $(SOC), j721e))
-Emac_Icssg_TestApp_MAKEFILE = -f j721e/icssg/makefile_dualmac
-else
 Emac_Icssg_TestApp_MAKEFILE = -f am65xx/icssg/makefile_dualmac
-endif
 export Emac_Icssg_TestApp_MAKEFILE
 export Emac_Icssg_TestApp_board_dependency
 export Emac_Icssg_TestApp_core_dependency
 export Emac_Icssg_TestApp_xdc_configuro
 Emac_Icssg_TestApp_PKG_LIST = Emac_Icssg_TestApp
 Emac_Icssg_TestApp_INCLUDE = $(Emac_Icssg_TestApp_PATH)
-Emac_Icssg_TestApp_BOARDLIST = am65xx_evm am65xx_idk j721e_sim j721e_evm
+Emac_Icssg_TestApp_BOARDLIST = am65xx_evm am65xx_idk
 export Emac_Icssg_TestApp_BOARDLIST
 Emac_Icssg_TestApp_$(SOC)_CORELIST = $(drvemac_$(SOC)_CORELIST)
 export Emac_Icssg_TestApp_$(SOC)_CORELIST
 
 Emac_Icssg_TestApp_SBL_APPIMAGEGEN = yes
-ifeq ($(SOC),$(filter $(SOC), j721e))
-Emac_Icssg_TestApp_SBL_APPIMAGEGEN = no
-endif
 export Emac_Icssg_TestApp_SBL_APPIMAGEGEN
 
 # EMAC unit test app CPSW
index c6ea8ca9c0f9a6a0978138428f64be3ebce37b94..b145c7c43949dbcdbe41a0db02a321d10fa339b2 100644 (file)
@@ -58,8 +58,6 @@
 
 #include <ti/drv/emac/src/emac_osal.h>
 #include <ti/drv/emac/emac_ioctl.h>
-#include <ti/drv/emac/firmware/icss_dualmac/config/emac_fw_config_dual_mac.h>
-#include <ti/drv/emac/firmware/icss_switch/config/emac_fw_config_switch.h>
 /* SOC Include Files. */
 #include <ti/drv/emac/soc/emac_soc_v5.h>
 
@@ -76,6 +74,8 @@
 #endif
 
 #ifdef EMAC_TEST_APP_ICSSG
+#include <ti/drv/emac/firmware/icss_dualmac/config/emac_fw_config_dual_mac.h>
+#include <ti/drv/emac/firmware/icss_switch/config/emac_fw_config_switch.h>
 /* PRUSS Driver Header File. */
 #include <ti/drv/pruss/pruicss.h>
 #include <ti/drv/pruss/soc/pruicss_v1.h>
@@ -1208,6 +1208,7 @@ int32_t app_test_send_receive(uint32_t startP, uint32_t endP, uint32_t displayRe
     return status;
 }
 
+#ifdef EMAC_TEST_APP_ICSSG
 #define TX_BUFF_POOL_SIZE 0X1800u
 #define TX_BUFF_POOL_TOTAL_DUAL_MAC (TX_BUFF_POOL_SIZE + 0x80) * 8U /* //50176 per PORT, total of 100352 */
 void app_test_setup_fw_dualmac(uint32_t port_num, EMAC_HwAttrs_V5 *pEmacCfg)
@@ -1231,6 +1232,7 @@ void app_test_setup_fw_dualmac(uint32_t port_num, EMAC_HwAttrs_V5 *pEmacCfg)
     pEmacCfg->portCfg[port_num].getFwCfg = &emacGetDualMacFwConfig;
 
 }
+#endif
 
 int32_t app_test_emac_open(uint32_t mode)
 {