diff --git a/lib/sw_apps/lwip_echo_server/src/echo.c b/lib/sw_apps/lwip_echo_server/src/echo.c
index f25722a2..9a3787eb 100644
--- a/lib/sw_apps/lwip_echo_server/src/echo.c
+++ b/lib/sw_apps/lwip_echo_server/src/echo.c
@@ -35,7 +35,7 @@
 
 #include "lwip/err.h"
 #include "lwip/tcp.h"
-#ifdef __arm__
+#if defined (__arm__) || defined (__aarch64__)
 #include "xil_printf.h"
 #endif
 
diff --git a/lib/sw_apps/lwip_echo_server/src/i2c_access.c b/lib/sw_apps/lwip_echo_server/src/i2c_access.c
index 255e4a1e..505bd692 100644
--- a/lib/sw_apps/lwip_echo_server/src/i2c_access.c
+++ b/lib/sw_apps/lwip_echo_server/src/i2c_access.c
@@ -49,7 +49,7 @@
 
 /***************************** Include Files *********************************/
 #include "xparameters.h"
-#ifdef __arm__
+#if defined (__arm__) || defined(__aarch64__)
 #if XPAR_GIGE_PCS_PMA_SGMII_CORE_PRESENT == 1 || \
 	XPAR_GIGE_PCS_PMA_1000BASEX_CORE_PRESENT == 1
 #include "xil_exception.h"
diff --git a/lib/sw_apps/lwip_echo_server/src/main.c b/lib/sw_apps/lwip_echo_server/src/main.c
index f1ce06f0..f710e30d 100644
--- a/lib/sw_apps/lwip_echo_server/src/main.c
+++ b/lib/sw_apps/lwip_echo_server/src/main.c
@@ -38,11 +38,12 @@
 
 #include "platform.h"
 #include "platform_config.h"
-#ifdef __arm__
+#if defined (__arm__) || defined(__aarch64__)
 #include "xil_printf.h"
 #endif
 
 #include "lwip/tcp.h"
+#include "xil_cache.h"
 
 #if LWIP_DHCP==1
 #include "lwip/dhcp.h"
@@ -85,7 +86,7 @@ print_ip_settings(struct ip_addr *ip, struct ip_addr *mask, struct ip_addr *gw)
 	print_ip("Gateway : ", gw);
 }
 
-#ifdef __arm__
+#if defined (__arm__) || defined(__aarch64__)
 #if XPAR_GIGE_PCS_PMA_SGMII_CORE_PRESENT == 1 || XPAR_GIGE_PCS_PMA_1000BASEX_CORE_PRESENT == 1
 int ProgramSi5324(void);
 int ProgramSfpPhy(void);
@@ -93,6 +94,11 @@ int ProgramSfpPhy(void);
 #endif
 int main()
 {
+
+#if __aarch64__
+	Xil_DCacheDisable();
+#endif
+
 	struct ip_addr ipaddr, netmask, gw;
 
 	/* the mac address of the board. this should be unique per board */
@@ -100,7 +106,7 @@ int main()
 	{ 0x00, 0x0a, 0x35, 0x00, 0x01, 0x02 };
 
 	echo_netif = &server_netif;
-#ifdef __arm__
+#if defined (__arm__) || defined(__aarch64__)
 #if XPAR_GIGE_PCS_PMA_SGMII_CORE_PRESENT == 1 || XPAR_GIGE_PCS_PMA_1000BASEX_CORE_PRESENT == 1
 	ProgramSi5324();
 	ProgramSfpPhy();
diff --git a/lib/sw_apps/lwip_echo_server/src/platform_zynqmp.c b/lib/sw_apps/lwip_echo_server/src/platform_zynqmp.c
index 9966bc18..6335ab8e 100644
--- a/lib/sw_apps/lwip_echo_server/src/platform_zynqmp.c
+++ b/lib/sw_apps/lwip_echo_server/src/platform_zynqmp.c
@@ -38,7 +38,7 @@
 * </pre>
  */
 
-#ifdef __arm__
+#if defined (__arm__) || defined (__aarch64__)
 
 #include "xparameters.h"
 #include "xparameters_ps.h"	/* defines XPAR values */
diff --git a/lib/sw_apps/lwip_echo_server/src/sfp.c b/lib/sw_apps/lwip_echo_server/src/sfp.c
index 4db8fecd..8622637d 100644
--- a/lib/sw_apps/lwip_echo_server/src/sfp.c
+++ b/lib/sw_apps/lwip_echo_server/src/sfp.c
@@ -48,7 +48,7 @@
 
 /***************************** Include Files *********************************/
 #include "xparameters.h"
-#ifdef __arm__
+#if defined (__arm__) || defined(__aarch64__)
 #if XPAR_GIGE_PCS_PMA_SGMII_CORE_PRESENT == 1 || \
 	XPAR_GIGE_PCS_PMA_1000BASEX_CORE_PRESENT == 1
 #include "xil_printf.h"
diff --git a/lib/sw_apps/lwip_echo_server/src/si5324.c b/lib/sw_apps/lwip_echo_server/src/si5324.c
index fcf4fe7f..bbc97f34 100644
--- a/lib/sw_apps/lwip_echo_server/src/si5324.c
+++ b/lib/sw_apps/lwip_echo_server/src/si5324.c
@@ -53,7 +53,7 @@
 
 /***************************** Include Files *********************************/
 #include "xparameters.h"
-#ifdef __arm__
+#if defined (__arm__) || defined(__aarch64__)
 #if XPAR_GIGE_PCS_PMA_SGMII_CORE_PRESENT == 1 || \
 	XPAR_GIGE_PCS_PMA_1000BASEX_CORE_PRESENT == 1
 #include "xil_printf.h"