From a3a36ccb9208211dcfadcd37343db74f417a769c Mon Sep 17 00:00:00 2001 From: Hugues Kamba Date: Fri, 19 Feb 2021 16:48:32 +0000 Subject: [PATCH] CMake: Fix some NUVOTON build Correct source file listings for M251, M261. Also remove unused input source files. --- targets/TARGET_NUVOTON/TARGET_M251/CMakeLists.txt | 2 +- targets/TARGET_NUVOTON/TARGET_M261/CMakeLists.txt | 5 +++-- .../TARGET_M480/TARGET_NUMAKER_IOT_M487/CMakeLists.txt | 7 ------- .../TARGET_M480/TARGET_NUMAKER_PFM_M487/CMakeLists.txt | 7 ------- 4 files changed, 4 insertions(+), 17 deletions(-) delete mode 100644 targets/TARGET_NUVOTON/TARGET_M480/TARGET_NUMAKER_IOT_M487/CMakeLists.txt delete mode 100644 targets/TARGET_NUVOTON/TARGET_M480/TARGET_NUMAKER_PFM_M487/CMakeLists.txt diff --git a/targets/TARGET_NUVOTON/TARGET_M251/CMakeLists.txt b/targets/TARGET_NUVOTON/TARGET_M251/CMakeLists.txt index 518c667ee9..fcf5c8cc17 100644 --- a/targets/TARGET_NUVOTON/TARGET_M251/CMakeLists.txt +++ b/targets/TARGET_NUVOTON/TARGET_M251/CMakeLists.txt @@ -4,7 +4,7 @@ if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM") set(LINKER_FILE device/TOOLCHAIN_GCC_ARM/M251.ld) elseif(${MBED_TOOLCHAIN} STREQUAL "ARM") - set(LINKER_FILE device/TOOLCHAIN_ARM_STD/M251.sct) + set(LINKER_FILE device/TOOLCHAIN_ARMC6/M251.sct) endif() add_library(mbed-m251 INTERFACE) diff --git a/targets/TARGET_NUVOTON/TARGET_M261/CMakeLists.txt b/targets/TARGET_NUVOTON/TARGET_M261/CMakeLists.txt index eff0d54d33..eb6eb4fed1 100644 --- a/targets/TARGET_NUVOTON/TARGET_M261/CMakeLists.txt +++ b/targets/TARGET_NUVOTON/TARGET_M261/CMakeLists.txt @@ -4,7 +4,7 @@ if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM") set(LINKER_FILE device/TOOLCHAIN_GCC_ARM/M261.ld) elseif(${MBED_TOOLCHAIN} STREQUAL "ARM") - set(LINKER_FILE device/TOOLCHAIN_ARM_STD/M261.sct) + set(LINKER_FILE device/TOOLCHAIN_ARMC6/M261.sct) endif() add_library(mbed-m261 INTERFACE) @@ -14,7 +14,7 @@ target_sources(mbed-m261 analogin_api.c analogout_api.c device/startup_M261.c - device/system_M251.c + device/system_M261.c device/StdDriver/m261_acmp.c device/StdDriver/m261_bpwm.c @@ -78,6 +78,7 @@ target_include_directories(mbed-m261 crypto device device/Reg + device/StdDriver device/StdDriver/inc ) diff --git a/targets/TARGET_NUVOTON/TARGET_M480/TARGET_NUMAKER_IOT_M487/CMakeLists.txt b/targets/TARGET_NUVOTON/TARGET_M480/TARGET_NUMAKER_IOT_M487/CMakeLists.txt deleted file mode 100644 index 5c029ccc7a..0000000000 --- a/targets/TARGET_NUVOTON/TARGET_M480/TARGET_NUMAKER_IOT_M487/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright (c) 2020 ARM Limited. All rights reserved. -# SPDX-License-Identifier: Apache-2.0 - -target_include_directories(mbed-core - INTERFACE - . -) diff --git a/targets/TARGET_NUVOTON/TARGET_M480/TARGET_NUMAKER_PFM_M487/CMakeLists.txt b/targets/TARGET_NUVOTON/TARGET_M480/TARGET_NUMAKER_PFM_M487/CMakeLists.txt deleted file mode 100644 index 5c029ccc7a..0000000000 --- a/targets/TARGET_NUVOTON/TARGET_M480/TARGET_NUMAKER_PFM_M487/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright (c) 2020 ARM Limited. All rights reserved. -# SPDX-License-Identifier: Apache-2.0 - -target_include_directories(mbed-core - INTERFACE - . -)