Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Xlnx cmake machine name change #302

Merged
merged 3 commits into from
Aug 15, 2024
Merged

Xlnx cmake machine name change #302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
65c362b
lib: xlnx: Update logic to pull in vendor-specific logic based on PRO…
bentheredonethat Jul 16, 2024
a03b649
cmake: platforms: xlnx: Add PROJECT_VENDOR
bentheredonethat Aug 14, 2024
2078aa0
examples: xlnx: Change machine name to be SOC agnostic
bentheredonethat Jul 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions cmake/options.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
1 change: 1 addition & 0 deletions cmake/platforms/microblaze-generic.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down
1 change: 1 addition & 0 deletions cmake/platforms/zynq7-freertos.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 "")
Expand Down
1 change: 1 addition & 0 deletions cmake/platforms/zynq7-generic-iar.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)

1 change: 1 addition & 0 deletions cmake/platforms/zynq7-generic.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 "")
Expand Down
1 change: 1 addition & 0 deletions cmake/platforms/zynqmp-a53-freertos.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 "")

Expand Down
1 change: 1 addition & 0 deletions cmake/platforms/zynqmp-a53-generic.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 "")

Expand Down
1 change: 1 addition & 0 deletions cmake/platforms/zynqmp-r5-freertos.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 "")

Expand Down
1 change: 1 addition & 0 deletions cmake/platforms/zynqmp-r5-generic.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 "")
Expand Down
2 changes: 1 addition & 1 deletion .../system/freertos/zynqmp_r5/CMakeLists.txt → ...es/system/freertos/xlnx_r5/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
0 .../zynqmp_r5/zynqmp_amp_demo/CMakeLists.txt → .../freertos/xlnx_r5/amp_demo/CMakeLists.txt
View file
Open in desktop
File renamed without changes.
0 ...eertos/zynqmp_r5/zynqmp_amp_demo/common.h → ...system/freertos/xlnx_r5/amp_demo/common.h
View file
Open in desktop
File renamed without changes.
0 ...mp_r5/zynqmp_amp_demo/ipi_latency_demod.c → ...rtos/xlnx_r5/amp_demo/ipi_latency_demod.c
View file
Open in desktop
File renamed without changes.
0 ...nqmp_r5/zynqmp_amp_demo/ipi_shmem_demod.c → ...eertos/xlnx_r5/amp_demo/ipi_shmem_demod.c
View file
Open in desktop
File renamed without changes.
0 ...p_r5/zynqmp_amp_demo/libmetal_amp_demod.c → ...tos/xlnx_r5/amp_demo/libmetal_amp_demod.c
View file
Open in desktop
File renamed without changes.
0 ...rtos/zynqmp_r5/zynqmp_amp_demo/lscript.ld → ...stem/freertos/xlnx_r5/amp_demo/lscript.ld
View file
Open in desktop
File renamed without changes.
0 ...nqmp_r5/zynqmp_amp_demo/platform_config.h → ...eertos/xlnx_r5/amp_demo/platform_config.h
View file
Open in desktop
File renamed without changes.
0 ...p_r5/zynqmp_amp_demo/shmem_atomic_demod.c → ...tos/xlnx_r5/amp_demo/shmem_atomic_demod.c
View file
Open in desktop
File renamed without changes.
0 ...s/zynqmp_r5/zynqmp_amp_demo/shmem_demod.c → ...m/freertos/xlnx_r5/amp_demo/shmem_demod.c
View file
Open in desktop
File renamed without changes.
0 ..._r5/zynqmp_amp_demo/shmem_latency_demod.c → ...os/xlnx_r5/amp_demo/shmem_latency_demod.c
View file
Open in desktop
File renamed without changes.
0 .../zynqmp_amp_demo/shmem_throughput_demod.c → ...xlnx_r5/amp_demo/shmem_throughput_demod.c
View file
Open in desktop
File renamed without changes.
0 ...rtos/zynqmp_r5/zynqmp_amp_demo/sys_init.c → ...stem/freertos/xlnx_r5/amp_demo/sys_init.c
View file
Open in desktop
File renamed without changes.
0 ...rtos/zynqmp_r5/zynqmp_amp_demo/sys_init.h → ...stem/freertos/xlnx_r5/amp_demo/sys_init.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...s/system/generic/zynqmp_r5/CMakeLists.txt → ...les/system/generic/xlnx_r5/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
0 .../zynqmp_r5/zynqmp_amp_demo/CMakeLists.txt → ...m/generic/xlnx_r5/amp_demo/CMakeLists.txt
View file
Open in desktop
File renamed without changes.
0 ...eneric/zynqmp_r5/zynqmp_amp_demo/common.h → .../system/generic/xlnx_r5/amp_demo/common.h
View file
Open in desktop
File renamed without changes.
0 ...mp_r5/zynqmp_amp_demo/ipi_latency_demod.c → ...eric/xlnx_r5/amp_demo/ipi_latency_demod.c
View file
Open in desktop
File renamed without changes.
0 ...nqmp_r5/zynqmp_amp_demo/ipi_shmem_demod.c → ...eneric/xlnx_r5/amp_demo/ipi_shmem_demod.c
View file
Open in desktop
File renamed without changes.
0 ...p_r5/zynqmp_amp_demo/libmetal_amp_demod.c → ...ric/xlnx_r5/amp_demo/libmetal_amp_demod.c
View file
Open in desktop
File renamed without changes.
0 ...eric/zynqmp_r5/zynqmp_amp_demo/lscript.ld → ...ystem/generic/xlnx_r5/amp_demo/lscript.ld
View file
Open in desktop
File renamed without changes.
0 ...nqmp_r5/zynqmp_amp_demo/platform_config.h → ...eneric/xlnx_r5/amp_demo/platform_config.h
View file
Open in desktop
File renamed without changes.
0 ...p_r5/zynqmp_amp_demo/shmem_atomic_demod.c → ...ric/xlnx_r5/amp_demo/shmem_atomic_demod.c
View file
Open in desktop
File renamed without changes.
0 ...c/zynqmp_r5/zynqmp_amp_demo/shmem_demod.c → ...em/generic/xlnx_r5/amp_demo/shmem_demod.c
View file
Open in desktop
File renamed without changes.
0 ..._r5/zynqmp_amp_demo/shmem_latency_demod.c → ...ic/xlnx_r5/amp_demo/shmem_latency_demod.c
View file
Open in desktop
File renamed without changes.
0 .../zynqmp_amp_demo/shmem_throughput_demod.c → ...xlnx_r5/amp_demo/shmem_throughput_demod.c
View file
Open in desktop
File renamed without changes.
0 ...eric/zynqmp_r5/zynqmp_amp_demo/sys_init.c → ...ystem/generic/xlnx_r5/amp_demo/sys_init.c
View file
Open in desktop
File renamed without changes.
0 ...eric/zynqmp_r5/zynqmp_amp_demo/sys_init.h → ...ystem/generic/xlnx_r5/amp_demo/sys_init.h
View file
Open in desktop
File renamed without changes.
0 examples/system/linux/zynqmp/CMakeLists.txt → examples/system/linux/xlnx/CMakeLists.txt
View file
Open in desktop
File renamed without changes.
0 ...nux/zynqmp/zynqmp_amp_demo/CMakeLists.txt → ...linux/xlnx/zynqmp_amp_demo/CMakeLists.txt
View file
Open in desktop
File renamed without changes.
0 ...tem/linux/zynqmp/zynqmp_amp_demo/common.h → ...ystem/linux/xlnx/zynqmp_amp_demo/common.h
View file
Open in desktop
File renamed without changes.
0 ...zynqmp/zynqmp_amp_demo/ipi_latency_demo.c → ...x/xlnx/zynqmp_amp_demo/ipi_latency_demo.c
View file
Open in desktop
File renamed without changes.
0 ...x/zynqmp/zynqmp_amp_demo/ipi_shmem_demo.c → ...nux/xlnx/zynqmp_amp_demo/ipi_shmem_demo.c
View file
Open in desktop
File renamed without changes.
0 ...ynqmp/zynqmp_amp_demo/libmetal_amp_demo.c → .../xlnx/zynqmp_amp_demo/libmetal_amp_demo.c
View file
Open in desktop
File renamed without changes.
0 ...nqmp/zynqmp_amp_demo/libmetal_amp_demod.c → ...xlnx/zynqmp_amp_demo/libmetal_amp_demod.c
View file
Open in desktop
File renamed without changes.
0 ...ynqmp/zynqmp_amp_demo/shmem_atomic_demo.c → .../xlnx/zynqmp_amp_demo/shmem_atomic_demo.c
View file
Open in desktop
File renamed without changes.
0 ...linux/zynqmp/zynqmp_amp_demo/shmem_demo.c → ...m/linux/xlnx/zynqmp_amp_demo/shmem_demo.c
View file
Open in desktop
File renamed without changes.
0 ...nqmp/zynqmp_amp_demo/shmem_latency_demo.c → ...xlnx/zynqmp_amp_demo/shmem_latency_demo.c
View file
Open in desktop
File renamed without changes.
0 ...p/zynqmp_amp_demo/shmem_throughput_demo.c → ...x/zynqmp_amp_demo/shmem_throughput_demo.c
View file
Open in desktop
File renamed without changes.
0 ...m/linux/zynqmp/zynqmp_amp_demo/sys_init.c → ...tem/linux/xlnx/zynqmp_amp_demo/sys_init.c
View file
Open in desktop
File renamed without changes.
0 ...m/linux/zynqmp/zynqmp_amp_demo/sys_init.h → ...tem/linux/xlnx/zynqmp_amp_demo/sys_init.h
View file
Open in desktop
File renamed without changes.
14 changes: 4 additions & 10 deletions lib/system/freertos/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})
12 changes: 3 additions & 9 deletions lib/system/generic/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Loading