From 9dbceb6ff9d6fbb3645443c26d5ca52b8913daee Mon Sep 17 00:00:00 2001 From: Ben Levinsky Date: Thu, 15 Aug 2024 06:33:36 -0700 Subject: [PATCH] cmake: platforms: xlnx: Update machine from 'zynqmp_' to 'xlnx_' Match update so that the cmake platform files are coupled to vendor and not SOC which is previously 'zynqmp_'. Signed-off-by: Ben Levinsky --- cmake/platforms/xlnx-a53-freertos.cmake | 8 ++++++++ ...zynqmp-a53-generic.cmake => xlnx-a53-generic.cmake} | 2 +- .../platforms/{zynqmp-linux.cmake => xlnx-linux.cmake} | 0 cmake/platforms/xlnx-r5-freertos.cmake | 8 ++++++++ cmake/platforms/xlnx-r5-generic.cmake | 10 ++++++++++ cmake/platforms/zynqmp-a53-freertos.cmake | 8 -------- cmake/platforms/zynqmp-r5-freertos.cmake | 8 -------- cmake/platforms/zynqmp-r5-generic.cmake | 10 ---------- 8 files changed, 27 insertions(+), 27 deletions(-) create mode 100644 cmake/platforms/xlnx-a53-freertos.cmake rename cmake/platforms/{zynqmp-a53-generic.cmake => xlnx-a53-generic.cmake} (81%) rename cmake/platforms/{zynqmp-linux.cmake => xlnx-linux.cmake} (100%) create mode 100644 cmake/platforms/xlnx-r5-freertos.cmake create mode 100644 cmake/platforms/xlnx-r5-generic.cmake delete mode 100644 cmake/platforms/zynqmp-a53-freertos.cmake delete mode 100644 cmake/platforms/zynqmp-r5-freertos.cmake delete mode 100644 cmake/platforms/zynqmp-r5-generic.cmake diff --git a/cmake/platforms/xlnx-a53-freertos.cmake b/cmake/platforms/xlnx-a53-freertos.cmake new file mode 100644 index 00000000..60b8e63e --- /dev/null +++ b/cmake/platforms/xlnx-a53-freertos.cmake @@ -0,0 +1,8 @@ +set (CMAKE_SYSTEM_PROCESSOR "aarch64" CACHE STRING "") +set (MACHINE "xlnx_a53" CACHE STRING "") +set (PROJECT_VENDOR "xlnx" CACHE STRING "") +set (CROSS_PREFIX "aarch64-none-elf-" CACHE STRING "") +set (CMAKE_C_FLAGS "" CACHE STRING "") + +include (cross-freertos-gcc) + diff --git a/cmake/platforms/zynqmp-a53-generic.cmake b/cmake/platforms/xlnx-a53-generic.cmake similarity index 81% rename from cmake/platforms/zynqmp-a53-generic.cmake rename to cmake/platforms/xlnx-a53-generic.cmake index 02309609..91d11959 100644 --- a/cmake/platforms/zynqmp-a53-generic.cmake +++ b/cmake/platforms/xlnx-a53-generic.cmake @@ -1,5 +1,5 @@ set (CMAKE_SYSTEM_PROCESSOR "aarch64" CACHE STRING "") -set (MACHINE "zynqmp_a53" CACHE STRING "") +set (MACHINE "xlnx_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-linux.cmake b/cmake/platforms/xlnx-linux.cmake similarity index 100% rename from cmake/platforms/zynqmp-linux.cmake rename to cmake/platforms/xlnx-linux.cmake diff --git a/cmake/platforms/xlnx-r5-freertos.cmake b/cmake/platforms/xlnx-r5-freertos.cmake new file mode 100644 index 00000000..164ec046 --- /dev/null +++ b/cmake/platforms/xlnx-r5-freertos.cmake @@ -0,0 +1,8 @@ +set (CMAKE_SYSTEM_PROCESSOR "arm" CACHE STRING "") +set (MACHINE "xlnx_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 "") + +include (cross-freertos-gcc) + diff --git a/cmake/platforms/xlnx-r5-generic.cmake b/cmake/platforms/xlnx-r5-generic.cmake new file mode 100644 index 00000000..84f811e9 --- /dev/null +++ b/cmake/platforms/xlnx-r5-generic.cmake @@ -0,0 +1,10 @@ +set (CMAKE_SYSTEM_PROCESSOR "arm" CACHE STRING "") +set (MACHINE "xlnx_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 "") + +include (cross-generic-gcc) + diff --git a/cmake/platforms/zynqmp-a53-freertos.cmake b/cmake/platforms/zynqmp-a53-freertos.cmake deleted file mode 100644 index b911b17d..00000000 --- a/cmake/platforms/zynqmp-a53-freertos.cmake +++ /dev/null @@ -1,8 +0,0 @@ -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 "") - -include (cross-freertos-gcc) - diff --git a/cmake/platforms/zynqmp-r5-freertos.cmake b/cmake/platforms/zynqmp-r5-freertos.cmake deleted file mode 100644 index b7e3e652..00000000 --- a/cmake/platforms/zynqmp-r5-freertos.cmake +++ /dev/null @@ -1,8 +0,0 @@ -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 "") - -include (cross-freertos-gcc) - diff --git a/cmake/platforms/zynqmp-r5-generic.cmake b/cmake/platforms/zynqmp-r5-generic.cmake deleted file mode 100644 index a2264771..00000000 --- a/cmake/platforms/zynqmp-r5-generic.cmake +++ /dev/null @@ -1,10 +0,0 @@ -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 "") - -include (cross-generic-gcc) -