Xilinx · DuzaBF · Aug 30, 2023 · Aug 31, 2023 · Sep 2, 2023 · Sep 1, 2023
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/sw_services/libmetal/data/libmetal.yaml b/ThirdParty/sw_services/libmetal/data/libmetal.yaml
@@ -14,12 +14,14 @@ type: library
 version: 1.0
 
 supported_processors:
+  - ps7_cortexa9
   - psu_cortexa53
   - psv_cortexa72
   - psu_cortexr5
   - psv_cortexr5
-  - psx_cortexa78
   - psx_cortexr52
+  - psu_pmu
+  - psv_pmc
 
 supported_os:
   - standalone

diff --git a/ThirdParty/sw_services/libmetal/src/sdt/lib-CMakeLists.txt b/ThirdParty/sw_services/libmetal/src/sdt/lib-CMakeLists.txt
@@ -0,0 +1,82 @@
+collector_create (PROJECT_LIB_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}")
+collector_create (PROJECT_LIB_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}")
+
+collect (PROJECT_LIB_DIRS "${CMAKE_CURRENT_BINARY_DIR}")
+collect (PROJECT_INC_DIRS "${CMAKE_CURRENT_BINARY_DIR}/include")
+
+collect (PROJECT_LIB_HEADERS alloc.h)
+collect (PROJECT_LIB_HEADERS assert.h)
+collect (PROJECT_LIB_HEADERS atomic.h)
+collect (PROJECT_LIB_HEADERS cache.h)
+collect (PROJECT_LIB_HEADERS compiler.h)
+collect (PROJECT_LIB_HEADERS condition.h)
+collect (PROJECT_LIB_HEADERS config.h)
+collect (PROJECT_LIB_HEADERS cpu.h)
+collect (PROJECT_LIB_HEADERS device.h)
+collect (PROJECT_LIB_HEADERS errno.h)
+collect (PROJECT_LIB_HEADERS dma.h)
+collect (PROJECT_LIB_HEADERS io.h)
+collect (PROJECT_LIB_HEADERS irq.h)
+collect (PROJECT_LIB_HEADERS irq_controller.h)
+collect (PROJECT_LIB_HEADERS list.h)
+collect (PROJECT_LIB_HEADERS log.h)
+collect (PROJECT_LIB_HEADERS mutex.h)
+collect (PROJECT_LIB_HEADERS shmem.h)
+collect (PROJECT_LIB_HEADERS sleep.h)
+collect (PROJECT_LIB_HEADERS softirq.h)
+collect (PROJECT_LIB_HEADERS spinlock.h)
+collect (PROJECT_LIB_HEADERS sys.h)
+collect (PROJECT_LIB_HEADERS time.h)
+collect (PROJECT_LIB_HEADERS utilities.h)
+collect (PROJECT_LIB_HEADERS version.h)
+
+collect (PROJECT_LIB_SOURCES dma.c)
+collect (PROJECT_LIB_SOURCES device.c)
+collect (PROJECT_LIB_SOURCES init.c)
+collect (PROJECT_LIB_SOURCES io.c)
+collect (PROJECT_LIB_SOURCES irq.c)
+collect (PROJECT_LIB_SOURCES log.c)
+collect (PROJECT_LIB_SOURCES shmem.c)
+collect (PROJECT_LIB_SOURCES softirq.c)
+collect (PROJECT_LIB_SOURCES version.c)
+
+add_subdirectory (compiler)
+add_subdirectory (processor)
+add_subdirectory (system)
+
+collector_list (_inc_dirs PROJECT_INC_DIRS)
+collector_list (_sources PROJECT_LIB_SOURCES)
+collector_list (_headers PROJECT_LIB_HEADERS)
+collector_list (_deps PROJECT_LIB_DEPS)
+
+foreach (f ${_headers})
+  configure_file (${f} include/${PROJECT_NAME}/${f} @ONLY)
+  install (FILES ${CMAKE_CURRENT_BINARY_DIR}/include/${PROJECT_NAME}/${f}
+           DESTINATION ${CMAKE_INCLUDE_PATH} RENAME ${PROJECT_NAME}/${f})
+  if (${f} MATCHES "^[^/]*\\.h")
+    collect (PROJECT_HDR_TESTS "metal/${f}")
+  endif (${f} MATCHES "^[^/]*\\.h")
+endforeach (f)
+
+include_directories (${_inc_dirs})
+add_definitions (-DMETAL_INTERNAL)
+
+if (WITH_DEFAULT_LOGGER)
+  add_definitions (-DDEFAULT_LOGGER_ON)
+endif (WITH_DEFAULT_LOGGER)
+
+get_property (_ec_flgs GLOBAL PROPERTY "PROJECT_EC_FLAGS")
+
+set (_lib ${PROJECT_NAME})
+
+
+add_library (${_lib} STATIC ${_sources})
+install (TARGETS ${_lib} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+target_compile_options (${_lib} PUBLIC ${_ec_flgs})
+
+set_target_properties (${_lib} PROPERTIES OUTPUT_NAME  "${_lib}")
+
+set_target_properties(${_lib} PROPERTIES ADDITIONAL_CLEAN_FILES "${CMAKE_LIBRARY_PATH}/${_lib}.a;${CMAKE_INCLUDE_PATH}/metal;${clean_headers};${CMAKE_LIBRARY_PATH}/libmetal.a")
+install(TARGETS ${_lib} LIBRARY DESTINATION ${CMAKE_LIBRARY_PATH} ARCHIVE DESTINATION ${CMAKE_LIBRARY_PATH})
+
+# vim: expandtab:ts=2:sw=2:smartindent
diff --git a/ThirdParty/sw_services/libmetal/src/sdt/top-CMakeLists.txt b/ThirdParty/sw_services/libmetal/src/sdt/top-CMakeLists.txt
@@ -15,6 +15,11 @@ list (APPEND CMAKE_MODULE_PATH
       "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
       "${CMAKE_CURRENT_SOURCE_DIR}/cmake/platforms")
 
+string(REGEX MATCH "a9" a9 "${CMAKE_SYSTEM_PROCESSOR}")
+if (a9)
+  set(MACHINE "zynq7" CACHE STRING "" FORCE)
+  set (CMAKE_SYSTEM_PROCESSOR "arm" CACHE STRING "" FORCE)
+endif()
 
 string(REGEX MATCH "a53" a53 "${CMAKE_SYSTEM_PROCESSOR}")
 if (a53)
@@ -31,6 +36,15 @@ if (a78)
   set(MACHINE "zynqmp_a78" CACHE STRING "" FORCE)
 endif()
 
+string(REGEX MATCH "microblaze" mb "${CMAKE_SYSTEM_PROCESSOR}")
+string(REGEX MATCH "pmu" pmu "${CMAKE_SYSTEM_PROCESSOR}")
+string(REGEX MATCH "pmc" pmc "${CMAKE_SYSTEM_PROCESSOR}")
+if (mb OR pmu OR pmc)
+  set(MACHINE "microblaze_generic" CACHE STRING "" FORCE)
+  set (CROSS_PREFIX "mb-" CACHE STRING "" FORCE)
+  set (CMAKE_SYSTEM_PROCESSOR "microblaze" CACHE STRING "" FORCE)
+endif()
+
 if (a53 OR a72 OR a78)
   set (CROSS_PREFIX "aarch64-none-elf-" CACHE STRING "" FORCE)
   set (CMAKE_SYSTEM_PROCESSOR "aarch64" CACHE STRING "" FORCE)

diff --git a/ThirdParty/sw_services/lwip213/src/CMakeLists.txt b/ThirdParty/sw_services/lwip213/src/CMakeLists.txt
@@ -63,6 +63,6 @@ add_library(lwip213 STATIC ${_sources})
 target_include_directories(lwip213 PUBLIC ${LWIP_INCLUDE_DIRS} "${LWIP_DIR}/src/include/lwip/")
 set_target_properties(lwip213 PROPERTIES LINKER_LANGUAGE C)
 get_headers(${_headers})
-set_target_properties(lwip213 PROPERTIES ADDITIONAL_CLEAN_FILES "${CMAKE_LIBRARY_PATH}/liblwip211.a;${CMAKE_INCLUDE_PATH}/lwipopts.h;${CMAKE_INCLUDE_PATH}/xlwipconfig.h;${clean_headers}")
+set_target_properties(lwip213 PROPERTIES ADDITIONAL_CLEAN_FILES "${CMAKE_LIBRARY_PATH}/liblwip213.a;${CMAKE_INCLUDE_PATH}/lwipopts.h;${CMAKE_INCLUDE_PATH}/xlwipconfig.h;${clean_headers}")
 install(TARGETS lwip213 LIBRARY DESTINATION ${CMAKE_LIBRARY_PATH} ARCHIVE DESTINATION ${CMAKE_LIBRARY_PATH})
 install(DIRECTORY ${CMAKE_BINARY_DIR}/include DESTINATION ${CMAKE_INCLUDE_PATH}/..)
diff --git a/ThirdParty/sw_services/openamp/data/openamp.yaml b/ThirdParty/sw_services/openamp/data/openamp.yaml
@@ -14,11 +14,9 @@ type: library
 version: 1.0
 
 supported_processors:
-  - psv_cortexa72
-  - psu_cortexa53
+  - ps7_cortexa9
   - psu_cortexr5
   - psv_cortexr5
-  - psx_cortexa78
   - psx_cortexr52
 
 supported_os:

diff --git a/ThirdParty/sw_services/openamp/src/sdt/lib-CMakeLists.txt b/ThirdParty/sw_services/openamp/src/sdt/lib-CMakeLists.txt
@@ -0,0 +1,46 @@
+
+set_property (GLOBAL PROPERTY "PROJECT_LIB_EXTRA_CFLAGS")
+
+collector_create (PROJECT_LIB_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}")
+collect (PROJECT_LIB_DIRS "${CMAKE_CURRENT_BINARY_DIR}")
+collect (PROJECT_INC_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/include")
+collect (PROJECT_LIB_SOURCES version.c)
+
+
+add_subdirectory (virtio)
+add_subdirectory (rpmsg)
+add_subdirectory (remoteproc)
+
+if (WITH_PROXY)
+  add_subdirectory (proxy)
+  add_subdirectory (service/rpmsg/rpc)
+endif (WITH_PROXY)
+
+set (OPENAMP_LIB open_amp)
+
+configure_file(version.h.in ${PROJECT_BINARY_DIR}/include/generated/openamp/version_def.h)
+collect (PROJECT_INC_DIRS " ${PROJECT_BINARY_DIR}/include/generated/openamp")
+
+if (NOT CMAKE_INSTALL_LIBDIR)
+	set (CMAKE_INSTALL_LIBDIR "lib")
+endif (NOT CMAKE_INSTALL_LIBDIR)
+
+collector_list (_include PROJECT_INC_DIRS)
+include_directories (${_include})
+
+collector_list (_deps PROJECT_LIB_DEPS)
+
+get_property (_ecflags GLOBAL PROPERTY "PROJECT_LIB_EXTRA_CFLAGS")
+
+collector_list (_sources PROJECT_LIB_SOURCES)
+set_property (SOURCE ${_sources}
+  APPEND_STRING PROPERTY COMPILE_FLAGS " ${_ecflags}")
+
+add_library (${OPENAMP_LIB} STATIC ${_sources})
+set_target_properties (${OPENAMP_LIB} PROPERTIES OUTPUT_NAME  "${OPENAMP_LIB}")
+
+install (DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/openamp" DESTINATION ${CMAKE_INCLUDE_PATH})
+install (DIRECTORY "${PROJECT_BINARY_DIR}/include/generated/openamp" DESTINATION ${CMAKE_INCLUDE_PATH})
+
+set_target_properties(${OPENAMP_LIB} PROPERTIES ADDITIONAL_CLEAN_FILES "${CMAKE_LIBRARY_PATH}/${OPENAMP_LIB}.a;${CMAKE_INCLUDE_PATH}/openamp;${clean_headers};${CMAKE_LIBRARY_PATH}/libopen_amp.a")
+install(TARGETS ${OPENAMP_LIB} LIBRARY DESTINATION ${CMAKE_LIBRARY_PATH} ARCHIVE DESTINATION ${CMAKE_LIBRARY_PATH})
diff --git a/ThirdParty/sw_services/openamp/src/sdt/top-CMakeLists.txt b/ThirdParty/sw_services/openamp/src/sdt/top-CMakeLists.txt
@@ -26,6 +26,12 @@ list (APPEND CMAKE_MODULE_PATH
   "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
   "${CMAKE_CURRENT_SOURCE_DIR}/cmake/platforms")
 
+string(REGEX MATCH "a9" a9 "${CMAKE_SYSTEM_PROCESSOR}")
+if (a9)
+  set(MACHINE "zynq7" CACHE STRING "" FORCE)
+  set (CMAKE_SYSTEM_PROCESSOR "arm" CACHE STRING "" FORCE)
+endif()
+
 if (a53)
   set(MACHINE "zynqmp_a53" CACHE STRING "" FORCE)
 endif()
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