diff --git a/targets/CMakeLists.txt b/targets/CMakeLists.txt
index 15e0548953..1334eec5a9 100644
--- a/targets/CMakeLists.txt
+++ b/targets/CMakeLists.txt
@@ -29,6 +29,8 @@ elseif("Silicon_Labs" IN_LIST MBED_TARGET_LABELS)
     add_subdirectory(TARGET_Silicon_Labs)
 elseif("STM" IN_LIST MBED_TARGET_LABELS)
     add_subdirectory(TARGET_STM)
+elseif("TOSHIBA" IN_LIST MBED_TARGET_LABELS)
+    add_subdirectory(TARGET_TOSHIBA)
 elseif("WICED" IN_LIST MBED_TARGET_LABELS)
     add_subdirectory(TARGET_WICED)
 endif()
diff --git a/targets/TARGET_TOSHIBA/CMakeLists.txt b/targets/TARGET_TOSHIBA/CMakeLists.txt
new file mode 100644
index 0000000000..ad409baa4c
--- /dev/null
+++ b/targets/TARGET_TOSHIBA/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Copyright (c) 2020 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+if("TMPM46B" IN_LIST MBED_TARGET_LABELS)
+    add_subdirectory(TARGET_TMPM46B)
+elseif("TMPM4G9" IN_LIST MBED_TARGET_LABELS)
+    add_subdirectory(TARGET_TMPM4G9)
+endif()
+
+target_include_directories(mbed-core
+    INTERFACE
+        .
+)
diff --git a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/CMakeLists.txt b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/CMakeLists.txt
new file mode 100644
index 0000000000..d69a6a784c
--- /dev/null
+++ b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/CMakeLists.txt
@@ -0,0 +1,54 @@
+# Copyright (c) 2020 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+if(${MBED_TOOLCHAIN} STREQUAL "ARM")
+    set(LINKER_FILE device/TOOLCHAIN_ARM_STD/tmpm46bf10fg.sct)
+    set(STARTUP_FILE device/TOOLCHAIN_ARM_STD/startup_TMPM46B.S)
+elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
+    set(LINKER_FILE device/TOOLCHAIN_GCC_ARM/tmpm46bf10fg.ld)
+    set(STARTUP_FILE device/TOOLCHAIN_GCC_ARM/startup_TMPM46b.S)
+endif()
+
+set_property(GLOBAL PROPERTY MBED_TARGET_LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
+
+target_include_directories(mbed-core
+    INTERFACE
+        .
+        device
+        Periph_Driver/inc
+)
+
+target_sources(mbed-core
+    INTERFACE
+        analogin_api.c
+        flash_api.c
+        gpio_api.c
+        gpio_irq_api.c
+        i2c_api.c
+        pinmap.c
+        port_api.c
+        pwmout_api.c
+        reset_reason_api.c
+        rtc_api.c
+        serial_api.c
+        sleep.c
+        spi_api.c
+        trng_api.c
+        us_ticker.c
+
+        device/system_TMPM46B.c
+
+        Periph_Driver/src/tmpm46b_adc.c
+        Periph_Driver/src/tmpm46b_cg.c
+        Periph_Driver/src/tmpm46b_esg.c
+        Periph_Driver/src/tmpm46b_fc.c
+        Periph_Driver/src/tmpm46b_fuart.c
+        Periph_Driver/src/tmpm46b_gpio.c
+        Periph_Driver/src/tmpm46b_i2c.c
+        Periph_Driver/src/tmpm46b_rtc.c
+        Periph_Driver/src/tmpm46b_ssp.c
+        Periph_Driver/src/tmpm46b_tmrb.c
+        Periph_Driver/src/tmpm46b_uart.c
+
+        ${STARTUP_FILE}
+)
diff --git a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/device/TOOLCHAIN_ARM_STD/tmpm46bf10fg.sct b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/device/TOOLCHAIN_ARM_STD/tmpm46bf10fg.sct
index aa4a2d0755..9cd1df5290 100644
--- a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/device/TOOLCHAIN_ARM_STD/tmpm46bf10fg.sct
+++ b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/device/TOOLCHAIN_ARM_STD/tmpm46bf10fg.sct
@@ -1,4 +1,4 @@
-#! armcc -E -I. --cpu Cortex-M4
+#! armclang -E --target=arm-arm-none-eabi -x c -mcpu=cortex-m4
 ;;  TMPM46BF10 scatter file
 
 ;;  Vector table starts at 0
diff --git a/targets/TARGET_TOSHIBA/TARGET_TMPM4G9/CMakeLists.txt b/targets/TARGET_TOSHIBA/TARGET_TMPM4G9/CMakeLists.txt
new file mode 100644
index 0000000000..2222dbcdf7
--- /dev/null
+++ b/targets/TARGET_TOSHIBA/TARGET_TMPM4G9/CMakeLists.txt
@@ -0,0 +1,56 @@
+# Copyright (c) 2020 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+if(${MBED_TOOLCHAIN} STREQUAL "ARM")
+    set(LINKER_FILE device/TOOLCHAIN_ARM_STD/tmpm4g9f15.sct)
+    set(STARTUP_FILE device/TOOLCHAIN_ARM_STD/startup_TMPM4G9.S)
+elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
+    set(LINKER_FILE device/TOOLCHAIN_GCC_ARM/tmpm4g9f15fg.ld)
+    set(STARTUP_FILE device/TOOLCHAIN_GCC_ARM/startup_TMPM4G9.S)
+endif()
+
+set_property(GLOBAL PROPERTY MBED_TARGET_LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
+
+target_include_directories(mbed-core
+    INTERFACE
+        .
+        device
+        Periph_Driver/inc
+)
+
+target_sources(mbed-core
+    INTERFACE
+        analogin_api.c
+        analogout_api.c
+        flash_api.c
+        gpio_api.c
+        gpio_irq_api.c
+        i2c_api.c
+        pinmap.c
+        port_api.c
+        pwmout_api.c
+        reset_reason_api.c
+        rtc_api.c
+        serial_api.c
+        sleep.c
+        spi_api.c
+        us_ticker.c
+
+        device/system_TMPM4G9.c
+
+        Periph_Driver/src/txz_adc.c
+        Periph_Driver/src/txz_adc_ch.c
+        Periph_Driver/src/txz_cg.c
+        Periph_Driver/src/txz_fc.c
+        Periph_Driver/src/txz_fuart.c
+        Periph_Driver/src/txz_fuart_ex.c
+        Periph_Driver/src/txz_gpio.c
+        Periph_Driver/src/txz_hal.c
+        Periph_Driver/src/txz_i2c.c
+        Periph_Driver/src/txz_i2c_api.c
+        Periph_Driver/src/txz_t32a.c
+        Periph_Driver/src/txz_tspi.c
+        Periph_Driver/src/txz_uart.c
+
+        ${STARTUP_FILE}
+)
diff --git a/targets/TARGET_TOSHIBA/TARGET_TMPM4G9/device/TOOLCHAIN_ARM_STD/tmpm4g9f15.sct b/targets/TARGET_TOSHIBA/TARGET_TMPM4G9/device/TOOLCHAIN_ARM_STD/tmpm4g9f15.sct
index fa5642d3e2..da01cabd00 100644
--- a/targets/TARGET_TOSHIBA/TARGET_TMPM4G9/device/TOOLCHAIN_ARM_STD/tmpm4g9f15.sct
+++ b/targets/TARGET_TOSHIBA/TARGET_TMPM4G9/device/TOOLCHAIN_ARM_STD/tmpm4g9f15.sct
@@ -1,4 +1,4 @@
-#! armcc -E -I. --cpu Cortex-M4
+#! armclang -E --target=arm-arm-none-eabi -x c -mcpu=cortex-m4
 /*
  * Copyright(C) 2019, Toshiba Electronic Device Solutions Corporation
  *
diff --git a/tools/cmake/README.md b/tools/cmake/README.md
index 117703e020..dba3c26bb8 100644
--- a/tools/cmake/README.md
+++ b/tools/cmake/README.md
@@ -32,6 +32,7 @@ The following targets are supported:
 - Samsung targets
 - Silicon Labs targets
 - STM targets
+- Toshiba targets
 - WICED targets
 
 ### Supported toolchains