Skip to content

Commit 422eec3

Browse files
VladimirUmekVladimirUmek
committed
Update board layers
- use UART&CMSIS component to retarget stdio - add v_path parameter to fvp_config.txt - correct default configuration for vStream VideoIn/Out - add base address workaround for SSE-320 UART - align README.md text - correct linker scripts (disable compression)
1 parent cff6fc5 commit 422eec3

243 files changed

Lines changed: 7758 additions & 2863 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎ARM.AVH_FVP.pdsc‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -257,18 +257,18 @@
257257
</examples>
258258

259259
<csolution>
260-
<clayer type="Board" path="board/Corstone-300" file="Board.clayer.yml" copy-to="Board/Corstone-300" condition="Corstone-300"/>
261-
<clayer type="Board" path="board/Corstone-300" file="Board-U55.clayer.yml" copy-to="Board/Corstone-300" condition="Corstone-300"/>
262-
<clayer type="Board" path="board/Corstone-300" file="Board-U65.clayer.yml" copy-to="Board/Corstone-300" condition="Corstone-300"/>
260+
<clayer type="Board" path="board/Corstone-300" file="Board.clayer.yml" copy-to="board/Corstone-300" condition="Corstone-300"/>
261+
<clayer type="Board" path="board/Corstone-300" file="Board-U55.clayer.yml" copy-to="board/Corstone-300" condition="Corstone-300"/>
262+
<clayer type="Board" path="board/Corstone-300" file="Board-U65.clayer.yml" copy-to="board/Corstone-300" condition="Corstone-300"/>
263263

264-
<clayer type="Board" path="board/Corstone-310" file="Board.clayer.yml" copy-to="Board/Corstone-310" condition="Corstone-310"/>
265-
<clayer type="Board" path="board/Corstone-310" file="Board-U55.clayer.yml" copy-to="Board/Corstone-310" condition="Corstone-310"/>
266-
<clayer type="Board" path="board/Corstone-310" file="Board-U65.clayer.yml" copy-to="Board/Corstone-310" condition="Corstone-310"/>
264+
<clayer type="Board" path="board/Corstone-310" file="Board.clayer.yml" copy-to="board/Corstone-310" condition="Corstone-310"/>
265+
<clayer type="Board" path="board/Corstone-310" file="Board-U55.clayer.yml" copy-to="board/Corstone-310" condition="Corstone-310"/>
266+
<clayer type="Board" path="board/Corstone-310" file="Board-U65.clayer.yml" copy-to="board/Corstone-310" condition="Corstone-310"/>
267267

268-
<clayer type="Board" path="board/Corstone-315" file="Board.clayer.yml" copy-to="Board/Corstone-315" condition="Corstone-315"/>
269-
<clayer type="Board" path="board/Corstone-315" file="Board-U65.clayer.yml" copy-to="Board/Corstone-315" condition="Corstone-315"/>
268+
<clayer type="Board" path="board/Corstone-315" file="Board.clayer.yml" copy-to="board/Corstone-315" condition="Corstone-315"/>
269+
<clayer type="Board" path="board/Corstone-315" file="Board-U65.clayer.yml" copy-to="board/Corstone-315" condition="Corstone-315"/>
270270

271-
<clayer type="Board" path="board/Corstone-320" file="Board.clayer.yml" copy-to="Board/Corstone-320" condition="Corstone-320"/>
272-
<clayer type="Board" path="board/Corstone-320" file="Board-U85.clayer.yml" copy-to="Board/Corstone-320" condition="Corstone-320"/>
271+
<clayer type="Board" path="board/Corstone-320" file="Board.clayer.yml" copy-to="board/Corstone-320" condition="Corstone-320"/>
272+
<clayer type="Board" path="board/Corstone-320" file="Board-U85.clayer.yml" copy-to="board/Corstone-320" condition="Corstone-320"/>
273273
</csolution>
274274
</package>

‎board/Corstone-300/Board-U55.clayer.yml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ layer:
2626

2727
packs:
2828
- pack: ARM::CMSIS
29-
- pack: ARM::CMSIS-Compiler@^2.1.0
29+
- pack: ARM::CMSIS-Compiler@^2.2.0
3030
- pack: ARM::ethos-u-core-driver@^1.25.2
3131
- pack: ARM::AVH_FVP
3232
- pack: ARM::V2M_MPS3_SSE_300_BSP@1.5.0
@@ -42,9 +42,9 @@ layer:
4242
- component: CMSIS Driver:vStream:VideoOut
4343

4444
- component: CMSIS-Compiler:CORE
45-
- component: CMSIS-Compiler:STDERR:Custom
46-
- component: CMSIS-Compiler:STDIN:Custom
47-
- component: CMSIS-Compiler:STDOUT:Custom
45+
- component: CMSIS-Compiler:STDERR:UART&CMSIS
46+
- component: CMSIS-Compiler:STDIN:UART&CMSIS
47+
- component: CMSIS-Compiler:STDOUT:UART&CMSIS
4848

4949
- component: Device:Definition
5050
- component: Device:Startup&C Startup
@@ -62,7 +62,6 @@ layer:
6262
- file: ./main.c
6363
- file: ./main.h
6464
- file: ./ethos_setup.c
65-
- file: ./retarget_stdio.c
6665

6766
linker:
6867
- regions: ./regions_SSE-300.h

‎board/Corstone-300/Board-U65.clayer.yml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ layer:
2626

2727
packs:
2828
- pack: ARM::CMSIS
29-
- pack: ARM::CMSIS-Compiler@^2.1.0
29+
- pack: ARM::CMSIS-Compiler@^2.2.0
3030
- pack: ARM::ethos-u-core-driver@^1.25.2
3131
- pack: ARM::AVH_FVP
3232
- pack: ARM::V2M_MPS3_SSE_300_BSP@1.5.0
@@ -42,9 +42,9 @@ layer:
4242
- component: CMSIS Driver:vStream:VideoOut
4343

4444
- component: CMSIS-Compiler:CORE
45-
- component: CMSIS-Compiler:STDERR:Custom
46-
- component: CMSIS-Compiler:STDIN:Custom
47-
- component: CMSIS-Compiler:STDOUT:Custom
45+
- component: CMSIS-Compiler:STDERR:UART&CMSIS
46+
- component: CMSIS-Compiler:STDIN:UART&CMSIS
47+
- component: CMSIS-Compiler:STDOUT:UART&CMSIS
4848

4949
- component: Device:Definition
5050
- component: Device:Startup&C Startup
@@ -62,7 +62,6 @@ layer:
6262
- file: ./main.c
6363
- file: ./main.h
6464
- file: ./ethos_setup.c
65-
- file: ./retarget_stdio.c
6665

6766
linker:
6867
- regions: ./regions_SSE-300.h

‎board/Corstone-300/Board.clayer.yml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ layer:
2525

2626
packs:
2727
- pack: ARM::CMSIS
28-
- pack: ARM::CMSIS-Compiler@^2.1.0
28+
- pack: ARM::CMSIS-Compiler@^2.2.0
2929
- pack: ARM::AVH_FVP
3030
- pack: ARM::V2M_MPS3_SSE_300_BSP@1.5.0
3131

@@ -40,9 +40,9 @@ layer:
4040
- component: CMSIS Driver:vStream:VideoOut
4141

4242
- component: CMSIS-Compiler:CORE
43-
- component: CMSIS-Compiler:STDERR:Custom
44-
- component: CMSIS-Compiler:STDIN:Custom
45-
- component: CMSIS-Compiler:STDOUT:Custom
43+
- component: CMSIS-Compiler:STDERR:UART&CMSIS
44+
- component: CMSIS-Compiler:STDIN:UART&CMSIS
45+
- component: CMSIS-Compiler:STDOUT:UART&CMSIS
4646

4747
- component: Device:Definition
4848
- component: Device:Startup&C Startup
@@ -57,7 +57,6 @@ layer:
5757
files:
5858
- file: ./main.c
5959
- file: ./main.h
60-
- file: ./retarget_stdio.c
6160

6261
linker:
6362
- regions: ./regions_SSE-300.h

‎board/Corstone-300/RTE/CMSIS-Compiler/stderr_cmsis_uart_config.h‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
/*---------------------------------------------------------------------------
2+
* Copyright (c) 2026 Arm Limited (or its affiliates).
3+
* All rights reserved.
4+
*
5+
* SPDX-License-Identifier: Apache-2.0
6+
*
7+
* Licensed under the Apache License, Version 2.0 (the License); you may
8+
* not use this file except in compliance with the License.
9+
* You may obtain a copy of the License at
10+
*
11+
* www.apache.org/licenses/LICENSE-2.0
12+
*
13+
* Unless required by applicable law or agreed to in writing, software
14+
* distributed under the License is distributed on an AS IS BASIS, WITHOUT
15+
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
* See the License for the specific language governing permissions and
17+
* limitations under the License.
18+
* --------------------------------------------------------------------------
19+
*
20+
* Purpose: Configure STDERR to CMSIS-Driver USART retarget implementation
21+
* Revision: V1.0.0
22+
*
23+
* --------------------------------------------------------------------------*/
24+
25+
#ifndef STDERR_CMSIS_UART_CONFIG_H_
26+
#define STDERR_CMSIS_UART_CONFIG_H_
27+
28+
//-------- <<< Use Configuration Wizard in Context Menu >>> --------------------
29+
//------ With VS Code: Open Preview for Configuration Wizard -------------------
30+
31+
// <o>UART STDERR Buffer Size
32+
// <i> UART STDERR buffer is used to store STDERR data before sending it via UART
33+
// <i> Default: 0 (unbuffered)
34+
#ifndef STDERR_UART_BUFFER_SIZE
35+
#define STDERR_UART_BUFFER_SIZE 0
36+
#endif
37+
38+
// <s>UART STDERR Buffer Section Name
39+
// <i> Specify the memory section name for UART STDERR buffer
40+
// <i> Default: .stderr_uart_buf
41+
#ifndef STDERR_UART_BUFFER_SECTION
42+
#define STDERR_UART_BUFFER_SECTION ".stderr_uart_buf"
43+
#endif
44+
45+
// <o>UART STDERR Buffer Alignment
46+
// <i> Define the STDERR buffer alignment in bytes
47+
// <i> Default: 32
48+
#ifndef STDERR_UART_BUFFER_ALIGNMENT
49+
#define STDERR_UART_BUFFER_ALIGNMENT 32
50+
#endif
51+
52+
// <q>Convert LF to CRLF
53+
// <i> If enabled, LF characters are preceded by CR characters on output
54+
// <i> Default: 0
55+
#ifndef STDERR_CR_LF
56+
#define STDERR_CR_LF 1
57+
#endif
58+
59+
#endif /* STDERR_CMSIS_UART_CONFIG_H_ */

‎board/Corstone-300/RTE/CMSIS-Compiler/stderr_cmsis_uart_config.h.base@1.0.0‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
/*---------------------------------------------------------------------------
2+
* Copyright (c) 2026 Arm Limited (or its affiliates).
3+
* All rights reserved.
4+
*
5+
* SPDX-License-Identifier: Apache-2.0
6+
*
7+
* Licensed under the Apache License, Version 2.0 (the License); you may
8+
* not use this file except in compliance with the License.
9+
* You may obtain a copy of the License at
10+
*
11+
* www.apache.org/licenses/LICENSE-2.0
12+
*
13+
* Unless required by applicable law or agreed to in writing, software
14+
* distributed under the License is distributed on an AS IS BASIS, WITHOUT
15+
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
* See the License for the specific language governing permissions and
17+
* limitations under the License.
18+
* --------------------------------------------------------------------------
19+
*
20+
* Purpose: Configure STDERR to CMSIS-Driver USART retarget implementation
21+
* Revision: V1.0.0
22+
*
23+
* --------------------------------------------------------------------------*/
24+
25+
#ifndef STDERR_CMSIS_UART_CONFIG_H_
26+
#define STDERR_CMSIS_UART_CONFIG_H_
27+
28+
//-------- <<< Use Configuration Wizard in Context Menu >>> --------------------
29+
//------ With VS Code: Open Preview for Configuration Wizard -------------------
30+
31+
// <o>UART STDERR Buffer Size
32+
// <i> UART STDERR buffer is used to store STDERR data before sending it via UART
33+
// <i> Default: 0 (unbuffered)
34+
#ifndef STDERR_UART_BUFFER_SIZE
35+
#define STDERR_UART_BUFFER_SIZE 0
36+
#endif
37+
38+
// <s>UART STDERR Buffer Section Name
39+
// <i> Specify the memory section name for UART STDERR buffer
40+
// <i> Default: .stderr_uart_buf
41+
#ifndef STDERR_UART_BUFFER_SECTION
42+
#define STDERR_UART_BUFFER_SECTION ".stderr_uart_buf"
43+
#endif
44+
45+
// <o>UART STDERR Buffer Alignment
46+
// <i> Define the STDERR buffer alignment in bytes
47+
// <i> Default: 32
48+
#ifndef STDERR_UART_BUFFER_ALIGNMENT
49+
#define STDERR_UART_BUFFER_ALIGNMENT 32
50+
#endif
51+
52+
// <q>Convert LF to CRLF
53+
// <i> If enabled, LF characters are preceded by CR characters on output
54+
// <i> Default: 0
55+
#ifndef STDERR_CR_LF
56+
#define STDERR_CR_LF 0
57+
#endif
58+
59+
#endif /* STDERR_CMSIS_UART_CONFIG_H_ */

‎board/Corstone-300/RTE/CMSIS-Compiler/stdin_cmsis_uart_config.h‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
/*---------------------------------------------------------------------------
2+
* Copyright (c) 2026 Arm Limited (or its affiliates).
3+
* All rights reserved.
4+
*
5+
* SPDX-License-Identifier: Apache-2.0
6+
*
7+
* Licensed under the Apache License, Version 2.0 (the License); you may
8+
* not use this file except in compliance with the License.
9+
* You may obtain a copy of the License at
10+
*
11+
* www.apache.org/licenses/LICENSE-2.0
12+
*
13+
* Unless required by applicable law or agreed to in writing, software
14+
* distributed under the License is distributed on an AS IS BASIS, WITHOUT
15+
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
* See the License for the specific language governing permissions and
17+
* limitations under the License.
18+
* --------------------------------------------------------------------------
19+
*
20+
* Purpose: Configure STDIN to CMSIS-Driver USART retarget implementation
21+
* Revision: V1.0.0
22+
*
23+
* --------------------------------------------------------------------------*/
24+
25+
#ifndef STDIN_CMSIS_UART_CONFIG_H_
26+
#define STDIN_CMSIS_UART_CONFIG_H_
27+
28+
//-------- <<< Use Configuration Wizard in Context Menu >>> --------------------
29+
//------ With VS Code: Open Preview for Configuration Wizard -------------------
30+
31+
// <o>UART STDIN Buffer Size
32+
// <i> UART STDIN buffer is used to store STDIN data received via UART
33+
// <i> Default: 64
34+
#ifndef STDIN_UART_BUFFER_SIZE
35+
#define STDIN_UART_BUFFER_SIZE 64
36+
#endif
37+
38+
// <s>UART STDIN Buffer Section Name
39+
// <i> Specify the memory section name for UART STDIN buffer
40+
// <i> Default: .stdin_uart_buf
41+
#ifndef STDIN_UART_BUFFER_SECTION
42+
#define STDIN_UART_BUFFER_SECTION ".stdin_uart_buf"
43+
#endif
44+
45+
// <o>UART STDIN Buffer Alignment
46+
// <i> Define the STDIN buffer alignment in bytes
47+
// <i> Default: 32
48+
#ifndef STDIN_UART_BUFFER_ALIGNMENT
49+
#define STDIN_UART_BUFFER_ALIGNMENT 32
50+
#endif
51+
52+
// <q>Echo Input Characters
53+
// <i> If enabled, received characters are echoed to STDOUT
54+
// <i> Default: 0
55+
#ifndef STDIN_ECHO
56+
#define STDIN_ECHO 0
57+
#endif
58+
59+
#endif /* STDIN_CMSIS_UART_CONFIG_H_ */

‎board/Corstone-300/RTE/CMSIS-Compiler/stdin_cmsis_uart_config.h.base@1.0.0‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
/*---------------------------------------------------------------------------
2+
* Copyright (c) 2026 Arm Limited (or its affiliates).
3+
* All rights reserved.
4+
*
5+
* SPDX-License-Identifier: Apache-2.0
6+
*
7+
* Licensed under the Apache License, Version 2.0 (the License); you may
8+
* not use this file except in compliance with the License.
9+
* You may obtain a copy of the License at
10+
*
11+
* www.apache.org/licenses/LICENSE-2.0
12+
*
13+
* Unless required by applicable law or agreed to in writing, software
14+
* distributed under the License is distributed on an AS IS BASIS, WITHOUT
15+
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
* See the License for the specific language governing permissions and
17+
* limitations under the License.
18+
* --------------------------------------------------------------------------
19+
*
20+
* Purpose: Configure STDIN to CMSIS-Driver USART retarget implementation
21+
* Revision: V1.0.0
22+
*
23+
* --------------------------------------------------------------------------*/
24+
25+
#ifndef STDIN_CMSIS_UART_CONFIG_H_
26+
#define STDIN_CMSIS_UART_CONFIG_H_
27+
28+
//-------- <<< Use Configuration Wizard in Context Menu >>> --------------------
29+
//------ With VS Code: Open Preview for Configuration Wizard -------------------
30+
31+
// <o>UART STDIN Buffer Size
32+
// <i> UART STDIN buffer is used to store STDIN data received via UART
33+
// <i> Default: 64
34+
#ifndef STDIN_UART_BUFFER_SIZE
35+
#define STDIN_UART_BUFFER_SIZE 64
36+
#endif
37+
38+
// <s>UART STDIN Buffer Section Name
39+
// <i> Specify the memory section name for UART STDIN buffer
40+
// <i> Default: .stdin_uart_buf
41+
#ifndef STDIN_UART_BUFFER_SECTION
42+
#define STDIN_UART_BUFFER_SECTION ".stdin_uart_buf"
43+
#endif
44+
45+
// <o>UART STDIN Buffer Alignment
46+
// <i> Define the STDIN buffer alignment in bytes
47+
// <i> Default: 32
48+
#ifndef STDIN_UART_BUFFER_ALIGNMENT
49+
#define STDIN_UART_BUFFER_ALIGNMENT 32
50+
#endif
51+
52+
// <q>Echo Input Characters
53+
// <i> If enabled, received characters are echoed to STDOUT
54+
// <i> Default: 0
55+
#ifndef STDIN_ECHO
56+
#define STDIN_ECHO 0
57+
#endif
58+
59+
#endif /* STDIN_CMSIS_UART_CONFIG_H_ */

0 commit comments

Comments
 (0)