diff --git a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/inc/tmpm46b_adc.h b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/inc/tmpm46b_adc.h
index 979fc9a658..f14ca306ee 100644
--- a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/inc/tmpm46b_adc.h
+++ b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/inc/tmpm46b_adc.h
@@ -5,9 +5,9 @@
  * @version V2.0.2.1
  * @date    2015/02/11
  * 
- * DO NOT USE THIS SOFTWARE WITHOUT THE SOFTWARE LISENCE AGREEMENT.
+ * DO NOT USE THIS SOFTWARE WITHOUT THE SOFTWARE LICENSE AGREEMENT.
  * 
- * (C)Copyright TOSHIBA CORPORATION 2015 All rights reserved
+ * (C)Copyright TOSHIBA ELECTRONIC DEVICES & STORAGE CORPORATION 2017 All rights reserved
  *******************************************************************************
  */
 
diff --git a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/inc/tmpm46b_cg.h b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/inc/tmpm46b_cg.h
index e81b35b8ba..4383d4b785 100644
--- a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/inc/tmpm46b_cg.h
+++ b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/inc/tmpm46b_cg.h
@@ -5,9 +5,9 @@
  * @version V2.0.2.1
  * @date    2015/02/26
  *
- * DO NOT USE THIS SOFTWARE WITHOUT THE SOFTWARE LISENCE AGREEMENT.
+ * DO NOT USE THIS SOFTWARE WITHOUT THE SOFTWARE LICENSE AGREEMENT.
  *
- * (C)Copyright TOSHIBA CORPORATION 2015 All rights reserved
+ * (C)Copyright TOSHIBA ELECTRONIC DEVICES & STORAGE CORPORATION 2017 All rights reserved
  *******************************************************************************
  */
 
diff --git a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/inc/tmpm46b_esg.h b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/inc/tmpm46b_esg.h
index 2a0a12726c..f3546108cd 100644
--- a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/inc/tmpm46b_esg.h
+++ b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/inc/tmpm46b_esg.h
@@ -5,9 +5,9 @@
  * @version V2.0.2.1
  * @date    2015/02/04
  * 
- * DO NOT USE THIS SOFTWARE WITHOUT THE SOFTWARE LISENCE AGREEMENT.
+ * DO NOT USE THIS SOFTWARE WITHOUT THE SOFTWARE LICENSE AGREEMENT.
  * 
- * (C)Copyright TOSHIBA CORPORATION 2015 All rights reserved
+ * (C)Copyright TOSHIBA ELECTRONIC DEVICES & STORAGE CORPORATION 2017 All rights reserved
  *******************************************************************************
  */
 
diff --git a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/inc/tmpm46b_fc.h b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/inc/tmpm46b_fc.h
index 6b3e955feb..91eed550ff 100644
--- a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/inc/tmpm46b_fc.h
+++ b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/inc/tmpm46b_fc.h
@@ -5,9 +5,9 @@
  * @version V2.0.2.1
  * @date    2015/02/27
  * 
- * DO NOT USE THIS SOFTWARE WITHOUT THE SOFTWARE LISENCE AGREEMENT.
+ * DO NOT USE THIS SOFTWARE WITHOUT THE SOFTWARE LICENSE AGREEMENT.
  * 
- * (C)Copyright TOSHIBA CORPORATION 2015 All rights reserved
+ * (C)Copyright TOSHIBA ELECTRONIC DEVICES & STORAGE CORPORATION 2017 All rights reserved
  *******************************************************************************
  */
 
diff --git a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/inc/tmpm46b_fuart.h b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/inc/tmpm46b_fuart.h
index 99a913893a..dec3b3cf64 100644
--- a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/inc/tmpm46b_fuart.h
+++ b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/inc/tmpm46b_fuart.h
@@ -5,9 +5,9 @@
  * @version V2.0.2.1
  * @date    2015/02/26
  * 
- * DO NOT USE THIS SOFTWARE WITHOUT THE SOFTWARE LISENCE AGREEMENT.
+ * DO NOT USE THIS SOFTWARE WITHOUT THE SOFTWARE LICENSE AGREEMENT.
  * 
- * (C)Copyright TOSHIBA CORPORATION 2015 All rights reserved
+ * (C)Copyright TOSHIBA ELECTRONIC DEVICES & STORAGE CORPORATION 2017 All rights reserved
  *******************************************************************************
  */
 
diff --git a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/inc/tmpm46b_gpio.h b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/inc/tmpm46b_gpio.h
index d1b7fbf48e..c51a2794f0 100644
--- a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/inc/tmpm46b_gpio.h
+++ b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/inc/tmpm46b_gpio.h
@@ -5,9 +5,9 @@
  * @version V2.0.2.1
  * @date    2015/02/09
  * 
- * DO NOT USE THIS SOFTWARE WITHOUT THE SOFTWARE LISENCE AGREEMENT.
+ * DO NOT USE THIS SOFTWARE WITHOUT THE SOFTWARE LICENSE AGREEMENT.
  * 
- * (C)Copyright TOSHIBA CORPORATION 2015 All rights reserved
+ * (C)Copyright TOSHIBA ELECTRONIC DEVICES & STORAGE CORPORATION 2017 All rights reserved
  *******************************************************************************
  */
 
diff --git a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/inc/tmpm46b_i2c.h b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/inc/tmpm46b_i2c.h
index bcf5e46de2..f894655b5c 100644
--- a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/inc/tmpm46b_i2c.h
+++ b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/inc/tmpm46b_i2c.h
@@ -5,9 +5,9 @@
  * @version V2.0.2.1
  * @date    2015/02/13
  * 
- * DO NOT USE THIS SOFTWARE WITHOUT THE SOFTWARE LISENCE AGREEMENT.
+ * DO NOT USE THIS SOFTWARE WITHOUT THE SOFTWARE LICENSE AGREEMENT.
  * 
- * (C)Copyright TOSHIBA CORPORATION 2015 All rights reserved
+ * (C)Copyright TOSHIBA ELECTRONIC DEVICES & STORAGE CORPORATION 2017 All rights reserved
  *******************************************************************************
  */
 
diff --git a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/inc/tmpm46b_rtc.h b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/inc/tmpm46b_rtc.h
index 50684407ae..27f8f53eb8 100644
--- a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/inc/tmpm46b_rtc.h
+++ b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/inc/tmpm46b_rtc.h
@@ -5,9 +5,9 @@
  * @version V2.0.2.1
  * @date    2015/02/11
  * 
- * DO NOT USE THIS SOFTWARE WITHOUT THE SOFTWARE LISENCE AGREEMENT.
+ * DO NOT USE THIS SOFTWARE WITHOUT THE SOFTWARE LICENSE AGREEMENT.
  * 
- * (C)Copyright TOSHIBA CORPORATION 2015 All rights reserved
+ * (C)Copyright TOSHIBA ELECTRONIC DEVICES & STORAGE CORPORATION 2017 All rights reserved
  *******************************************************************************
  */
 
diff --git a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/inc/tmpm46b_ssp.h b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/inc/tmpm46b_ssp.h
index e4a3848cda..5bdede19e0 100644
--- a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/inc/tmpm46b_ssp.h
+++ b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/inc/tmpm46b_ssp.h
@@ -5,9 +5,9 @@
  * @version V2.0.2.1
  * @date    2015/02/05
  *
- * DO NOT USE THIS SOFTWARE WITHOUT THE SOFTWARE LISENCE AGREEMENT.
+ * DO NOT USE THIS SOFTWARE WITHOUT THE SOFTWARE LICENSE AGREEMENT.
  *
- * (C)Copyright TOSHIBA CORPORATION 2015 All rights reserved
+ * (C)Copyright TOSHIBA ELECTRONIC DEVICES & STORAGE CORPORATION 2017 All rights reserved
  *******************************************************************************
  */
 
diff --git a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/inc/tmpm46b_tmrb.h b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/inc/tmpm46b_tmrb.h
index 14ee5bd722..25d61b4b6d 100644
--- a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/inc/tmpm46b_tmrb.h
+++ b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/inc/tmpm46b_tmrb.h
@@ -5,9 +5,9 @@
  * @version V2.0.2.1
  * @date    2015/02/27
  *
- * DO NOT USE THIS SOFTWARE WITHOUT THE SOFTWARE LISENCE AGREEMENT.
+ * DO NOT USE THIS SOFTWARE WITHOUT THE SOFTWARE LICENSE AGREEMENT.
  *
- * (C)Copyright TOSHIBA CORPORATION 2015 All rights reserved
+ * (C)Copyright TOSHIBA ELECTRONIC DEVICES & STORAGE CORPORATION 2017 All rights reserved
  *******************************************************************************
  */
 
diff --git a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/inc/tmpm46b_uart.h b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/inc/tmpm46b_uart.h
index b28e2d6fba..86154ab7fe 100644
--- a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/inc/tmpm46b_uart.h
+++ b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/inc/tmpm46b_uart.h
@@ -5,9 +5,9 @@
  * @version V2.0.2.1
  * @date    2015/02/26
  * 
- * DO NOT USE THIS SOFTWARE WITHOUT THE SOFTWARE LISENCE AGREEMENT.
+ * DO NOT USE THIS SOFTWARE WITHOUT THE SOFTWARE LICENSE AGREEMENT.
  * 
- * (C)Copyright TOSHIBA CORPORATION 2015 All rights reserved
+ * (C)Copyright TOSHIBA ELECTRONIC DEVICES & STORAGE CORPORATION 2017 All rights reserved
  *******************************************************************************
  */
 
diff --git a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/inc/tx04_common.h b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/inc/tx04_common.h
index ff1ad0e61d..ccfb9aec3f 100644
--- a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/inc/tx04_common.h
+++ b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/inc/tx04_common.h
@@ -5,7 +5,7 @@
  * @version V2.0.2.1
  * @date    2015/02/04
  * 
- * DO NOT USE THIS SOFTWARE WITHOUT THE SOFTWARE LISENCE AGREEMENT.
+ * DO NOT USE THIS SOFTWARE WITHOUT THE SOFTWARE LICENSE AGREEMENT.
  * 
  * (C)Copyright TOSHIBA ELECTRONIC DEVICES & STORAGE CORPORATION 2017 All rights reserved
  *******************************************************************************
diff --git a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/src/tmpm46b_adc.c b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/src/tmpm46b_adc.c
index f8eb4569e8..f9189bcbd4 100644
--- a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/src/tmpm46b_adc.c
+++ b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/src/tmpm46b_adc.c
@@ -5,7 +5,7 @@
  * @version V2.0.2.1
  * @date    2015/02/11
  * 
- * DO NOT USE THIS SOFTWARE WITHOUT THE SOFTWARE LISENCE AGREEMENT.
+ * DO NOT USE THIS SOFTWARE WITHOUT THE SOFTWARE LICENSE AGREEMENT.
  * 
  * (C)Copyright TOSHIBA ELECTRONIC DEVICES & STORAGE CORPORATION 2017 All rights reserved
  *******************************************************************************
diff --git a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/src/tmpm46b_cg.c b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/src/tmpm46b_cg.c
index 1492bea351..68b9901ccc 100644
--- a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/src/tmpm46b_cg.c
+++ b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/src/tmpm46b_cg.c
@@ -5,7 +5,7 @@
  * @version V2.0.2.1
  * @date    2015/02/26
  *
- * DO NOT USE THIS SOFTWARE WITHOUT THE SOFTWARE LISENCE AGREEMENT.
+ * DO NOT USE THIS SOFTWARE WITHOUT THE SOFTWARE LICENSE AGREEMENT.
  *
  * (C)Copyright TOSHIBA ELECTRONIC DEVICES & STORAGE CORPORATION 2017 All rights reserved
  *******************************************************************************
diff --git a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/src/tmpm46b_esg.c b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/src/tmpm46b_esg.c
index 7908f8f0dd..466741184e 100644
--- a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/src/tmpm46b_esg.c
+++ b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/src/tmpm46b_esg.c
@@ -2,12 +2,12 @@
  *******************************************************************************
  * @file    tmpm46B_esg.c
  * @brief   This file provides API functions for ESG driver.
- * @version V2.0.2.1
- * @date    2015/02/04
+ * @version V2.0.2.2
+ * @date    2018/03/15
  * 
- * DO NOT USE THIS SOFTWARE WITHOUT THE SOFTWARE LISENCE AGREEMENT.
+ * DO NOT USE THIS SOFTWARE WITHOUT THE SOFTWARE LICENSE AGREEMENT.
  * 
- * (C)Copyright TOSHIBA CORPORATION 2015 All rights reserved
+ * (C)Copyright TOSHIBA ELECTRONIC DEVICES & STORAGE CORPORATION 2018 All rights reserved
  *******************************************************************************
  */
  
@@ -251,12 +251,6 @@ void ESG_IPReset(void)
 
     TSB_SRST->IPRST |= SRST_IPRST_3_SET;
 
-    /* Confirm SRSTIPRST<IPRST3> = 1 */
-    do {
-        iprst3 = TSB_SRST->IPRST & SRST_IPRST_3_SET;
-    }
-    while (iprst3 != SRST_IPRST_3_SET);
-
     /* Release reset state */
     TSB_SRST->IPRST &= SRST_IPRST_3_CLEAR;
 
diff --git a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/src/tmpm46b_fc.c b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/src/tmpm46b_fc.c
index c036539181..247ce1ab73 100644
--- a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/src/tmpm46b_fc.c
+++ b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/src/tmpm46b_fc.c
@@ -5,9 +5,9 @@
  * @version V2.0.2.1
  * @date    2015/02/27
  * 
- * DO NOT USE THIS SOFTWARE WITHOUT THE SOFTWARE LISENCE AGREEMENT.
+ * DO NOT USE THIS SOFTWARE WITHOUT THE SOFTWARE LICENSE AGREEMENT.
  * 
- * (C)Copyright TOSHIBA CORPORATION 2015 All rights reserved
+ * (C)Copyright TOSHIBA ELECTRONIC DEVICES & STORAGE CORPORATION 2017 All rights reserved
  *******************************************************************************
  */
 
diff --git a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/src/tmpm46b_fuart.c b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/src/tmpm46b_fuart.c
index f5623d6e32..5af975a0ac 100644
--- a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/src/tmpm46b_fuart.c
+++ b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/src/tmpm46b_fuart.c
@@ -5,7 +5,7 @@
  * @version V2.0.2.1
  * @date    2015/02/26
  * 
- * DO NOT USE THIS SOFTWARE WITHOUT THE SOFTWARE LISENCE AGREEMENT.
+ * DO NOT USE THIS SOFTWARE WITHOUT THE SOFTWARE LICENSE AGREEMENT.
  * 
  * (C)Copyright TOSHIBA ELECTRONIC DEVICES & STORAGE CORPORATION 2017 All rights reserved
  *******************************************************************************
diff --git a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/src/tmpm46b_gpio.c b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/src/tmpm46b_gpio.c
index 0e1c82ccd6..de34041fb6 100644
--- a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/src/tmpm46b_gpio.c
+++ b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/src/tmpm46b_gpio.c
@@ -5,7 +5,7 @@
  * @version V2.0.2.1
  * @date    2015/02/09
  * 
- * DO NOT USE THIS SOFTWARE WITHOUT THE SOFTWARE LISENCE AGREEMENT.
+ * DO NOT USE THIS SOFTWARE WITHOUT THE SOFTWARE LICENSE AGREEMENT.
  * 
  * (C)Copyright TOSHIBA ELECTRONIC DEVICES & STORAGE CORPORATION 2017 All rights reserved
  *******************************************************************************
diff --git a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/src/tmpm46b_i2c.c b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/src/tmpm46b_i2c.c
index e6c0f78f8b..2eec539f1a 100644
--- a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/src/tmpm46b_i2c.c
+++ b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/src/tmpm46b_i2c.c
@@ -5,7 +5,7 @@
  * @version V2.0.2.1
  * @date    2015/02/13
  * 
- * DO NOT USE THIS SOFTWARE WITHOUT THE SOFTWARE LISENCE AGREEMENT.
+ * DO NOT USE THIS SOFTWARE WITHOUT THE SOFTWARE LICENSE AGREEMENT.
  * 
  * (C)Copyright TOSHIBA ELECTRONIC DEVICES & STORAGE CORPORATION 2017 All rights reserved
  *******************************************************************************
diff --git a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/src/tmpm46b_rtc.c b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/src/tmpm46b_rtc.c
index b998aa4b92..654967092b 100644
--- a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/src/tmpm46b_rtc.c
+++ b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/src/tmpm46b_rtc.c
@@ -5,7 +5,7 @@
  * @version V2.0.2.1
  * @date    2015/02/11
  * 
- * DO NOT USE THIS SOFTWARE WITHOUT THE SOFTWARE LISENCE AGREEMENT.
+ * DO NOT USE THIS SOFTWARE WITHOUT THE SOFTWARE LICENSE AGREEMENT.
  * 
  * (C)Copyright TOSHIBA ELECTRONIC DEVICES & STORAGE CORPORATION 2017 All rights reserved
  *******************************************************************************
diff --git a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/src/tmpm46b_ssp.c b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/src/tmpm46b_ssp.c
index 3f238d4a04..cdd986589f 100644
--- a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/src/tmpm46b_ssp.c
+++ b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/src/tmpm46b_ssp.c
@@ -5,7 +5,7 @@
  * @version V2.0.2.1
  * @date    2015/02/05
  *
- * DO NOT USE THIS SOFTWARE WITHOUT THE SOFTWARE LISENCE AGREEMENT.
+ * DO NOT USE THIS SOFTWARE WITHOUT THE SOFTWARE LICENSE AGREEMENT.
  *
  * (C)Copyright TOSHIBA ELECTRONIC DEVICES & STORAGE CORPORATION 2017 All rights reserved
  ******************************************************************************/
diff --git a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/src/tmpm46b_tmrb.c b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/src/tmpm46b_tmrb.c
index 6fef115a8c..bf44ef4d59 100644
--- a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/src/tmpm46b_tmrb.c
+++ b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/src/tmpm46b_tmrb.c
@@ -5,7 +5,7 @@
  * @version V2.0.2.1
  * @date    2015/02/27
  *
- * DO NOT USE THIS SOFTWARE WITHOUT THE SOFTWARE LISENCE AGREEMENT.
+ * DO NOT USE THIS SOFTWARE WITHOUT THE SOFTWARE LICENSE AGREEMENT.
  *
  * (C)Copyright TOSHIBA ELECTRONIC DEVICES & STORAGE CORPORATION 2017 All rights reserved
  *******************************************************************************
diff --git a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/src/tmpm46b_uart.c b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/src/tmpm46b_uart.c
index 5891f6a03f..9a308d8065 100644
--- a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/src/tmpm46b_uart.c
+++ b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/src/tmpm46b_uart.c
@@ -5,7 +5,7 @@
  * @version V2.0.2.1
  * @date    2015/02/26
  *
- * DO NOT USE THIS SOFTWARE WITHOUT THE SOFTWARE LISENCE AGREEMENT.
+ * DO NOT USE THIS SOFTWARE WITHOUT THE SOFTWARE LICENSE AGREEMENT.
  *
  * (C)Copyright TOSHIBA ELECTRONIC DEVICES & STORAGE CORPORATION 2017 All rights reserved
  *******************************************************************************
diff --git a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/device/TMPM46B.h b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/device/TMPM46B.h
index ed49a627d9..16aa634b39 100644
--- a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/device/TMPM46B.h
+++ b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/device/TMPM46B.h
@@ -3,12 +3,12 @@
  * @file    TMPM46B.h
  * @brief   CMSIS Cortex-M4 Core Peripheral Access Layer Header File for the
  *          TOSHIBA 'TMPM46B' Device Series
- * @version V2.0.2.4 (Tentative)
+ * @version V2.0.2.4
  * @date    2015/03/13
  * 
- * DO NOT USE THIS SOFTWARE WITHOUT THE SOFTWARE LISENCE AGREEMENT.
+ * DO NOT USE THIS SOFTWARE WITHOUT THE SOFTWARE LICENSE AGREEMENT.
  * 
-* (C)Copyright TOSHIBA ELECTRONIC DEVICES & STORAGE CORPORATION 2017 All rights reserved
+ * (C)Copyright TOSHIBA ELECTRONIC DEVICES & STORAGE CORPORATION 2017 All rights reserved
  *******************************************************************************
  */
 
diff --git a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/device/TOOLCHAIN_ARM_STD/startup_TMPM46B.S b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/device/TOOLCHAIN_ARM_STD/startup_TMPM46B.S
index 6a68766e74..dd915cb3ae 100644
--- a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/device/TOOLCHAIN_ARM_STD/startup_TMPM46B.S
+++ b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/device/TOOLCHAIN_ARM_STD/startup_TMPM46B.S
@@ -3,11 +3,11 @@
 ; * @file    startup_TMPM46B.s
 ; * @brief   CMSIS Cortex-M4 Core Device Startup File for the
 ; *          TOSHIBA 'TMPM46B' Device Series
-; * @version V2.0.2.4 (Tentative)
+; * @version V2.0.2.4
 ; * @date    2015/03/31
 ; *------- <<< Use Configuration Wizard in Context Menu >>> ------------------
 ; * 
-; * DO NOT USE THIS SOFTWARE WITHOUT THE SOFTWARE LISENCE AGREEMENT.
+; * DO NOT USE THIS SOFTWARE WITHOUT THE SOFTWARE LICENSE AGREEMENT.
 ; * 
 ; * (C)Copyright TOSHIBA ELECTRONIC DEVICES & STORAGE CORPORATION 2017 All rights reserved
 ; *******************************************************************************
diff --git a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/device/TOOLCHAIN_IAR/startup_TMPM46B.S b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/device/TOOLCHAIN_IAR/startup_TMPM46B.S
index 59991ed3bd..699fa21a2c 100644
--- a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/device/TOOLCHAIN_IAR/startup_TMPM46B.S
+++ b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/device/TOOLCHAIN_IAR/startup_TMPM46B.S
@@ -3,10 +3,10 @@
 ; * @file    startup_TMPM46B.s
 ; * @brief   CMSIS Cortex-M4 Core Device Startup File for the
 ; *          TOSHIBA 'TMPM46B' Device Series
-; * @version V2.0.2.4 (Tentative)
+; * @version V2.0.2.4
 ; * @date    2015/03/31
 ; * 
-; * DO NOT USE THIS SOFTWARE WITHOUT THE SOFTWARE LISENCE AGREEMENT.
+; * DO NOT USE THIS SOFTWARE WITHOUT THE SOFTWARE LICENSE AGREEMENT.
 ; * 
 ; * (C)Copyright TOSHIBA ELECTRONIC DEVICES & STORAGE CORPORATION 2017 All rights reserved
 ; *******************************************************************************
diff --git a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/device/system_TMPM46B.c b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/device/system_TMPM46B.c
index 7f2dd9d3c6..f54fa75426 100644
--- a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/device/system_TMPM46B.c
+++ b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/device/system_TMPM46B.c
@@ -3,12 +3,12 @@
  * @file    system_TMPM46B.c
  * @brief   CMSIS Cortex-M4 Device Peripheral Access Layer Source File for the
  *          TOSHIBA 'TMPM46B' Device Series
- * @version V2.0.2.3
- * @date    2015/4/9
+ * @version V2.0.2.4
+ * @date    2018/3/15
  *
- * DO NOT USE THIS SOFTWARE WITHOUT THE SOFTWARE LISENCE AGREEMENT.
+ * DO NOT USE THIS SOFTWARE WITHOUT THE SOFTWARE LICENSE AGREEMENT.
  *
- * (C)Copyright TOSHIBA ELECTRONIC DEVICES & STORAGE CORPORATION 2017 All rights reserved
+ * (C)Copyright TOSHIBA ELECTRONIC DEVICES & STORAGE CORPORATION 2018 All rights reserved
  *******************************************************************************
  */
 
@@ -31,25 +31,22 @@
 #define CG_8M_MUL_4_FPLL        (0x00006A0FUL<<1U)
 #define CG_8M_MUL_5_FPLL        (0x00006A13UL<<1U)
 #define CG_8M_MUL_6_FPLL        (0x00006917UL<<1U)
-#define CG_8M_MUL_8_FPLL        (0x0000691FUL<<1U)
 #define CG_8M_MUL_10_FPLL       (0x00006A26UL<<1U)
 #define CG_8M_MUL_12_FPLL       (0x0000692EUL<<1U)
 
 #define CG_10M_MUL_4_FPLL       (0x00006A0FUL<<1U)
 #define CG_10M_MUL_5_FPLL       (0x00006A13UL<<1U)
 #define CG_10M_MUL_6_FPLL       (0x00006917UL<<1U)
-#define CG_10M_MUL_8_FPLL       (0x0000691FUL<<1U)
+#define CG_10M_MUL_8_FPLL       (0x00006A1EUL<<1U)
 #define CG_10M_MUL_10_FPLL      (0x00006A26UL<<1U)
 #define CG_10M_MUL_12_FPLL      (0x0000692EUL<<1U)
 
 #define CG_12M_MUL_4_FPLL       (0x00006A0FUL<<1U)
 #define CG_12M_MUL_5_FPLL       (0x00006A13UL<<1U)
-#define CG_12M_MUL_6_FPLL       (0x00006917UL<<1U)
-#define CG_12M_MUL_8_FPLL       (0x0000691FUL<<1U)
+#define CG_12M_MUL_8_FPLL       (0x00006A1EUL<<1U)
 #define CG_12M_MUL_10_FPLL      (0x00006A26UL<<1U)
 
 #define CG_16M_MUL_4_FPLL       (0x00006A0FUL<<1U)
-#define CG_16M_MUL_5_FPLL       (0x00006A13UL<<1U)
 
 #define CG_PLLSEL_PLLON_SET                  ((uint32_t)0x00010000)
 #define CG_PLLSEL_PLLON_CLEAR                ((uint32_t)0xFFFEFFFF)
@@ -225,8 +222,6 @@ void SystemCoreClockUpdate(void)
                 CoreClockInput = CoreClock * 5U;                            /* output clock is 40MHz */
             } else if ((TSB_CG->PLLSEL & PLLSEL_MASK) == CG_8M_MUL_6_FPLL) {
                 CoreClockInput = CoreClock * 6U;                            /* output clock is 48MHz */
-            } else if ((TSB_CG->PLLSEL & PLLSEL_MASK) == CG_8M_MUL_8_FPLL) {
-                CoreClockInput = CoreClock * 8U;                            /* output clock is 64MHz */
             } else if ((TSB_CG->PLLSEL & PLLSEL_MASK) == CG_8M_MUL_10_FPLL) {
                 CoreClockInput = CoreClock * 10U;                            /* output clock is 80MHz */
             } else if ((TSB_CG->PLLSEL & PLLSEL_MASK) == CG_8M_MUL_12_FPLL) {
@@ -255,8 +250,6 @@ void SystemCoreClockUpdate(void)
                 CoreClockInput = CoreClock * 4U;                             /* output clock is 48MHz */
             } else if ((TSB_CG->PLLSEL & PLLSEL_MASK) == CG_12M_MUL_5_FPLL) {
                 CoreClockInput = CoreClock * 5U;                             /* output clock is 60MHz */
-            } else if ((TSB_CG->PLLSEL & PLLSEL_MASK) == CG_12M_MUL_6_FPLL) {
-                CoreClockInput = CoreClock * 6U;                             /* output clock is 72MHz */
             } else if ((TSB_CG->PLLSEL & PLLSEL_MASK) == CG_12M_MUL_8_FPLL) {
                 CoreClockInput = CoreClock * 8U;                             /* output clock is 96MHz */
             } else if ((TSB_CG->PLLSEL & PLLSEL_MASK) == CG_12M_MUL_10_FPLL) {
@@ -267,8 +260,6 @@ void SystemCoreClockUpdate(void)
         } else if (CoreClock == OSC_16M) {                                  /* If input is 16MHz */
             if ((TSB_CG->PLLSEL & PLLSEL_MASK) == CG_16M_MUL_4_FPLL) {
                 CoreClockInput = CoreClock * 4U;                             /* output clock is 64MHz */
-            } else if ((TSB_CG->PLLSEL & PLLSEL_MASK) == CG_16M_MUL_5_FPLL) {
-                CoreClockInput = CoreClock * 5U;                             /* output clock is 80MHz */
             } else {
                 CoreClockInput = 0U;                                         /* fc -> reserved        */
             }
@@ -326,6 +317,14 @@ void SystemInit(void)
     volatile uint32_t oscf = 0U;
     uint32_t wdte = 0U;
 
+#if defined ( __CC_ARM  )/*Enable FPU for Keil*/
+  #if (__FPU_USED == 1)                        /* __FPU_USED is defined in core_cm4.h */
+    /* enable FPU if available and used */
+    SCB->CPACR |= ((3UL << 10*2) |             /* set CP10 Full Access                */
+                   (3UL << 11*2)  );           /* set CP11 Full Access                */
+  #endif
+#endif 
+
 #if (WD_SETUP)                  /* Watchdog Setup */
     while (TSB_WD->FLG != 0U) {
     }                /* When writing to WDMOD or WDCR, confirm "0" of WDFLG<FLG>. */
diff --git a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/device/system_TMPM46B.h b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/device/system_TMPM46B.h
index 620641db91..b2fa3861a2 100644
--- a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/device/system_TMPM46B.h
+++ b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/device/system_TMPM46B.h
@@ -3,10 +3,10 @@
  * @file     system_TMPM46B.h
  * @brief    CMSIS Cortex-M4 Device Peripheral Access Layer Header File for the
  *           TOSHIBA 'TMPM46B' Device Series 
- * @version  V2.0.2.1 (Tentative)
+ * @version  V2.0.2.1
  * @date     2014/12/03
  * 
- * DO NOT USE THIS SOFTWARE WITHOUT THE SOFTWARE LISENCE AGREEMENT.
+ * DO NOT USE THIS SOFTWARE WITHOUT THE SOFTWARE LICENSE AGREEMENT.
  * 
  * (C)Copyright TOSHIBA ELECTRONIC DEVICES & STORAGE CORPORATION 2017 All rights reserved
  *****************************************************************************