Add ra6m4 support lib

app/os_wrapper_freertos.c

@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2019-2020, Arm Limited. All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+/*
+ * This file contains the implementation of APIs which are defined in
+ * os_wrapper/mutex.h by TF-M(tag: TF-Mv1.1). The implementation is based
+ * on FreeRTOS mutex type semaphore.
+ */
+
+#include "os_wrapper/mutex.h"
+
+#include "FreeRTOS.h"
+#include "semphr.h"
+#include "mpu_wrappers.h"
+
+#if( configSUPPORT_STATIC_ALLOCATION == 1 )
+    /*
+     * In the static allocation, the RAM is required to hold the semaphore's
+     * state.
+     */
+    StaticSemaphore_t xSecureMutexBuffer;
+#endif
+
+void * os_wrapper_mutex_create( void )
+{
+SemaphoreHandle_t xMutexHandle = NULL;
+
+#if( configSUPPORT_DYNAMIC_ALLOCATION == 1 )
+    xMutexHandle = xSemaphoreCreateMutex();
+#elif( configSUPPORT_STATIC_ALLOCATION == 1 )
+    xMutexHandle = xSemaphoreCreateMutexStatic( &xSecureMutexBuffer );
+#endif
+    return ( void * ) xMutexHandle;
+}
+/*-----------------------------------------------------------*/
+
+uint32_t os_wrapper_mutex_acquire( void * handle, uint32_t timeout )
+{
+BaseType_t xRet;
+
+    if( ! handle )
+        return OS_WRAPPER_ERROR;
+
+    xRet = xSemaphoreTake( ( SemaphoreHandle_t ) handle,
+                           ( timeout == OS_WRAPPER_WAIT_FOREVER ) ?
+                           portMAX_DELAY : ( TickType_t ) timeout );
+
+    if( xRet != pdPASS )
+        return OS_WRAPPER_ERROR;
+    else
+        return OS_WRAPPER_SUCCESS;
+}
+/*-----------------------------------------------------------*/
+
+uint32_t os_wrapper_mutex_release( void * handle )
+{
+BaseType_t xRet;
+
+    if( !handle )
+        return OS_WRAPPER_ERROR;
+
+    xRet = xSemaphoreGive( ( SemaphoreHandle_t ) handle );
+
+    if( xRet != pdPASS )
+        return OS_WRAPPER_ERROR;
+    else
+        return OS_WRAPPER_SUCCESS;
+}
+/*-----------------------------------------------------------*/
+
+uint32_t os_wrapper_mutex_delete( void * handle )
+{
+    vSemaphoreDelete( ( SemaphoreHandle_t ) handle );
+
+    return OS_WRAPPER_SUCCESS;
+}
+/*-----------------------------------------------------------*/

bl2/ext/mcuboot/bl2_main.c

@@ -44,7 +44,7 @@ __asm("  .global __ARM_use_no_argv\n");
 #endif
 
 #if defined(__ARM_ARCH_8M_MAIN__) || defined(__ARM_ARCH_8M_BASE__)
-REGION_DECLARE(Image$$, ARM_LIB_STACK, $$ZI$$Base);
+extern uint32_t __StackLimit;
 #endif
 
 /* Flash device name must be specified by target */
@@ -94,18 +94,17 @@ static void do_boot(struct boot_rsp *rsp)
     boot_platform_quit(vt);
 }
 
-int main(void)
+int bl2_main (void)
 {
 #if defined(__ARM_ARCH_8M_MAIN__) || defined(__ARM_ARCH_8M_BASE__)
-    uint32_t msp_stack_bottom =
-            (uint32_t)&REGION_NAME(Image$$, ARM_LIB_STACK, $$ZI$$Base);
+    uint32_t msp_stack_bottom = (uint32_t) &__StackLimit;
 #endif
     struct boot_rsp rsp;
     int rc;
 
 #if defined(__ARM_ARCH_8M_MAIN__) || defined(__ARM_ARCH_8M_BASE__)
     __set_MSPLIM(msp_stack_bottom);
-#endif
+#endif 
 
     /* Perform platform specific initialization */
     if (boot_platform_init() != 0) {

bl2/ext/mcuboot/bootutil/src/bootutil_priv.h

@@ -152,7 +152,7 @@ _Static_assert(BOOT_IMAGE_NUMBER > 0, "Invalid value for BOOT_IMAGE_NUMBER");
                      (swap_info) = (image) << SWAP_INFO_IMAGE_NUM_POS          \
                                  | (type);                                     \
                      }
-
+#if BL2_TEMP_DIS
 /*
  * The current flashmap API does not check the amount of space allocated when
  * loading sector data from the flash device, allowing for smaller counts here
@@ -163,7 +163,7 @@ _Static_assert(BOOT_IMAGE_NUMBER > 0, "Invalid value for BOOT_IMAGE_NUMBER");
 #if BOOT_MAX_IMG_SECTORS < 32
 #error "Too few sectors, please increase BOOT_MAX_IMG_SECTORS to at least 32"
 #endif
-
+#endif
 /** Number of image slots in flash; currently limited to two. */
 #define BOOT_NUM_SLOTS                  2
 

bl2/ext/mcuboot/bootutil/src/image_rsa.c

@@ -25,6 +25,7 @@
  */
 
 #include <string.h>
+#include "rm_bl2_cfg.h"
 
 #include "mcuboot_config/mcuboot_config.h"
 

bl2/ext/mcuboot/bootutil/src/image_validate.c

@@ -34,6 +34,7 @@
 #include "bootutil/sha256.h"
 #include "bootutil/sign_key.h"
 #include "security_cnt.h"
+#include "rm_bl2_cfg.h"
 
 #include "mcuboot_config/mcuboot_config.h"
 

bl2/ext/mcuboot/bootutil/src/loader.c

@@ -869,6 +869,10 @@ boot_read_status(struct boot_loader_state *state, struct boot_status *bs)
     bs->swap_type = BOOT_SWAP_TYPE_NONE;
 
 #ifdef MCUBOOT_OVERWRITE_ONLY
+    #if BL2_TEMP_EN
+    if(boot_data.imgs[BOOT_CURR_IMG(state)][BOOT_SECONDARY_SLOT].is_hdr_valid == true)
+        bs->swap_type = BOOT_SWAP_TYPE_PERM;
+    #endif
     /* Overwrite-only doesn't make use of the swap status area. */
     return 0;
 #else
@@ -2353,6 +2357,7 @@ context_boot_go(struct boot_loader_state *state, struct boot_rsp *rsp)
             }
         }
 
+#if defined(__ARM_ARCH_8M_MAIN__) || defined(__ARM_ARCH_8M_BASE__)
         /* Save boot status to shared memory area */
 #if (BOOT_IMAGE_NUMBER > 1)
         rc = boot_save_boot_status((BOOT_CURR_IMG(state) == 0) ?
@@ -2370,6 +2375,7 @@ context_boot_go(struct boot_loader_state *state, struct boot_rsp *rsp)
             BOOT_LOG_ERR("Failed to add Image %u data to shared area",
                          BOOT_CURR_IMG(state));
         }
+#endif
     }
 
 #if (BOOT_IMAGE_NUMBER > 1)

bl2/ext/mcuboot/include/bl2_util.h

@@ -26,9 +26,7 @@
      */
 #define IS_ARRAY(array) 0
 #else
-#define IS_ARRAY(array) \
-        ZERO_OR_COMPILE_ERROR(!__builtin_types_compatible_p(__typeof__(array), \
-                              __typeof__(&(array)[0])))
+#define IS_ARRAY(array) 0
 #endif
 
 #define ARRAY_SIZE(array) \

bl2/ext/mcuboot/include/config-rsa.h

@@ -36,6 +36,7 @@
 #ifndef MCUBOOT_MBEDTLS_CONFIG_RSA
 #define MCUBOOT_MBEDTLS_CONFIG_RSA
 
+#include "rm_bl2_cfg.h"
 /* System support */
 #define MBEDTLS_PLATFORM_C
 #define MBEDTLS_PLATFORM_MEMORY

bl2/ext/mcuboot/include/mcuboot_config/mcuboot_config.h

@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2018 Open Source Foundries Limited
+ * Copyright (c) 2019 Arm Limited
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * Original code taken from mcuboot project at:
+ * https://github.com/JuulLabs-OSS/mcuboot
+ * Git SHA of the original version: ac55554059147fff718015be9f4bd3108123f50a
+ */
+
+#ifndef __MCUBOOT_CONFIG_H__
+#define __MCUBOOT_CONFIG_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * This file is also included by the simulator, but we don't want to
+ * define anything here in simulator builds.
+ *
+ * Instead of using mcuboot_config.h, the simulator adds MCUBOOT_xxx
+ * configuration flags to the compiler command lines based on the
+ * values of environment variables. However, the file still must
+ * exist, or bootutil won't build.
+ */
+#ifndef __BOOTSIM__
+
+/*
+ * In TF-M most of the configuration flags (e.g. signature type,
+ * upgrade mode ...) are handled by the CMake-based buildsystem and
+ * added to the compiler command lines.
+ */
+
+/*
+ * Cryptographic settings
+ */
+#define MCUBOOT_USE_MBED_TLS
+
+/*
+ * Logging
+ */
+#define MCUBOOT_HAVE_LOGGING    1
+
+#endif /* !__BOOTSIM__ */
+
+/*
+ * Maximum size of the measured boot record.
+ *
+ * Its size can be calculated based on the following aspects:
+ *     - There are 5 allowed software component claims,
+ *     - SHA256 is used as the measurement method for the other claims.
+ * Considering these aspects, the only claim which size can vary is the type
+ * of the software component with a maximum length of 12 bytes, which means
+ * the boot record size can be up to 100 bytes.
+ */
+#define MAX_BOOT_RECORD_SZ  (100u)
+
+/*
+ * Watchdog feeding
+ */
+#define MCUBOOT_WATCHDOG_FEED()     \
+    do {                            \
+        /* Do nothing. */           \
+    } while (0)
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __MCUBOOT_CONFIG_H__ */

bl2/ext/mcuboot/include/mcuboot_config/mcuboot_logging.h

@@ -20,6 +20,7 @@
 
 #include "bootutil/ignore.h"
 #include <stdio.h>
+#include "rm_bl2_cfg.h"
 
 #ifdef __cplusplus
 extern "C" {

bl2/ext/mcuboot/keys.c

@@ -26,6 +26,7 @@
 
 #include <stddef.h>
 #include <bootutil/sign_key.h>
+#include "rm_bl2_cfg.h"
 #include "mcuboot_config/mcuboot_config.h"
 #include "platform/include/tfm_plat_crypto_keys.h"
 

bl2/src/boot_record.c

@@ -62,6 +62,7 @@ boot_add_data_to_shared_area(uint8_t        major_type,
                              size_t         size,
                              const uint8_t *data)
 {
+#ifdef BOOT_DATA_AVAILABLE
     struct shared_data_tlv_entry tlv_entry = {0};
     struct tfm_boot_data *boot_data;
     uint8_t *next_tlv;
@@ -120,6 +121,8 @@ boot_add_data_to_shared_area(uint8_t        major_type,
 
     boot_data->header.tlv_tot_len += tlv_entry.tlv_len;
 
+#endif /* BOOT_DATA_AVAILABLE */
+
     return SHARED_MEMORY_OK;
 }
 

interface/include/psa/client.h

@@ -11,6 +11,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
+#include "tfm_common_config.h"
 #include "psa/error.h"
 
 #ifdef __cplusplus

interface/include/psa/crypto.h

@@ -920,7 +920,7 @@ psa_status_t psa_hash_compare(psa_algorithm_t alg,
                               const uint8_t *input,
                               size_t input_length,
                               const uint8_t *hash,
-                              const size_t hash_length);
+                              size_t hash_length);
 
 /** The type of the state data structure for multipart hash operations.
  *
@@ -1288,7 +1288,7 @@ psa_status_t psa_mac_verify(psa_key_handle_t handle,
                             const uint8_t *input,
                             size_t input_length,
                             const uint8_t *mac,
-                            const size_t mac_length);
+                            size_t mac_length);
 
 /** The type of the state data structure for multipart MAC operations.
  *