diff --git a/targets/targets.json b/targets/targets.json
index 490a53ee4a..a2d71dc460 100644
--- a/targets/targets.json
+++ b/targets/targets.json
@@ -2397,7 +2397,7 @@
         "inherits": ["Target"],
         "device_has": ["ANALOGIN", "CAN", "ETHERNET", "I2C", "I2CSLAVE", "I2C_ASYNCH", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SERIAL_FC", "SPI", "SPISLAVE", "SPI_ASYNCH", "STDIO_MESSAGES"],
         "features": ["LWIP"],
-        "release_versions": ["2"]
+        "release_versions": ["2", "5"]
     },
     "VK_RZ_A1H": {
         "inherits": ["Target"],
diff --git a/tools/build_api.py b/tools/build_api.py
index 423adc5121..5d9d613b81 100644
--- a/tools/build_api.py
+++ b/tools/build_api.py
@@ -441,13 +441,6 @@ def scan_resources(src_paths, toolchain, dependencies_paths=None,
     if  (hasattr(toolchain.target, "release_versions") and
             "5" not in toolchain.target.release_versions and
             "rtos" in toolchain.config.lib_config_data):
-        if "Cortex-A" in toolchain.target.core:
-            raise NotSupportedException(
-                ("%s Will be supported in a future version of Mbed OS. "
-                    "To use the %s, please checkout the mbed OS 5.4 release branch. "
-                    "See https://developer.mbed.org/platforms/Renesas-GR-PEACH/#important-notice "
-                    "for more information") % (toolchain.target.name, toolchain.target.name))
-        else:
             raise NotSupportedException("Target does not support mbed OS 5")
 
     return resources
diff --git a/tools/options.py b/tools/options.py
index 58aed4d6d7..d5d590b3e6 100644
--- a/tools/options.py
+++ b/tools/options.py
@@ -117,16 +117,6 @@ def extract_profile(parser, options, toolchain, fallback="develop"):
         profiles.append(contents)
 
     return profiles
-
-def mcu_is_enabled(parser, mcu):
-    if "Cortex-A" in TARGET_MAP[mcu].core:
-        args_error(
-            parser,
-            ("%s Will be supported in a future version of Mbed OS. "
-             "To use the %s, please checkout the mbed OS 5.4 release branch. "
-             "See https://developer.mbed.org/platforms/Renesas-GR-PEACH/#important-notice "
-             "for more information") % (mcu, mcu))
-    return True
     
 def extract_mcus(parser, options):
     try: