lib: generic: zynqmp_a78: Add support for versal_net a78 platform wit…

…h System Device Tree workflow System Device Tree workflow is AMD-Xilinx workflow whereby the BSP, libraries and applications in software are derived from a hardware-design. The hardware-design is used to generate a system device tree (SDT) that describes information for Linux and other processing environments. The xreg/xcpu files are not generated for SDT workflow. Because of this do not include if SDT symbol is present in BSP. Signed-off-by: Ben Levinsky <[email protected]>
OpenAMP · Sep 11, 2023 · c695e5f · c695e5f
1 parent b259a34
commit c695e5f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/lib/system/generic/xlnx_common/CMakeLists.txt b/lib/system/generic/xlnx_common/CMakeLists.txt
@@ -2,8 +2,8 @@ collect (PROJECT_LIB_HEADERS sys.h)
 
 collect (PROJECT_LIB_SOURCES irq.c)
 
-if ("${PROJECT_MACHINE}" STREQUAL "zynqmp_a53" OR "${PROJECT_MACHINE}" STREQUAL "zynqmp_a72")
+if ("${PROJECT_MACHINE}" STREQUAL "zynqmp_a53" OR "${PROJECT_MACHINE}" STREQUAL "zynqmp_a72" OR "${PROJECT_MACHINE}" STREQUAL "zynqmp_a78")
   add_subdirectory(zynqmp_aarch64)
-endif ("${PROJECT_MACHINE}" STREQUAL "zynqmp_a53" OR "${PROJECT_MACHINE}" STREQUAL "zynqmp_a72")
+  endif ("${PROJECT_MACHINE}" STREQUAL "zynqmp_a53" OR "${PROJECT_MACHINE}" STREQUAL "zynqmp_a72" OR "${PROJECT_MACHINE}" STREQUAL "zynqmp_a78")
 
 # vim: expandtab:ts=2:sw=2:smartindent
diff --git a/lib/system/generic/xlnx_common/zynqmp_aarch64/sys.c b/lib/system/generic/xlnx_common/zynqmp_aarch64/sys.c
@@ -19,13 +19,17 @@
 #include "xil_mmu.h"
 #include "xscugic.h"
 
+/* System Device Tree (SDT) flow does not have the files generated. */
+#ifndef SDT
+
 #ifdef VERSAL_NET
 #include "xcpu_cortexa78.h"
 #elif defined(versal)
 #include "xcpu_cortexa72.h"
 #else
 #include "xreg_cortexa53.h"
 #endif /* defined(versal) */
+#endif /* !SDT */
 
 void sys_irq_restore_enable(unsigned int flags)
 {