Xilinx · Tosainu · Sep 25, 2024 · Sep 25, 2024 · Sep 25, 2024 · Sep 23, 2024
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -0,0 +1,2 @@
+Please do not submit a Pull Request via github. Our project makes use of mailing lists for patch submission and review. For more details please see https://xilinx-wiki.atlassian.net/wiki/spaces/A/pages/18842172/Create+and+Submit+a+Patch
+
diff --git a/ThirdParty/bsp/freertos10_xilinx/src/FreeRTOSConfig.h.in b/ThirdParty/bsp/freertos10_xilinx/src/FreeRTOSConfig.h.in
@@ -1,5 +1,5 @@
 /******************************************************************************
-* Copyright (c) 2023 Advanced Micro Devices, Inc. All Rights Reserved.
+* Copyright (c) 2023-2024 Advanced Micro Devices, Inc. All Rights Reserved.
 * SPDX-License-Identifier: MIT
 ******************************************************************************/
 #ifndef _FREERTOSCONFIG_H
@@ -22,7 +22,7 @@
 #cmakedefine01	configUSE_NEWLIB_REENTRANT		@configUSE_NEWLIB_REENTRANT@
 #cmakedefine01	configUSE_QUEUE_SETS			@configUSE_QUEUE_SETS@
 #cmakedefine01	configUSE_TASK_NOTIFICATIONS		@configUSE_TASK_NOTIFICATIONS@
-#cmakedefine01	configUSE_STATS_FORMATTING_FUNCTION	@configUSE_STATS_FORMATTING_FUNCTION@
+#cmakedefine01	configUSE_STATS_FORMATTING_FUNCTIONS	@configUSE_STATS_FORMATTING_FUNCTIONS@
 #cmakedefine01	configUSE_IDLE_HOOK			@configUSE_IDLE_HOOK@
 #cmakedefine01	configUSE_TICK_HOOK			@configUSE_TICK_HOOK@
 #cmakedefine01	configUSE_MALLOC_FAILED_HOOK		@configUSE_MALLOC_FAILED_HOOK@

diff --git a/ThirdParty/bsp/freertos10_xilinx/src/Source/portable/GCC/MicroBlazeV9/portmacro.h b/ThirdParty/bsp/freertos10_xilinx/src/Source/portable/GCC/MicroBlazeV9/portmacro.h
@@ -163,9 +163,6 @@ __attribute__( ( always_inline ) ) static inline uint8_t ucPortCountLeadingZeros
 #define portMEMORY_BARRIER() 				asm volatile( "" ::: "memory" )
 /*-----------------------------------------------------------*/
 
-#if( XPAR_MICROBLAZE_USE_STACK_PROTECTION )
-#define portHAS_STACK_OVERFLOW_CHECKING 1
-#endif
 /*-----------------------------------------------------------*/
 
 /* Task function macros as described on the FreeRTOS.org WEB site. */

diff --git a/ThirdParty/bsp/freertos10_xilinx/src/freertos10_xilinx.cmake b/ThirdParty/bsp/freertos10_xilinx/src/freertos10_xilinx.cmake
@@ -286,7 +286,7 @@ if (${freertos_use_task_notifications})
     set(configUSE_TASK_NOTIFICATIONS " ")
 endif()
 if (${freertos_use_stats_formatting_functions})
-    set(configUSE_STATS_FORMATTING_FUNCTION " ")
+    set(configUSE_STATS_FORMATTING_FUNCTIONS " ")
 endif()
 if (${freertos_use_idle_hook})
     set(configUSE_IDLE_HOOK " ")

diff --git a/ThirdParty/sw_services/lwip220/src/lwip-2.2.0/contrib/ports/xilinx/include/lwipopts.h.in b/ThirdParty/sw_services/lwip220/src/lwip-2.2.0/contrib/ports/xilinx/include/lwipopts.h.in
@@ -57,6 +57,7 @@
 
 #cmakedefine LWIP_UDP @LWIP_UDP@
 #cmakedefine UDP_TTL @UDP_TTL@
+#cmakedefine LWIP_UDP_OPT_BLOCK_TX_TILL_COMPLETE @LWIP_UDP_OPT_BLOCK_TX_TILL_COMPLETE@
 
 #cmakedefine LWIP_TCP @LWIP_TCP@
 #cmakedefine TCP_MSS @TCP_MSS@

diff --git a/ThirdParty/sw_services/lwip220/src/lwip-2.2.0/contrib/ports/xilinx/netif/xadapter.c b/ThirdParty/sw_services/lwip220/src/lwip-2.2.0/contrib/ports/xilinx/netif/xadapter.c
@@ -93,7 +93,7 @@ find_mac_type(unsigned base)
 	int i;
 
 #ifdef SDT
-	for (i = 0; xtopology[i].emac_baseaddr != NULL; i++) {
+	for (i = 0; xtopology[i].emac_baseaddr != 0; i++) {
 #else
 	for (i = 0; i < xtopology_n_emacs; i++) {
 #endif
@@ -109,7 +109,7 @@ xtopology_find_index(unsigned base)
 {
 	int i;
 #ifdef SDT
-	for (i = 0; xtopology[i].emac_baseaddr != NULL; i++) {
+	for (i = 0; xtopology[i].emac_baseaddr != 0; i++) {
 #else
 	for (i = 0; i < xtopology_n_emacs; i++) {
 #endif
@@ -483,6 +483,8 @@ void eth_link_detect(struct netif *netif)
 	axieth_link_status(netif, xaxiemac, xaxiemacp);
 #endif
 			break;
+		default:
+			break;
 	}
 }
 

diff --git a/ThirdParty/sw_services/lwip220/src/lwip-2.2.0/contrib/ports/xilinx/netif/xaxiemacif_dma.c b/ThirdParty/sw_services/lwip220/src/lwip-2.2.0/contrib/ports/xilinx/netif/xaxiemacif_dma.c
@@ -505,7 +505,9 @@ s32_t process_sent_bds(XAxiDma_BdRing *txring)
 {
 	XAxiDma_Bd *txbdset, *txbd;
 	int n_bds, i;
+#if LWIP_UDP_OPT_BLOCK_TX_TILL_COMPLETE
 	u32_t bdindex;
+#endif
 
 	/* obtain a list of processed BD's */
 	n_bds = XAxiDma_BdRingFromHw(txring, XAXIDMA_ALL_BDS, &txbdset);
@@ -514,7 +516,9 @@ s32_t process_sent_bds(XAxiDma_BdRing *txring)
 	}
 	/* free the pbuf associated with each BD */
 	for (i = 0, txbd = txbdset; i < n_bds; i++) {
+#if LWIP_UDP_OPT_BLOCK_TX_TILL_COMPLETE
 		bdindex = XAxiDma_BD_TO_INDEX(txring, txbd);
+#endif
 		struct pbuf *p = (struct pbuf *)(UINTPTR)XAxiDma_BdGetId(txbd);
 		pbuf_free(p);
 #if LWIP_UDP_OPT_BLOCK_TX_TILL_COMPLETE
@@ -539,7 +543,9 @@ XStatus axidma_sgsend(xaxiemacif_s *xaxiemacif, struct pbuf *p)
 	XStatus status;
 	XAxiDma_BdRing *txring;
 	u32_t max_frame_size;
+#if LWIP_UDP_OPT_BLOCK_TX_TILL_COMPLETE
 	u32_t bdindex = 0;
+#endif
 
 #ifdef USE_JUMBO_FRAMES
 	max_frame_size = XAE_MAX_JUMBO_FRAME_SIZE - 18;
@@ -560,7 +566,9 @@ XStatus axidma_sgsend(xaxiemacif_s *xaxiemacif, struct pbuf *p)
 	}
 
 	for(q = p, txbd = txbdset; q != NULL; q = q->next) {
+#if LWIP_UDP_OPT_BLOCK_TX_TILL_COMPLETE
 		bdindex = XAxiDma_BD_TO_INDEX(txring, txbd);
+#endif
 		/* Send the data from the pbuf to the interface, one pbuf at a
 		 * time. The size of the data in each pbuf is kept in the ->len
 		 * variable.
@@ -657,7 +665,9 @@ XStatus init_axi_dma(struct xemac_s *xemac)
 	struct pbuf *p;
 	XStatus status;
 	u32_t i;
+#if !defined(__MICROBLAZE__) && !defined(__riscv__)
 	u32_t bd_space_index = 0;
+#endif
 	UINTPTR baseaddr;
 
 	xaxiemacif_s *xaxiemacif = (xaxiemacif_s *)(xemac->state);

diff --git a/...Party/sw_services/lwip220/src/lwip-2.2.0/contrib/ports/xilinx/netif/xaxiemacif_physpeed.c b/...Party/sw_services/lwip220/src/lwip-2.2.0/contrib/ports/xilinx/netif/xaxiemacif_physpeed.c
@@ -625,6 +625,8 @@ unsigned get_IEEE_phy_speed(XAxiEthernet *xaxiemacp)
 	if (isphy_pcspma(xaxiemacp, phy_addr)) {
 		return get_phy_negotiated_speed(xaxiemacp, phy_addr);
 	}
+
+	return 0;
 }
 
 unsigned configure_IEEE_phy_speed(XAxiEthernet *xaxiemacp, unsigned speed)

diff --git a/ThirdParty/sw_services/lwip220/src/lwip-2.2.0/contrib/ports/xilinx/netif/xemacpsif_dma.c b/ThirdParty/sw_services/lwip220/src/lwip-2.2.0/contrib/ports/xilinx/netif/xemacpsif_dma.c
@@ -69,7 +69,10 @@
 static UINTPTR tx_pbufs_storage[4*XLWIP_CONFIG_N_TX_DESC];
 static UINTPTR rx_pbufs_storage[4*XLWIP_CONFIG_N_RX_DESC];
 
+#ifndef SDT
 static s32_t emac_intr_num;
+#endif
+
 #if LWIP_UDP_OPT_BLOCK_TX_TILL_COMPLETE
 volatile u32_t notifyinfo[4*XLWIP_CONFIG_N_TX_DESC];
 #endif
@@ -620,7 +623,9 @@ XStatus init_dma(struct xemac_s *xemac)
 	u32 *temp;
 
 	xemacpsif_s *xemacpsif = (xemacpsif_s *)(xemac->state);
+#ifndef SDT
 	struct xtopology_t *xtopologyp = &xtopology[xemac->topology_index];
+#endif
 
 	index = get_base_index_rxpbufsstorage (xemacpsif);
 	gigeversion = ((Xil_In32(xemacpsif->emacps.Config.BaseAddress + 0xFC)) >> 16) & 0xFFF;

diff --git a/ThirdParty/sw_services/lwip220/src/lwip-2.2.0/contrib/ports/xilinx/sys_arch.c b/ThirdParty/sw_services/lwip220/src/lwip-2.2.0/contrib/ports/xilinx/sys_arch.c
@@ -175,7 +175,7 @@ portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
 	}
 	else
 	{
-		LWIP_DEBUGF(NETIF_DEBUGF, ("Queue is full\r\n"));
+		LWIP_DEBUGF(NETIF_DEBUG, ("Queue is full\r\n"));
 		/* The queue was already full. */
 		xReturn = ERR_MEM;
 		SYS_STATS_INC( mbox.err );

diff --git a/ThirdParty/sw_services/lwip220/src/lwip220.cmake b/ThirdParty/sw_services/lwip220/src/lwip220.cmake
@@ -72,6 +72,7 @@ option(lwip220_igmp_options "IGMP Options" OFF)
 option(lwip220_udp_options "UDP Options" ON)
 option(lwip220_udp "Is UDP required" ON)
 set(lwip220_udp_ttl 255 CACHE STRING "UDP TTL value")
+option(lwip220_udp_block_tx "Application sending a UDP packet blocks till the pkt is txed" OFF)
 
 option(lwip220_tcp_options "Is TCP required ?" ON)
 option(lwip220_tcp "Is TCP required ?" ON)
@@ -159,7 +160,11 @@ set(ICMP_TTL ${lwip220_icmp_ttl})
 if (${lwip220_ipv6_enable})
    set(LWIP_IPV6 " ")
 endif()
-set(LWIP_IGMP ${lwip220_igmp_options})
+
+#IGMP options
+if (${lwip220_igmp_options})
+    set(LWIP_IGMP 1)
+endif()
 
 #IP options
 set(IP_OPTIONS ${lwip220_ip_options})
@@ -173,10 +178,28 @@ set(IP_DEFAULT_TTL ${lwip220_ip_default_ttl})
 #UDP options
 if (${lwip220_udp})
     set(LWIP_UDP 1)
+else()
+    set(LWIP_UDP 0)
 endif()
 
 set(UDP_TTL ${lwip220_udp_ttl})
 
+# Check for UDP Block TX till complete
+if (${LWIP_UDP} EQUAL 0)
+    if (${lwip220_udp_block_tx})
+        message(WARNING "UDP block on TX is set but UDP is disabled. Disabling the block on TX flag.")
+        set(LWIP_UDP_OPT_BLOCK_TX_TILL_COMPLETE 0)
+    else()
+        set(LWIP_UDP_OPT_BLOCK_TX_TILL_COMPLETE 0)
+    endif()
+else()
+    if (${lwip220_udp_block_tx})
+        set(LWIP_UDP_OPT_BLOCK_TX_TILL_COMPLETE 1)
+    else()
+        set(LWIP_UDP_OPT_BLOCK_TX_TILL_COMPLETE 0)
+    endif()
+endif()
+
 #TCP options
 if (${lwip220_tcp})
     set(LWIP_TCP 1)

diff --git a/ThirdParty/sw_services/openamp/data/openamp.mld b/ThirdParty/sw_services/openamp/data/openamp.mld
@@ -19,7 +19,7 @@ BEGIN LIBRARY openamp
   OPTION COPYFILES = all;
   OPTION REQUIRES_OS = (standalone freertos10_xilinx);
   OPTION supported_peripherals = (psu_cortexr5 psv_cortexr5 psx_cortexr52 psxl_cortexr52);
-  OPTION DEPENDS = (libmetal_v2_7);
+  OPTION DEPENDS = (libmetal_v2_8);
   OPTION APP_LINKER_FLAGS = "-Wl,--start-group,-lxil,-lmetal,-lopen_amp,-lgcc,-lc,--end-group";
   OPTION APP_COMPILER_FLAGS = "-Os";
   OPTION DESC = "OpenAmp Library";

diff --git a/XilinxProcessorIPLib/drivers/CMakeLists.txt b/XilinxProcessorIPLib/drivers/CMakeLists.txt
@@ -20,12 +20,20 @@ FOREACH(DRIVER ${DRIVER_LIST})
 	set(drv_archive ${CMAKE_BINARY_DIR}/libsrc/${DRIVER}/src/lib${DRIVER}.a)
 	if (NOT (${drv_archive} IN_LIST OBJS))
 	    list(APPEND OBJS ${drv_archive})
-	    list(APPEND xil_mri "addlib ${drv_archive}\n")
 	endif()
     endforeach()
 ENDFOREACH()
-list(APPEND xil_mri "\"save\"\n")
-list(APPEND xil_mri "\"end\"\n")
+
+# Reverse the OBJS list to ensure correct order
+list(REVERSE OBJS)
+
+# Append the reversed OBJS to xil_mri
+foreach(drv_archive ${OBJS})
+    list(APPEND xil_mri "addlib ${drv_archive}\n")
+endforeach()
+
+list(APPEND xil_mri "save\n")
+list(APPEND xil_mri "end\n")
 file(WRITE ${CMAKE_BINARY_DIR}/libxil.mri ${xil_mri})
 
 set(XIL_LIB ${CMAKE_BINARY_DIR}/libxil.a)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Please do not submit a Pull Request via github. Our project makes use of mailing lists for patch submission and review. For more details please see https://xilinx-wiki.atlassian.net/wiki/spaces/A/pages/18842172/Create+and+Submit+a+Patch