Merge pull request #14276 from harmut01/refactor_samsung

CMake: refactor Samsung targets
pull/14284/head
Martin Kojtal 2021-02-14 19:24:25 +00:00 committed by GitHub
commit 3ef03538f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 11 deletions

View File

@ -1,8 +1,6 @@
# Copyright (c) 2020 ARM Limited. All rights reserved. # Copyright (c) 2020 ARM Limited. All rights reserved.
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
if("SIDK_S1SBP6A" IN_LIST MBED_TARGET_LABELS) add_subdirectory(TARGET_SIDK_S1SBP6A EXCLUDE_FROM_ALL)
add_subdirectory(TARGET_SIDK_S1SBP6A) add_subdirectory(TARGET_SIDK_S5JS100 EXCLUDE_FROM_ALL)
elseif("SIDK_S5JS100" IN_LIST MBED_TARGET_LABELS)
add_subdirectory(TARGET_SIDK_S5JS100)
endif()

View File

@ -9,15 +9,15 @@ elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
set(STARTUP_FILE device/TOOLCHAIN_GCC_ARM/startup_s1sbp6a.S) set(STARTUP_FILE device/TOOLCHAIN_GCC_ARM/startup_s1sbp6a.S)
endif() endif()
set_property(GLOBAL PROPERTY MBED_TARGET_LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE}) add_library(mbed-s1sbp6a INTERFACE)
target_include_directories(mbed-core target_include_directories(mbed-s1sbp6a
INTERFACE INTERFACE
. .
device device
) )
target_sources(mbed-core target_sources(mbed-s1sbp6a
INTERFACE INTERFACE
PeripheralPins.c PeripheralPins.c
flash_api.c flash_api.c
@ -42,3 +42,5 @@ target_sources(mbed-core
${STARTUP_FILE} ${STARTUP_FILE}
) )
mbed_set_linker_script(mbed-s1sbp6a ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})

View File

@ -9,9 +9,9 @@ elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
set(STARTUP_FILE device/TOOLCHAIN_GCC_ARM/startup_sidk_s5js100.S) set(STARTUP_FILE device/TOOLCHAIN_GCC_ARM/startup_sidk_s5js100.S)
endif() endif()
set_property(GLOBAL PROPERTY MBED_TARGET_LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE}) add_library(mbed-s5js100 INTERFACE)
target_include_directories(mbed-core target_include_directories(mbed-s5js100
INTERFACE INTERFACE
. .
device device
@ -20,7 +20,7 @@ target_include_directories(mbed-core
security_subsystem/drivers security_subsystem/drivers
) )
target_sources(mbed-core target_sources(mbed-s5js100
INTERFACE INTERFACE
gpio_api.c gpio_api.c
gpio_irq_api.c gpio_irq_api.c
@ -61,3 +61,7 @@ target_sources(mbed-core
${STARTUP_FILE} ${STARTUP_FILE}
) )
mbed_set_linker_script(mbed-s5js100 ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
target_link_libraries(mbed-s5js100)