Skip to content

Commit 773ac8d

Browse files
author
Oren Cohen
committed
CR fixes
1 parent 2b9f94a commit 773ac8d

File tree

8 files changed

+67
-12
lines changed

8 files changed

+67
-12
lines changed

TESTS/mbed_hal/spm/fault_functions.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
/* mbed Microcontroller Library
2-
* Copyright (c) 2017 ARM Limited
1+
/* Copyright (c) 2017-2018 ARM Limited
2+
*
3+
* SPDX-License-Identifier: Apache-2.0
34
*
45
* Licensed under the Apache License, Version 2.0 (the "License");
56
* you may not use this file except in compliance with the License.

TESTS/mbed_hal/spm/main.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
/* mbed Microcontroller Library
2-
* Copyright (c) 2017 ARM Limited
1+
/* Copyright (c) 2017-2018 ARM Limited
2+
*
3+
* SPDX-License-Identifier: Apache-2.0
34
*
45
* Licensed under the Apache License, Version 2.0 (the "License");
56
* you may not use this file except in compliance with the License.

TESTS/psa/spm_smoke/COMPONENT_SPE/partition1.c

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
/* Copyright (c) 2017-2018 ARM Limited
2+
*
3+
* SPDX-License-Identifier: Apache-2.0
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
7+
* You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
118
// -------------------------------------- Includes -----------------------------------
219

320
#include <string.h>

components/TARGET_PSA/spm/COMPONENT_SPE/handles_manager.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -112,14 +112,14 @@ handles_pool
112112

113113
/*
114114
* @brief create unique handle identifier
115-
*
115+
*
116116
* This function generates a unique handle identifier, and "couples" it with the received handle memory.
117117
* If there is no vacant space for the new handle, the function fails.
118-
*
118+
*
119119
* @note This function is expected to pass since it is always coupled with memory pool allocation of the same size.
120120
* In case memory pool allocation fails, this function should not be called.
121121
* This function will panic on non vacant space use case.
122-
*
122+
*
123123
* @param[in] handle_mgr A pointer to the handle manager object
124124
* @param[in] handle_mem A pointer to a pre-allocated handle memory to get a handle identifier for
125125
* @param[in] friend_pid The partition id which is allowed to get_mem() and destroy() in addition to the handle owner.
@@ -131,7 +131,7 @@ psa_handle_t psa_hndl_mgr_handle_create(psa_handle_manager_t *handle_mgr, void *
131131

132132
/*
133133
* @brief remove a handle from the handle manager.
134-
*
134+
*
135135
* @param handle_mgr A pointer to the handle manager object
136136
* @param handle The handle to be removed
137137
*/
@@ -140,12 +140,12 @@ void psa_hndl_mgr_handle_destroy(psa_handle_manager_t *handle_mgr, psa_handle_t
140140

141141
/*
142142
* @brief dereference handle
143-
*
143+
*
144144
* This function retrieves the pointer associated with the input <handle>.
145-
*
145+
*
146146
* @note This function will panic in case caller not allowed to dereference the memory
147147
* or handler does not correspond to a valid existing handle
148-
*
148+
*
149149
* @param handle_mgr A pointer to the handle manager object.
150150
* @param handle The handle for which we request the corresponding memory handle.
151151
* @return void* A pointer to the memory corresponding to the handle.

hal/spm_api.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
/* Copyright (c) 2018 ARM Limited
1+
/* Copyright (c) 2017-2018 ARM Limited
2+
*
3+
* SPDX-License-Identifier: Apache-2.0
24
*
35
* Licensed under the Apache License, Version 2.0 (the "License");
46
* you may not use this file except in compliance with the License.

tools/settings.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
##############################################################################
2828
BUILD_DIR = abspath(join(ROOT, "BUILD"))
2929

30+
# Default directory for dual-core and v8 targets
31+
# delivering secure binaries across builds
3032
DELIVERY_DIR = abspath(join(ROOT, "DELIVERY"))
3133

3234
# ARM Compiler 5

tools/test/spm/test_data.py

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
# Copyright (c) 2017-2018 ARM Limited
2+
#
3+
# SPDX-License-Identifier: Apache-2.0
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
117
manifests = [
218
{
319
'name': 'TEST_PARTITION',

tools/test/spm/test_generate_partition_code.py

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
# Copyright (c) 2017-2018 ARM Limited
2+
#
3+
# SPDX-License-Identifier: Apache-2.0
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
117
import filecmp
218
import re
319
import shutil

0 commit comments

Comments
 (0)