From 65c362b2bbfc50071aa812dd9160b46b5b72df99 Mon Sep 17 00:00:00 2001 From: Ben Levinsky Date: Tue, 16 Jul 2024 15:08:52 -0700 Subject: [PATCH 1/3] lib: xlnx: Update logic to pull in vendor-specific logic based on PROJECT_VENDOR Simplify logic that coordinates when to pull in Xilinx-AMD BSP and setup code basedd on new CMake variable 'PROJECT_VENDOR'. Add PROJECT_VENDOR check in cmake/options.cmake for case where PROJECT_VENDOR is not defined. Signed-off-by: Ben Levinsky --- cmake/options.cmake | 12 ++++++------ lib/system/freertos/CMakeLists.txt | 14 ++++---------- lib/system/generic/CMakeLists.txt | 12 +++--------- 3 files changed, 13 insertions(+), 25 deletions(-) diff --git a/cmake/options.cmake b/cmake/options.cmake index a3216a77..1c776536 100644 --- a/cmake/options.cmake +++ b/cmake/options.cmake @@ -75,11 +75,11 @@ option (WITH_DOC "Build with documentation" ON) set_property (GLOBAL PROPERTY "PROJECT_EC_FLAGS" -Wall -Werror -Wextra) -if ("${PROJECT_MACHINE}" STREQUAL "zynqmp_a53" OR - "${PROJECT_MACHINE}" STREQUAL "zynqmp_a72" OR - "${PROJECT_MACHINE}" STREQUAL "zynqmp_a78" OR - "${PROJECT_MACHINE}" STREQUAL "zynqmp_r5" OR - "${PROJECT_MACHINE}" STREQUAL "microblaze_generic" OR - "${PROJECT_MACHINE}" STREQUAL "zynq7") +if (NOT DEFINED PROJECT_VENDOR) +set (PROJECT_VENDOR "none") +endif (NOT DEFINED PROJECT_VENDOR) +message ("-- Vendor: ${PROJECT_VENDOR}") + +if (${PROJECT_VENDOR} STREQUAL xlnx) add_definitions( -DXLNX_PLATFORM ) endif() diff --git a/lib/system/freertos/CMakeLists.txt b/lib/system/freertos/CMakeLists.txt index c4f56a46..9d31aa32 100644 --- a/lib/system/freertos/CMakeLists.txt +++ b/lib/system/freertos/CMakeLists.txt @@ -17,14 +17,8 @@ collect (PROJECT_LIB_SOURCES irq.c) collect (PROJECT_LIB_SOURCES shmem.c) collect (PROJECT_LIB_SOURCES time.c) -if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_MACHINE}) +if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_VENDOR}) + add_subdirectory(${PROJECT_VENDOR}) +elseif(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_MACHINE}) add_subdirectory(${PROJECT_MACHINE}) -endif (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_MACHINE}) - -if ("${PROJECT_MACHINE}" STREQUAL "zynqmp_a53" OR - "${PROJECT_MACHINE}" STREQUAL "zynqmp_a72" OR - "${PROJECT_MACHINE}" STREQUAL "zynqmp_a78" OR - "${PROJECT_MACHINE}" STREQUAL "zynqmp_r5" OR - "${PROJECT_MACHINE}" STREQUAL "zynq7") -add_subdirectory(xlnx) -endif() +endif(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_VENDOR}) diff --git a/lib/system/generic/CMakeLists.txt b/lib/system/generic/CMakeLists.txt index 9427635b..9d31aa32 100644 --- a/lib/system/generic/CMakeLists.txt +++ b/lib/system/generic/CMakeLists.txt @@ -17,14 +17,8 @@ collect (PROJECT_LIB_SOURCES irq.c) collect (PROJECT_LIB_SOURCES shmem.c) collect (PROJECT_LIB_SOURCES time.c) -if ("${PROJECT_MACHINE}" STREQUAL "zynqmp_a53" OR - "${PROJECT_MACHINE}" STREQUAL "zynqmp_a72" OR - "${PROJECT_MACHINE}" STREQUAL "zynqmp_a78" OR - "${PROJECT_MACHINE}" STREQUAL "zynqmp_r5" OR - "${PROJECT_MACHINE}" STREQUAL "microblaze_generic" OR - "${PROJECT_MACHINE}" STREQUAL "zynq7") - add_subdirectory(xlnx) +if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_VENDOR}) + add_subdirectory(${PROJECT_VENDOR}) elseif(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_MACHINE}) add_subdirectory(${PROJECT_MACHINE}) -endif() - +endif(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_VENDOR}) From a03b649043fb1de03e0189462eca5659b6c4f7a6 Mon Sep 17 00:00:00 2001 From: Ben Levinsky Date: Wed, 14 Aug 2024 07:51:51 -0700 Subject: [PATCH 2/3] cmake: platforms: xlnx: Add PROJECT_VENDOR Add PROJECT_VENDOR to Xilinx-AMD .cmake platform files. Signed-off-by: Ben Levinsky --- cmake/platforms/microblaze-generic.cmake | 1 + cmake/platforms/zynq7-freertos.cmake | 1 + cmake/platforms/zynq7-generic-iar.cmake | 1 + cmake/platforms/zynq7-generic.cmake | 1 + cmake/platforms/zynqmp-a53-freertos.cmake | 1 + cmake/platforms/zynqmp-a53-generic.cmake | 1 + cmake/platforms/zynqmp-r5-freertos.cmake | 1 + cmake/platforms/zynqmp-r5-generic.cmake | 1 + 8 files changed, 8 insertions(+) diff --git a/cmake/platforms/microblaze-generic.cmake b/cmake/platforms/microblaze-generic.cmake index 91cb64e0..3248d9ab 100644 --- a/cmake/platforms/microblaze-generic.cmake +++ b/cmake/platforms/microblaze-generic.cmake @@ -1,5 +1,6 @@ set (CMAKE_SYSTEM_PROCESSOR "microblaze" CACHE STRING "") set (MACHINE "microblaze_generic" CACHE STRING "") + set (PROJECT_VENDOR "xlnx" CACHE STRING "") set (CROSS_PREFIX "mb-" CACHE STRING "") # These flags are for a demo. If microblaze is changed, the flags need to be changed too. set (CMAKE_C_FLAGS "-mlittle-endian -mxl-barrel-shift -mxl-pattern-compare \ diff --git a/cmake/platforms/zynq7-freertos.cmake b/cmake/platforms/zynq7-freertos.cmake index 3bf116e9..e1e2f9f8 100644 --- a/cmake/platforms/zynq7-freertos.cmake +++ b/cmake/platforms/zynq7-freertos.cmake @@ -1,5 +1,6 @@ set (CMAKE_SYSTEM_PROCESSOR "arm" CACHE STRING "") set (MACHINE "zynq7" CACHE STRING "") +set (PROJECT_VENDOR "xlnx" CACHE STRING "") set (CROSS_PREFIX "arm-none-eabi-" CACHE STRING "") set (CMAKE_C_FLAGS "-mcpu=cortex-a9 -mfpu=vfpv3 -mfloat-abi=hard" CACHE STRING "") diff --git a/cmake/platforms/zynq7-generic-iar.cmake b/cmake/platforms/zynq7-generic-iar.cmake index e5be53c0..afa06553 100644 --- a/cmake/platforms/zynq7-generic-iar.cmake +++ b/cmake/platforms/zynq7-generic-iar.cmake @@ -1,4 +1,5 @@ set (CMAKE_SYSTEM_PROCESSOR "arm" CACHE STRING "") +set (PROJECT_VENDOR "xlnx" CACHE STRING "") set (CROSS_SUFFIX "arm" CACHE STRING "") include (cross-generic-iar) diff --git a/cmake/platforms/zynq7-generic.cmake b/cmake/platforms/zynq7-generic.cmake index bf13f1ae..3d3612cd 100644 --- a/cmake/platforms/zynq7-generic.cmake +++ b/cmake/platforms/zynq7-generic.cmake @@ -1,5 +1,6 @@ set (CMAKE_SYSTEM_PROCESSOR "arm" CACHE STRING "") set (MACHINE "zynq7" CACHE STRING "") +set (PROJECT_VENDOR "xlnx" CACHE STRING "") set (CROSS_PREFIX "arm-none-eabi-" CACHE STRING "") set (CMAKE_C_FLAGS "-mcpu=cortex-a9 -mfpu=vfpv3 -mfloat-abi=hard" CACHE STRING "") diff --git a/cmake/platforms/zynqmp-a53-freertos.cmake b/cmake/platforms/zynqmp-a53-freertos.cmake index ee515afb..b911b17d 100644 --- a/cmake/platforms/zynqmp-a53-freertos.cmake +++ b/cmake/platforms/zynqmp-a53-freertos.cmake @@ -1,5 +1,6 @@ set (CMAKE_SYSTEM_PROCESSOR "aarch64" CACHE STRING "") set (MACHINE "zynqmp_a53" CACHE STRING "") +set (PROJECT_VENDOR "xlnx" CACHE STRING "") set (CROSS_PREFIX "aarch64-none-elf-" CACHE STRING "") set (CMAKE_C_FLAGS "" CACHE STRING "") diff --git a/cmake/platforms/zynqmp-a53-generic.cmake b/cmake/platforms/zynqmp-a53-generic.cmake index 624b93be..02309609 100644 --- a/cmake/platforms/zynqmp-a53-generic.cmake +++ b/cmake/platforms/zynqmp-a53-generic.cmake @@ -1,5 +1,6 @@ set (CMAKE_SYSTEM_PROCESSOR "aarch64" CACHE STRING "") set (MACHINE "zynqmp_a53" CACHE STRING "") +set (PROJECT_VENDOR "xlnx" CACHE STRING "") set (CROSS_PREFIX "aarch64-none-elf-" CACHE STRING "") set (CMAKE_C_FLAGS "" CACHE STRING "") diff --git a/cmake/platforms/zynqmp-r5-freertos.cmake b/cmake/platforms/zynqmp-r5-freertos.cmake index afeadc4b..b7e3e652 100644 --- a/cmake/platforms/zynqmp-r5-freertos.cmake +++ b/cmake/platforms/zynqmp-r5-freertos.cmake @@ -1,5 +1,6 @@ set (CMAKE_SYSTEM_PROCESSOR "arm" CACHE STRING "") set (MACHINE "zynqmp_r5" CACHE STRING "") +set (PROJECT_VENDOR "xlnx" CACHE STRING "") set (CROSS_PREFIX "armr5-none-eabi-" CACHE STRING "") set (CMAKE_C_FLAGS "-mfloat-abi=soft -mcpu=cortex-r5" CACHE STRING "") diff --git a/cmake/platforms/zynqmp-r5-generic.cmake b/cmake/platforms/zynqmp-r5-generic.cmake index 012a2124..a2264771 100644 --- a/cmake/platforms/zynqmp-r5-generic.cmake +++ b/cmake/platforms/zynqmp-r5-generic.cmake @@ -1,6 +1,7 @@ set (CMAKE_SYSTEM_PROCESSOR "arm" CACHE STRING "") set (MACHINE "zynqmp_r5" CACHE STRING "") set (CROSS_PREFIX "armr5-none-eabi-" CACHE STRING "") +set (PROJECT_VENDOR "xlnx" CACHE STRING "") # Xilinx SDK version earlier than 2017.2 use mfloat-abi=soft by default to generate libxil set (CMAKE_C_FLAGS "-mfloat-abi=hard -mfpu=vfpv3-d16 -mcpu=cortex-r5" CACHE STRING "") From 2078aa033dcf95273f1caa2feab4a37054300219 Mon Sep 17 00:00:00 2001 From: Ben Levinsky Date: Tue, 16 Jul 2024 15:10:00 -0700 Subject: [PATCH 3/3] examples: xlnx: Change machine name to be SOC agnostic Match examples to lib CMake machine name change Signed-off-by: Ben Levinsky --- examples/system/freertos/{zynqmp_r5 => xlnx_r5}/CMakeLists.txt | 2 +- .../zynqmp_amp_demo => xlnx_r5/amp_demo}/CMakeLists.txt | 0 .../{zynqmp_r5/zynqmp_amp_demo => xlnx_r5/amp_demo}/common.h | 0 .../zynqmp_amp_demo => xlnx_r5/amp_demo}/ipi_latency_demod.c | 0 .../zynqmp_amp_demo => xlnx_r5/amp_demo}/ipi_shmem_demod.c | 0 .../zynqmp_amp_demo => xlnx_r5/amp_demo}/libmetal_amp_demod.c | 0 .../{zynqmp_r5/zynqmp_amp_demo => xlnx_r5/amp_demo}/lscript.ld | 0 .../zynqmp_amp_demo => xlnx_r5/amp_demo}/platform_config.h | 0 .../zynqmp_amp_demo => xlnx_r5/amp_demo}/shmem_atomic_demod.c | 0 .../zynqmp_amp_demo => xlnx_r5/amp_demo}/shmem_demod.c | 0 .../zynqmp_amp_demo => xlnx_r5/amp_demo}/shmem_latency_demod.c | 0 .../amp_demo}/shmem_throughput_demod.c | 0 .../{zynqmp_r5/zynqmp_amp_demo => xlnx_r5/amp_demo}/sys_init.c | 0 .../{zynqmp_r5/zynqmp_amp_demo => xlnx_r5/amp_demo}/sys_init.h | 0 examples/system/generic/{zynqmp_r5 => xlnx_r5}/CMakeLists.txt | 2 +- .../zynqmp_amp_demo => xlnx_r5/amp_demo}/CMakeLists.txt | 0 .../{zynqmp_r5/zynqmp_amp_demo => xlnx_r5/amp_demo}/common.h | 0 .../zynqmp_amp_demo => xlnx_r5/amp_demo}/ipi_latency_demod.c | 0 .../zynqmp_amp_demo => xlnx_r5/amp_demo}/ipi_shmem_demod.c | 0 .../zynqmp_amp_demo => xlnx_r5/amp_demo}/libmetal_amp_demod.c | 0 .../{zynqmp_r5/zynqmp_amp_demo => xlnx_r5/amp_demo}/lscript.ld | 0 .../zynqmp_amp_demo => xlnx_r5/amp_demo}/platform_config.h | 0 .../zynqmp_amp_demo => xlnx_r5/amp_demo}/shmem_atomic_demod.c | 0 .../zynqmp_amp_demo => xlnx_r5/amp_demo}/shmem_demod.c | 0 .../zynqmp_amp_demo => xlnx_r5/amp_demo}/shmem_latency_demod.c | 0 .../amp_demo}/shmem_throughput_demod.c | 0 .../{zynqmp_r5/zynqmp_amp_demo => xlnx_r5/amp_demo}/sys_init.c | 0 .../{zynqmp_r5/zynqmp_amp_demo => xlnx_r5/amp_demo}/sys_init.h | 0 examples/system/linux/{zynqmp => xlnx}/CMakeLists.txt | 0 .../linux/{zynqmp => xlnx}/zynqmp_amp_demo/CMakeLists.txt | 0 examples/system/linux/{zynqmp => xlnx}/zynqmp_amp_demo/common.h | 0 .../linux/{zynqmp => xlnx}/zynqmp_amp_demo/ipi_latency_demo.c | 0 .../linux/{zynqmp => xlnx}/zynqmp_amp_demo/ipi_shmem_demo.c | 0 .../linux/{zynqmp => xlnx}/zynqmp_amp_demo/libmetal_amp_demo.c | 0 .../linux/{zynqmp => xlnx}/zynqmp_amp_demo/libmetal_amp_demod.c | 0 .../linux/{zynqmp => xlnx}/zynqmp_amp_demo/shmem_atomic_demo.c | 0 .../system/linux/{zynqmp => xlnx}/zynqmp_amp_demo/shmem_demo.c | 0 .../linux/{zynqmp => xlnx}/zynqmp_amp_demo/shmem_latency_demo.c | 0 .../{zynqmp => xlnx}/zynqmp_amp_demo/shmem_throughput_demo.c | 0 .../system/linux/{zynqmp => xlnx}/zynqmp_amp_demo/sys_init.c | 0 .../system/linux/{zynqmp => xlnx}/zynqmp_amp_demo/sys_init.h | 0 41 files changed, 2 insertions(+), 2 deletions(-) rename examples/system/freertos/{zynqmp_r5 => xlnx_r5}/CMakeLists.txt (94%) rename examples/system/freertos/{zynqmp_r5/zynqmp_amp_demo => xlnx_r5/amp_demo}/CMakeLists.txt (100%) rename examples/system/freertos/{zynqmp_r5/zynqmp_amp_demo => xlnx_r5/amp_demo}/common.h (100%) rename examples/system/freertos/{zynqmp_r5/zynqmp_amp_demo => xlnx_r5/amp_demo}/ipi_latency_demod.c (100%) rename examples/system/freertos/{zynqmp_r5/zynqmp_amp_demo => xlnx_r5/amp_demo}/ipi_shmem_demod.c (100%) rename examples/system/freertos/{zynqmp_r5/zynqmp_amp_demo => xlnx_r5/amp_demo}/libmetal_amp_demod.c (100%) rename examples/system/freertos/{zynqmp_r5/zynqmp_amp_demo => xlnx_r5/amp_demo}/lscript.ld (100%) rename examples/system/freertos/{zynqmp_r5/zynqmp_amp_demo => xlnx_r5/amp_demo}/platform_config.h (100%) rename examples/system/freertos/{zynqmp_r5/zynqmp_amp_demo => xlnx_r5/amp_demo}/shmem_atomic_demod.c (100%) rename examples/system/freertos/{zynqmp_r5/zynqmp_amp_demo => xlnx_r5/amp_demo}/shmem_demod.c (100%) rename examples/system/freertos/{zynqmp_r5/zynqmp_amp_demo => xlnx_r5/amp_demo}/shmem_latency_demod.c (100%) rename examples/system/freertos/{zynqmp_r5/zynqmp_amp_demo => xlnx_r5/amp_demo}/shmem_throughput_demod.c (100%) rename examples/system/freertos/{zynqmp_r5/zynqmp_amp_demo => xlnx_r5/amp_demo}/sys_init.c (100%) rename examples/system/freertos/{zynqmp_r5/zynqmp_amp_demo => xlnx_r5/amp_demo}/sys_init.h (100%) rename examples/system/generic/{zynqmp_r5 => xlnx_r5}/CMakeLists.txt (94%) rename examples/system/generic/{zynqmp_r5/zynqmp_amp_demo => xlnx_r5/amp_demo}/CMakeLists.txt (100%) rename examples/system/generic/{zynqmp_r5/zynqmp_amp_demo => xlnx_r5/amp_demo}/common.h (100%) rename examples/system/generic/{zynqmp_r5/zynqmp_amp_demo => xlnx_r5/amp_demo}/ipi_latency_demod.c (100%) rename examples/system/generic/{zynqmp_r5/zynqmp_amp_demo => xlnx_r5/amp_demo}/ipi_shmem_demod.c (100%) rename examples/system/generic/{zynqmp_r5/zynqmp_amp_demo => xlnx_r5/amp_demo}/libmetal_amp_demod.c (100%) rename examples/system/generic/{zynqmp_r5/zynqmp_amp_demo => xlnx_r5/amp_demo}/lscript.ld (100%) rename examples/system/generic/{zynqmp_r5/zynqmp_amp_demo => xlnx_r5/amp_demo}/platform_config.h (100%) rename examples/system/generic/{zynqmp_r5/zynqmp_amp_demo => xlnx_r5/amp_demo}/shmem_atomic_demod.c (100%) rename examples/system/generic/{zynqmp_r5/zynqmp_amp_demo => xlnx_r5/amp_demo}/shmem_demod.c (100%) rename examples/system/generic/{zynqmp_r5/zynqmp_amp_demo => xlnx_r5/amp_demo}/shmem_latency_demod.c (100%) rename examples/system/generic/{zynqmp_r5/zynqmp_amp_demo => xlnx_r5/amp_demo}/shmem_throughput_demod.c (100%) rename examples/system/generic/{zynqmp_r5/zynqmp_amp_demo => xlnx_r5/amp_demo}/sys_init.c (100%) rename examples/system/generic/{zynqmp_r5/zynqmp_amp_demo => xlnx_r5/amp_demo}/sys_init.h (100%) rename examples/system/linux/{zynqmp => xlnx}/CMakeLists.txt (100%) rename examples/system/linux/{zynqmp => xlnx}/zynqmp_amp_demo/CMakeLists.txt (100%) rename examples/system/linux/{zynqmp => xlnx}/zynqmp_amp_demo/common.h (100%) rename examples/system/linux/{zynqmp => xlnx}/zynqmp_amp_demo/ipi_latency_demo.c (100%) rename examples/system/linux/{zynqmp => xlnx}/zynqmp_amp_demo/ipi_shmem_demo.c (100%) rename examples/system/linux/{zynqmp => xlnx}/zynqmp_amp_demo/libmetal_amp_demo.c (100%) rename examples/system/linux/{zynqmp => xlnx}/zynqmp_amp_demo/libmetal_amp_demod.c (100%) rename examples/system/linux/{zynqmp => xlnx}/zynqmp_amp_demo/shmem_atomic_demo.c (100%) rename examples/system/linux/{zynqmp => xlnx}/zynqmp_amp_demo/shmem_demo.c (100%) rename examples/system/linux/{zynqmp => xlnx}/zynqmp_amp_demo/shmem_latency_demo.c (100%) rename examples/system/linux/{zynqmp => xlnx}/zynqmp_amp_demo/shmem_throughput_demo.c (100%) rename examples/system/linux/{zynqmp => xlnx}/zynqmp_amp_demo/sys_init.c (100%) rename examples/system/linux/{zynqmp => xlnx}/zynqmp_amp_demo/sys_init.h (100%) diff --git a/examples/system/freertos/zynqmp_r5/CMakeLists.txt b/examples/system/freertos/xlnx_r5/CMakeLists.txt similarity index 94% rename from examples/system/freertos/zynqmp_r5/CMakeLists.txt rename to examples/system/freertos/xlnx_r5/CMakeLists.txt index eb67bf95..cf1008b5 100644 --- a/examples/system/freertos/zynqmp_r5/CMakeLists.txt +++ b/examples/system/freertos/xlnx_r5/CMakeLists.txt @@ -15,4 +15,4 @@ endif (NOT _lib_path) get_filename_component (_lib_path ${_lib_path} DIRECTORY) collect (PROJECT_LIB_DIRS ${_lib_path}) -add_subdirectory(zynqmp_amp_demo) +add_subdirectory(amp_demo) diff --git a/examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/CMakeLists.txt b/examples/system/freertos/xlnx_r5/amp_demo/CMakeLists.txt similarity index 100% rename from examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/CMakeLists.txt rename to examples/system/freertos/xlnx_r5/amp_demo/CMakeLists.txt diff --git a/examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/common.h b/examples/system/freertos/xlnx_r5/amp_demo/common.h similarity index 100% rename from examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/common.h rename to examples/system/freertos/xlnx_r5/amp_demo/common.h diff --git a/examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/ipi_latency_demod.c b/examples/system/freertos/xlnx_r5/amp_demo/ipi_latency_demod.c similarity index 100% rename from examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/ipi_latency_demod.c rename to examples/system/freertos/xlnx_r5/amp_demo/ipi_latency_demod.c diff --git a/examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/ipi_shmem_demod.c b/examples/system/freertos/xlnx_r5/amp_demo/ipi_shmem_demod.c similarity index 100% rename from examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/ipi_shmem_demod.c rename to examples/system/freertos/xlnx_r5/amp_demo/ipi_shmem_demod.c diff --git a/examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/libmetal_amp_demod.c b/examples/system/freertos/xlnx_r5/amp_demo/libmetal_amp_demod.c similarity index 100% rename from examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/libmetal_amp_demod.c rename to examples/system/freertos/xlnx_r5/amp_demo/libmetal_amp_demod.c diff --git a/examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/lscript.ld b/examples/system/freertos/xlnx_r5/amp_demo/lscript.ld similarity index 100% rename from examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/lscript.ld rename to examples/system/freertos/xlnx_r5/amp_demo/lscript.ld diff --git a/examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/platform_config.h b/examples/system/freertos/xlnx_r5/amp_demo/platform_config.h similarity index 100% rename from examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/platform_config.h rename to examples/system/freertos/xlnx_r5/amp_demo/platform_config.h diff --git a/examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/shmem_atomic_demod.c b/examples/system/freertos/xlnx_r5/amp_demo/shmem_atomic_demod.c similarity index 100% rename from examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/shmem_atomic_demod.c rename to examples/system/freertos/xlnx_r5/amp_demo/shmem_atomic_demod.c diff --git a/examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/shmem_demod.c b/examples/system/freertos/xlnx_r5/amp_demo/shmem_demod.c similarity index 100% rename from examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/shmem_demod.c rename to examples/system/freertos/xlnx_r5/amp_demo/shmem_demod.c diff --git a/examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/shmem_latency_demod.c b/examples/system/freertos/xlnx_r5/amp_demo/shmem_latency_demod.c similarity index 100% rename from examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/shmem_latency_demod.c rename to examples/system/freertos/xlnx_r5/amp_demo/shmem_latency_demod.c diff --git a/examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/shmem_throughput_demod.c b/examples/system/freertos/xlnx_r5/amp_demo/shmem_throughput_demod.c similarity index 100% rename from examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/shmem_throughput_demod.c rename to examples/system/freertos/xlnx_r5/amp_demo/shmem_throughput_demod.c diff --git a/examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/sys_init.c b/examples/system/freertos/xlnx_r5/amp_demo/sys_init.c similarity index 100% rename from examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/sys_init.c rename to examples/system/freertos/xlnx_r5/amp_demo/sys_init.c diff --git a/examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/sys_init.h b/examples/system/freertos/xlnx_r5/amp_demo/sys_init.h similarity index 100% rename from examples/system/freertos/zynqmp_r5/zynqmp_amp_demo/sys_init.h rename to examples/system/freertos/xlnx_r5/amp_demo/sys_init.h diff --git a/examples/system/generic/zynqmp_r5/CMakeLists.txt b/examples/system/generic/xlnx_r5/CMakeLists.txt similarity index 94% rename from examples/system/generic/zynqmp_r5/CMakeLists.txt rename to examples/system/generic/xlnx_r5/CMakeLists.txt index 3f87873f..eea72c2a 100644 --- a/examples/system/generic/zynqmp_r5/CMakeLists.txt +++ b/examples/system/generic/xlnx_r5/CMakeLists.txt @@ -18,4 +18,4 @@ endif (NOT _lib_path) get_filename_component (_lib_path ${_lib_path} DIRECTORY) collect (PROJECT_LIB_DIRS ${_lib_path}) -add_subdirectory(zynqmp_amp_demo) +add_subdirectory(amp_demo) diff --git a/examples/system/generic/zynqmp_r5/zynqmp_amp_demo/CMakeLists.txt b/examples/system/generic/xlnx_r5/amp_demo/CMakeLists.txt similarity index 100% rename from examples/system/generic/zynqmp_r5/zynqmp_amp_demo/CMakeLists.txt rename to examples/system/generic/xlnx_r5/amp_demo/CMakeLists.txt diff --git a/examples/system/generic/zynqmp_r5/zynqmp_amp_demo/common.h b/examples/system/generic/xlnx_r5/amp_demo/common.h similarity index 100% rename from examples/system/generic/zynqmp_r5/zynqmp_amp_demo/common.h rename to examples/system/generic/xlnx_r5/amp_demo/common.h diff --git a/examples/system/generic/zynqmp_r5/zynqmp_amp_demo/ipi_latency_demod.c b/examples/system/generic/xlnx_r5/amp_demo/ipi_latency_demod.c similarity index 100% rename from examples/system/generic/zynqmp_r5/zynqmp_amp_demo/ipi_latency_demod.c rename to examples/system/generic/xlnx_r5/amp_demo/ipi_latency_demod.c diff --git a/examples/system/generic/zynqmp_r5/zynqmp_amp_demo/ipi_shmem_demod.c b/examples/system/generic/xlnx_r5/amp_demo/ipi_shmem_demod.c similarity index 100% rename from examples/system/generic/zynqmp_r5/zynqmp_amp_demo/ipi_shmem_demod.c rename to examples/system/generic/xlnx_r5/amp_demo/ipi_shmem_demod.c diff --git a/examples/system/generic/zynqmp_r5/zynqmp_amp_demo/libmetal_amp_demod.c b/examples/system/generic/xlnx_r5/amp_demo/libmetal_amp_demod.c similarity index 100% rename from examples/system/generic/zynqmp_r5/zynqmp_amp_demo/libmetal_amp_demod.c rename to examples/system/generic/xlnx_r5/amp_demo/libmetal_amp_demod.c diff --git a/examples/system/generic/zynqmp_r5/zynqmp_amp_demo/lscript.ld b/examples/system/generic/xlnx_r5/amp_demo/lscript.ld similarity index 100% rename from examples/system/generic/zynqmp_r5/zynqmp_amp_demo/lscript.ld rename to examples/system/generic/xlnx_r5/amp_demo/lscript.ld diff --git a/examples/system/generic/zynqmp_r5/zynqmp_amp_demo/platform_config.h b/examples/system/generic/xlnx_r5/amp_demo/platform_config.h similarity index 100% rename from examples/system/generic/zynqmp_r5/zynqmp_amp_demo/platform_config.h rename to examples/system/generic/xlnx_r5/amp_demo/platform_config.h diff --git a/examples/system/generic/zynqmp_r5/zynqmp_amp_demo/shmem_atomic_demod.c b/examples/system/generic/xlnx_r5/amp_demo/shmem_atomic_demod.c similarity index 100% rename from examples/system/generic/zynqmp_r5/zynqmp_amp_demo/shmem_atomic_demod.c rename to examples/system/generic/xlnx_r5/amp_demo/shmem_atomic_demod.c diff --git a/examples/system/generic/zynqmp_r5/zynqmp_amp_demo/shmem_demod.c b/examples/system/generic/xlnx_r5/amp_demo/shmem_demod.c similarity index 100% rename from examples/system/generic/zynqmp_r5/zynqmp_amp_demo/shmem_demod.c rename to examples/system/generic/xlnx_r5/amp_demo/shmem_demod.c diff --git a/examples/system/generic/zynqmp_r5/zynqmp_amp_demo/shmem_latency_demod.c b/examples/system/generic/xlnx_r5/amp_demo/shmem_latency_demod.c similarity index 100% rename from examples/system/generic/zynqmp_r5/zynqmp_amp_demo/shmem_latency_demod.c rename to examples/system/generic/xlnx_r5/amp_demo/shmem_latency_demod.c diff --git a/examples/system/generic/zynqmp_r5/zynqmp_amp_demo/shmem_throughput_demod.c b/examples/system/generic/xlnx_r5/amp_demo/shmem_throughput_demod.c similarity index 100% rename from examples/system/generic/zynqmp_r5/zynqmp_amp_demo/shmem_throughput_demod.c rename to examples/system/generic/xlnx_r5/amp_demo/shmem_throughput_demod.c diff --git a/examples/system/generic/zynqmp_r5/zynqmp_amp_demo/sys_init.c b/examples/system/generic/xlnx_r5/amp_demo/sys_init.c similarity index 100% rename from examples/system/generic/zynqmp_r5/zynqmp_amp_demo/sys_init.c rename to examples/system/generic/xlnx_r5/amp_demo/sys_init.c diff --git a/examples/system/generic/zynqmp_r5/zynqmp_amp_demo/sys_init.h b/examples/system/generic/xlnx_r5/amp_demo/sys_init.h similarity index 100% rename from examples/system/generic/zynqmp_r5/zynqmp_amp_demo/sys_init.h rename to examples/system/generic/xlnx_r5/amp_demo/sys_init.h diff --git a/examples/system/linux/zynqmp/CMakeLists.txt b/examples/system/linux/xlnx/CMakeLists.txt similarity index 100% rename from examples/system/linux/zynqmp/CMakeLists.txt rename to examples/system/linux/xlnx/CMakeLists.txt diff --git a/examples/system/linux/zynqmp/zynqmp_amp_demo/CMakeLists.txt b/examples/system/linux/xlnx/zynqmp_amp_demo/CMakeLists.txt similarity index 100% rename from examples/system/linux/zynqmp/zynqmp_amp_demo/CMakeLists.txt rename to examples/system/linux/xlnx/zynqmp_amp_demo/CMakeLists.txt diff --git a/examples/system/linux/zynqmp/zynqmp_amp_demo/common.h b/examples/system/linux/xlnx/zynqmp_amp_demo/common.h similarity index 100% rename from examples/system/linux/zynqmp/zynqmp_amp_demo/common.h rename to examples/system/linux/xlnx/zynqmp_amp_demo/common.h diff --git a/examples/system/linux/zynqmp/zynqmp_amp_demo/ipi_latency_demo.c b/examples/system/linux/xlnx/zynqmp_amp_demo/ipi_latency_demo.c similarity index 100% rename from examples/system/linux/zynqmp/zynqmp_amp_demo/ipi_latency_demo.c rename to examples/system/linux/xlnx/zynqmp_amp_demo/ipi_latency_demo.c diff --git a/examples/system/linux/zynqmp/zynqmp_amp_demo/ipi_shmem_demo.c b/examples/system/linux/xlnx/zynqmp_amp_demo/ipi_shmem_demo.c similarity index 100% rename from examples/system/linux/zynqmp/zynqmp_amp_demo/ipi_shmem_demo.c rename to examples/system/linux/xlnx/zynqmp_amp_demo/ipi_shmem_demo.c diff --git a/examples/system/linux/zynqmp/zynqmp_amp_demo/libmetal_amp_demo.c b/examples/system/linux/xlnx/zynqmp_amp_demo/libmetal_amp_demo.c similarity index 100% rename from examples/system/linux/zynqmp/zynqmp_amp_demo/libmetal_amp_demo.c rename to examples/system/linux/xlnx/zynqmp_amp_demo/libmetal_amp_demo.c diff --git a/examples/system/linux/zynqmp/zynqmp_amp_demo/libmetal_amp_demod.c b/examples/system/linux/xlnx/zynqmp_amp_demo/libmetal_amp_demod.c similarity index 100% rename from examples/system/linux/zynqmp/zynqmp_amp_demo/libmetal_amp_demod.c rename to examples/system/linux/xlnx/zynqmp_amp_demo/libmetal_amp_demod.c diff --git a/examples/system/linux/zynqmp/zynqmp_amp_demo/shmem_atomic_demo.c b/examples/system/linux/xlnx/zynqmp_amp_demo/shmem_atomic_demo.c similarity index 100% rename from examples/system/linux/zynqmp/zynqmp_amp_demo/shmem_atomic_demo.c rename to examples/system/linux/xlnx/zynqmp_amp_demo/shmem_atomic_demo.c diff --git a/examples/system/linux/zynqmp/zynqmp_amp_demo/shmem_demo.c b/examples/system/linux/xlnx/zynqmp_amp_demo/shmem_demo.c similarity index 100% rename from examples/system/linux/zynqmp/zynqmp_amp_demo/shmem_demo.c rename to examples/system/linux/xlnx/zynqmp_amp_demo/shmem_demo.c diff --git a/examples/system/linux/zynqmp/zynqmp_amp_demo/shmem_latency_demo.c b/examples/system/linux/xlnx/zynqmp_amp_demo/shmem_latency_demo.c similarity index 100% rename from examples/system/linux/zynqmp/zynqmp_amp_demo/shmem_latency_demo.c rename to examples/system/linux/xlnx/zynqmp_amp_demo/shmem_latency_demo.c diff --git a/examples/system/linux/zynqmp/zynqmp_amp_demo/shmem_throughput_demo.c b/examples/system/linux/xlnx/zynqmp_amp_demo/shmem_throughput_demo.c similarity index 100% rename from examples/system/linux/zynqmp/zynqmp_amp_demo/shmem_throughput_demo.c rename to examples/system/linux/xlnx/zynqmp_amp_demo/shmem_throughput_demo.c diff --git a/examples/system/linux/zynqmp/zynqmp_amp_demo/sys_init.c b/examples/system/linux/xlnx/zynqmp_amp_demo/sys_init.c similarity index 100% rename from examples/system/linux/zynqmp/zynqmp_amp_demo/sys_init.c rename to examples/system/linux/xlnx/zynqmp_amp_demo/sys_init.c diff --git a/examples/system/linux/zynqmp/zynqmp_amp_demo/sys_init.h b/examples/system/linux/xlnx/zynqmp_amp_demo/sys_init.h similarity index 100% rename from examples/system/linux/zynqmp/zynqmp_amp_demo/sys_init.h rename to examples/system/linux/xlnx/zynqmp_amp_demo/sys_init.h