Skip to content

Commit e2ba083

Browse files
glneoarnopo
authored andcommitted
cmake: Remove unused CMake variables MACHINE and PROJECT_MACHINE
These were used when this repo contained machine specific examples. With those moved to the openamp-system-reference project, these CMake variables are now unused. Remove them. Signed-off-by: Andrew Davis <afd@ti.com>
1 parent 5bcc7c0 commit e2ba083

4 files changed

Lines changed: 0 additions & 17 deletions

File tree

cmake/options.cmake

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,26 +31,14 @@ message ("-- Host: ${_host}")
3131
set (_target "${CMAKE_SYSTEM_NAME}/${CMAKE_SYSTEM_PROCESSOR}")
3232
message ("-- Target: ${_target}")
3333

34-
if (NOT DEFINED MACHINE)
35-
set (MACHINE "Generic")
36-
endif (NOT DEFINED MACHINE)
37-
message ("-- Machine: ${MACHINE}")
38-
3934
string (TOLOWER ${CMAKE_SYSTEM_NAME} PROJECT_SYSTEM)
4035
string (TOUPPER ${CMAKE_SYSTEM_NAME} PROJECT_SYSTEM_UPPER)
4136
string (TOLOWER ${CMAKE_SYSTEM_PROCESSOR} PROJECT_PROCESSOR)
4237
string (TOUPPER ${CMAKE_SYSTEM_PROCESSOR} PROJECT_PROCESSOR_UPPER)
43-
string (TOLOWER ${MACHINE} PROJECT_MACHINE)
44-
string (TOUPPER ${MACHINE} PROJECT_MACHINE_UPPER)
4538

4639
# Select which components are in the openamp lib
4740
option (WITH_PROXY "Build with proxy(access device controlled by other processor)" ON)
4841

49-
# LOAD_FW only allowed for R5, otherwise turn off
50-
if (NOT ${MACHINE} STREQUAL "zynqmp_r5")
51-
set (WITH_LOAD_FW OFF)
52-
endif(NOT ${MACHINE} STREQUAL "zynqmp_r5")
53-
5442
option (WITH_VIRTIO_DRIVER "Build with virtio driver (front end) enabled" ON)
5543
option (WITH_VIRTIO_DEVICE "Build with virtio device (back end) enabled" ON)
5644

cmake/platforms/zynqmp_linux.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
set (CMAKE_SYSTEM_PROCESSOR "arm64")
22
set (CROSS_PREFIX "aarch64-linux-gnu-")
3-
set (MACHINE "zynqmp" CACHE STRING "")
43

54
include (cross_linux_gcc)

cmake/platforms/zynqmp_r5_generic.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
set (CMAKE_SYSTEM_PROCESSOR "arm" CACHE STRING "")
2-
set (MACHINE "zynqmp_r5" CACHE STRING "")
32
set (CROSS_PREFIX "armr5-none-eabi-" CACHE STRING "")
43

54
# Xilinx SDK version earlier than 2017.2 use mfloat-abi=soft by default to generate libxil

cmake/syscheck.cmake

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,4 @@ if (WITH_ZEPHYR)
77
if (NOT WITH_ZEPHYR_LIB)
88
include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
99
endif ()
10-
if (CONFIG_CPU_CORTEX_M)
11-
set (MACHINE "cortexm" CACHE STRING "")
12-
endif (CONFIG_CPU_CORTEX_M)
1310
endif (WITH_ZEPHYR)

0 commit comments

Comments
 (0)