Skip to content

Commit fba60bc

Browse files
Evagan2018evangelos.ganotopoulos@arm.com
Evagan2018
and
[email protected]
authored
Reworked examles to support reproducible builds. (#38)
For each project in this repository: - Updated the vcpkg-configuration.json file. - Reworked the examle to support reproducible builds. - Added a compiler configuration file (cdefault.yml). - Updated the workflow. - Updated the README.md documentation file. --------- Co-authored-by: [email protected] <Eve07@Git>
1 parent a7aae33 commit fba60bc

Some content is hidden

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

54 files changed

+6634
-414
lines changed

‎.github/workflows/CubeMX-CI.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ jobs:
3232

3333
- name: Build project with AC6
3434
working-directory: ./CubeMX/
35-
run: cbuild CubeMX.csolution.yml --update-rte --packs --toolchain AC6 --rebuild
35+
run: cbuild CubeMX.csolution.yml --packs --toolchain AC6 --rebuild

‎.github/workflows/DualCore-CI.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232

3333
- name: Build HelloWorld with AC6 and all contexts
3434
working-directory: ./DualCore/
35-
run: cbuild HelloWorld.csolution.yml --update-rte --packs --toolchain AC6
35+
run: cbuild HelloWorld.csolution.yml --packs --toolchain AC6
3636

3737
- name: Upload HelloWorld AC6 build Artifacts
3838
uses: actions/upload-artifact@v4

‎.github/workflows/SimpleTZ-CI.yml‎

Lines changed: 56 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,56 @@
1-
name: "SimpleTZ: Test Build and Execution"
2-
on:
3-
workflow_dispatch:
4-
pull_request:
5-
branches: [main]
6-
paths:
7-
- SimpleTrustZone/**
8-
- .github/workflows/SimpleTZ-CI.yml
9-
push:
10-
branches: [main]
11-
paths:
12-
- SimpleTrustZone/**
13-
- .github/workflows/SimpleTZ-CI.yml
14-
schedule:
15-
- cron: '00 20 * * 6'
16-
17-
jobs:
18-
Build:
19-
strategy:
20-
matrix:
21-
22-
compiler: [
23-
{name: AC6, ext: axf},
24-
{name: GCC, ext: elf}
25-
]
26-
build: [
27-
{type: Release},
28-
{type: Debug}
29-
]
30-
31-
runs-on: ubuntu-latest
32-
33-
steps:
34-
- name: Checkout repo
35-
uses: actions/checkout@v4
36-
37-
- name: Install tools
38-
uses: ARM-software/cmsis-actions/vcpkg@v1
39-
with:
40-
config: ".ci/vcpkg-configuration.json"
41-
42-
- name: Activate Arm tool license
43-
uses: ARM-software/cmsis-actions/armlm@v1
44-
45-
- name: Build project CM33_s and CM33_ns for build-type ${{ matrix.build.type }} with ${{ matrix.compiler.name }}
46-
working-directory: ./SimpleTrustZone/
47-
run: cbuild SimpleTZ.csolution.yml --update-rte --packs --context .${{ matrix.build.type }}+CS300 --toolchain ${{ matrix.compiler.name }}
48-
49-
- name: Execute project CM33_s and CM33_ns for build-type ${{ matrix.build.type }} with ${{ matrix.compiler.name }} using FVP_Corstone_SSE-300
50-
working-directory: ./SimpleTrustZone/
51-
run: |
52-
FVP_Corstone_SSE-300 \
53-
-a ./out/CM33_s/CS300/${{ matrix.build.type }}/CM33_s.${{ matrix.compiler.ext }} \
54-
-a ./out/CM33_ns/CS300/${{ matrix.build.type }}/CM33_ns.${{ matrix.compiler.ext }} \
55-
-f ./../FVP/FVP_Corstone_SSE-300/fvp_config.txt \
56-
-C mps3_board.uart0.out_file=./out/${{ matrix.compiler.name }}_${{ matrix.build.type }}_fvp_stdout.log \
57-
--simlimit 60 --stat
58-
echo " Show simulation UART output for project CM33_s and CM33_s"
59-
cat ./out/${{ matrix.compiler.name }}_${{ matrix.build.type }}_fvp_stdout.log
1+
name: "SimpleTZ: Test Build and Execution"
2+
on:
3+
workflow_dispatch:
4+
pull_request:
5+
branches: [main]
6+
paths:
7+
- SimpleTrustZone/**
8+
- .github/workflows/SimpleTZ-CI.yml
9+
push:
10+
branches: [main]
11+
paths:
12+
- SimpleTrustZone/**
13+
- .github/workflows/SimpleTZ-CI.yml
14+
schedule:
15+
- cron: '00 20 * * 6'
16+
17+
jobs:
18+
Build:
19+
strategy:
20+
matrix:
21+
22+
compiler: [
23+
{name: AC6, ext: axf}
24+
]
25+
build: [
26+
{type: Release},
27+
{type: Debug}
28+
]
29+
30+
runs-on: ubuntu-latest
31+
32+
steps:
33+
- name: Checkout repo
34+
uses: actions/checkout@v4
35+
36+
- name: Install tools
37+
uses: ARM-software/cmsis-actions/vcpkg@v1
38+
with:
39+
config: ".ci/vcpkg-configuration.json"
40+
41+
- name: Activate Arm tool license
42+
uses: ARM-software/cmsis-actions/armlm@v1
43+
44+
- name: Build project CM33_s and CM33_ns for build-type ${{ matrix.build.type }} with ${{ matrix.compiler.name }}
45+
working-directory: ./SimpleTrustZone/
46+
run: cbuild SimpleTZ.csolution.yml --packs --context .${{ matrix.build.type }}+AVH --toolchain ${{ matrix.compiler.name }}
47+
48+
49+
- name: Execute project CM33_s and CM33_ns for build-type ${{ matrix.build.type }} with ${{ matrix.compiler.name }} using FVP_MPS2_Cortex-M33
50+
working-directory: ./SimpleTrustZone/
51+
run: |
52+
FVP_MPS2_Cortex-M33 \
53+
-a ./out/CM33_ns/AVH/${{ matrix.build.type }}/CM33_ns.${{ matrix.compiler.ext }} \
54+
-a ./out/CM33_s/AVH/${{ matrix.build.type }}/CM33_s.${{ matrix.compiler.ext }} \
55+
-f ./../FVP/FVP_MPS2_Cortex-M33/fvp_config.txt \
56+
--stat

‎CubeMX/CubeMX.cbuild-pack.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
cbuild-pack:
22
resolved-packs:
3-
- resolved-pack: ARM::CMSIS@6.0.0
3+
- resolved-pack: ARM::CMSIS@6.1.0
44
selected-by-pack:
5-
- ARM::[email protected]
6-
- resolved-pack: ARM::CMSIS-RTX@5.8.0
5+
- ARM::CMSIS@^6.0.0
6+
- resolved-pack: ARM::CMSIS-RTX@5.9.0
77
selected-by-pack:
8-
- ARM::CMSIS-RTX
9-
- resolved-pack: Keil::[email protected]-dev0
8+
- ARM::CMSIS-RTX@^5.9.0
9+
- resolved-pack: Keil::[email protected]
1010
selected-by-pack:
11-
- Keil::B-U585I-IOT02A_BSP@>=2.0.0-0
12-
- resolved-pack: Keil::[email protected]-dev0
11+
- Keil::B-U585I-IOT02A_BSP@^2.0.0
12+
- resolved-pack: Keil::[email protected]
1313
selected-by-pack:
14-
- Keil::STM32U5xx_DFP@>=3.0.0-0
14+
- Keil::STM32U5xx_DFP@^3.0.0

‎CubeMX/RTE/Device/STM32U585AIIx/regions_B-U585I-IOT02A.h‎

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
#ifndef REGIONS_B_U585I_IOT02A_H
2+
#define REGIONS_B_U585I_IOT02A_H
3+
4+
5+
//-------- <<< Use Configuration Wizard in Context Menu >>> --------------------
6+
//------ With VS Code: Open Preview for Configuration Wizard -------------------
7+
8+
// <n> Auto-generated using information from packs
9+
// <i> Device Family Pack (DFP): Keil::[email protected]
10+
// <i> Board Support Pack (BSP): Keil::[email protected]
11+
12+
// <h> ROM Configuration
13+
// =======================
14+
// <h> __ROM0 (is rx memory: Flash from DFP)
15+
// <o> Base address <0x0-0xFFFFFFFF:8>
16+
// <i> Defines base address of memory region. Default: 0x08000000
17+
// <i> Contains Startup and Vector Table
18+
#define __ROM0_BASE 0x08000000
19+
// <o> Region size [bytes] <0x0-0xFFFFFFFF:8>
20+
// <i> Defines size of memory region. Default: 0x00200000
21+
#define __ROM0_SIZE 0x00200000
22+
// </h>
23+
24+
// <h> __ROM1 (unused)
25+
// <o> Base address <0x0-0xFFFFFFFF:8>
26+
// <i> Defines base address of memory region.
27+
#define __ROM1_BASE 0
28+
// <o> Region size [bytes] <0x0-0xFFFFFFFF:8>
29+
// <i> Defines size of memory region.
30+
#define __ROM1_SIZE 0
31+
// </h>
32+
33+
// <h> __ROM2 (unused)
34+
// <o> Base address <0x0-0xFFFFFFFF:8>
35+
// <i> Defines base address of memory region.
36+
#define __ROM2_BASE 0
37+
// <o> Region size [bytes] <0x0-0xFFFFFFFF:8>
38+
// <i> Defines size of memory region.
39+
#define __ROM2_SIZE 0
40+
// </h>
41+
42+
// <h> __ROM3 (unused)
43+
// <o> Base address <0x0-0xFFFFFFFF:8>
44+
// <i> Defines base address of memory region.
45+
#define __ROM3_BASE 0
46+
// <o> Region size [bytes] <0x0-0xFFFFFFFF:8>
47+
// <i> Defines size of memory region.
48+
#define __ROM3_SIZE 0
49+
// </h>
50+
51+
// </h>
52+
53+
// <h> RAM Configuration
54+
// =======================
55+
// <h> __RAM0 (is rwx memory: SRAM1_2 from DFP)
56+
// <o> Base address <0x0-0xFFFFFFFF:8>
57+
// <i> Defines base address of memory region. Default: 0x20000000
58+
// <i> Contains uninitialized RAM, Stack, and Heap
59+
#define __RAM0_BASE 0x20000000
60+
// <o> Region size [bytes] <0x0-0xFFFFFFFF:8>
61+
// <i> Defines size of memory region. Default: 0x00040000
62+
#define __RAM0_SIZE 0x00040000
63+
// </h>
64+
65+
// <h> __RAM1 (unused)
66+
// <o> Base address <0x0-0xFFFFFFFF:8>
67+
// <i> Defines base address of memory region.
68+
#define __RAM1_BASE 0
69+
// <o> Region size [bytes] <0x0-0xFFFFFFFF:8>
70+
// <i> Defines size of memory region.
71+
#define __RAM1_SIZE 0
72+
// </h>
73+
74+
// <h> __RAM2 (unused)
75+
// <o> Base address <0x0-0xFFFFFFFF:8>
76+
// <i> Defines base address of memory region.
77+
#define __RAM2_BASE 0
78+
// <o> Region size [bytes] <0x0-0xFFFFFFFF:8>
79+
// <i> Defines size of memory region.
80+
#define __RAM2_SIZE 0
81+
// </h>
82+
83+
// <h> __RAM3 (unused)
84+
// <o> Base address <0x0-0xFFFFFFFF:8>
85+
// <i> Defines base address of memory region.
86+
#define __RAM3_BASE 0
87+
// <o> Region size [bytes] <0x0-0xFFFFFFFF:8>
88+
// <i> Defines size of memory region.
89+
#define __RAM3_SIZE 0
90+
// </h>
91+
92+
// </h>
93+
94+
// <h> Stack / Heap Configuration
95+
// <o0> Stack Size (in Bytes) <0x0-0xFFFFFFFF:8>
96+
// <o1> Heap Size (in Bytes) <0x0-0xFFFFFFFF:8>
97+
#define __STACK_SIZE 0x00000200
98+
#define __HEAP_SIZE 0x00000C00
99+
// </h>
100+
101+
// <n> Resources that are not allocated to linker regions
102+
// <i> rwx RAM: SRAM3 from DFP: BASE: 0x20040000 SIZE: 0x00080000
103+
// <i> rwx RAM: RAM-External from BSP: BASE: 0x90000000 SIZE: 0x00800000
104+
// <i> rx ROM: Flash-External from BSP: BASE: 0x70000000 SIZE: 0x04000000
105+
106+
107+
#endif /* REGIONS_B_U585I_IOT02A_H */

‎CubeMX/RTE/_Debug_MyBoard/RTE_Components.h‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
/*
2+
* CSOLUTION generated file: DO NOT EDIT!
3+
* Generated by: csolution version 2.6.0
4+
*
5+
* Project: 'CubeMX.Debug+MyBoard'
6+
* Target: 'Debug+MyBoard'
7+
*/
8+
9+
#ifndef RTE_COMPONENTS_H
10+
#define RTE_COMPONENTS_H
11+
12+
/* ARM::CMSIS:RTOS2:Keil RTX5&[email protected] */
13+
#define RTE_CMSIS_RTOS2 /* CMSIS-RTOS2 */
14+
#define RTE_CMSIS_RTOS2_RTX5 /* CMSIS-RTOS2 Keil RTX5 */
15+
#define RTE_CMSIS_RTOS2_RTX5_SOURCE /* CMSIS-RTOS2 Keil RTX5 Source */
16+
/* Keil::Device:[email protected] */
17+
#define RTE_DEVICE_CUBE_MX
18+
#define CMSIS_device_header "stm32u5xx.h"
19+
20+
21+
#endif /* RTE_COMPONENTS_H */

‎CubeMX/RTE/_Release_MyBoard/RTE_Components.h‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
/*
2+
* CSOLUTION generated file: DO NOT EDIT!
3+
* Generated by: csolution version 2.6.0
4+
*
5+
* Project: 'CubeMX.Release+MyBoard'
6+
* Target: 'Release+MyBoard'
7+
*/
8+
9+
#ifndef RTE_COMPONENTS_H
10+
#define RTE_COMPONENTS_H
11+
12+
/* ARM::CMSIS:RTOS2:Keil RTX5&[email protected] */
13+
#define RTE_CMSIS_RTOS2 /* CMSIS-RTOS2 */
14+
#define RTE_CMSIS_RTOS2_RTX5 /* CMSIS-RTOS2 Keil RTX5 */
15+
#define RTE_CMSIS_RTOS2_RTX5_SOURCE /* CMSIS-RTOS2 Keil RTX5 Source */
16+
/* Keil::Device:[email protected] */
17+
#define RTE_DEVICE_CUBE_MX
18+
#define CMSIS_device_header "stm32u5xx.h"
19+
20+
21+
#endif /* RTE_COMPONENTS_H */

‎DualCore/HelloWorld.cbuild-pack.yml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
cbuild-pack:
2+
resolved-packs:
3+
- resolved-pack: ARM::[email protected]
4+
selected-by-pack:
5+
- ARM::CMSIS@^6.1.0
6+
- resolved-pack: ARM::[email protected]
7+
selected-by-pack:
8+
- ARM::CMSIS-Compiler@^2.1.0
9+
- resolved-pack: ARM::[email protected]
10+
selected-by-pack:
11+
- ARM::CMSIS-RTX@^5.9.0
12+
- resolved-pack: NXP::[email protected]
13+
selected-by-pack:
14+
- NXP::FRDM-K32L3A6_BSP@^19.0.0
15+
- resolved-pack: NXP::[email protected]
16+
selected-by-pack:
17+
- NXP::K32L3A60_DFP@^19.0.0

‎DualCore/README.md‎

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,33 @@
1-
# Dual Core Example
1+
# Dual Core project
22

3-
## Generated Project
3+
This example generates **HelloWorld** executables for the **FRDM-K32L3A6** evaluation board. The used **K32L3** microcontroller is a dual-core MCU ([**Cortex-M0plus**](https://developer.arm.com/Processors/Cortex-M0-Plus) and [**Cortex-M4**](https://developer.arm.com/Processors/Cortex-M4))
4+
5+
## Prerequisites
6+
7+
### Tools
8+
9+
- [CMSIS-Toolbox 2.6.0](https://github.com/Open-CMSIS-Pack/cmsis-toolbox/releases) or higher
10+
- Arm Compiler 6.22 or higher
11+
- GCC Compiler 13.2.1 or higher
12+
- Arm Virtual Hardware for Corstone-300 v11.26.11
13+
14+
All these tools can be installed via [vcpkg](https://learn.arm.com/learning-paths/microcontrollers/vcpkg-tool-installation/)
15+
16+
### Packs
17+
18+
- Required packs are listed in the file [`HelloWorld.csolution.yml`](./HelloWorld.csolution.yml)
19+
20+
## Project Structure
21+
22+
The project is generated using the [CMSIS-Toolbox](https://github.com/Open-CMSIS-Pack/cmsis-toolbox/blob/main/docs/build-overview.md) and is defined in [`csolution`](https://github.com/Open-CMSIS-Pack/cmsis-toolbox/blob/main/docs/YML-Input-Format.md) format:
23+
24+
- [`HelloWorld.csolution.yml`](./HelloWorld.csolution.yml) lists the required packs, defines, hardware targets, and the build-types (along with the compiler).
25+
- [`./cm0plus/HelloWorld_cm0plus.cproject.yml`](./cm0plus/HelloWorld_cm0plus.cproject.yml) defines the source files and the software components for the **Cortex-M0plus** core.
26+
- [`./cm4/HelloWorld_cm4.cproject.yml`](./cm4/HelloWorld_cm4.cproject.yml) defines the source files and the software components for the **Cortex-M4** core.
27+
28+
29+
## Generate the project binaries
430

531
```txt
6-
> cbuild HelloWorld.csolution.yml --update-rte --packs --toolchain AC6
32+
> cbuild HelloWorld.csolution.yml --packs --toolchain AC6
733
```

‎FVP/FVP_Corstone_SSE-300/fvp_config.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Notes:
22
# Parameters:
3-
# instance.parameter=value #(type, mode) default = 'def value' : description : [min..max]
4-
#---------------------------------------------------------------------------------------------------
5-
mps3_board.visualisation.disable-visualisation=1 # (bool , init-time) default = '0' : Enable/disable visualisation
6-
mps3_board.uart0.shutdown_on_eot=1 # (bool , init-time) default = '0' : Shutdown simulation when a EOT (ASCII 4) char is transmitted (useful for regression tests when semihosting is not available)
7-
#---------------------------------------------------------------------------------------------------
3+
# instance.parameter=value #(type, mode) default = 'def value' : description : [min..max]
4+
#-----------------------------------------------------------------------------------------------------
5+
mps3_board.visualisation.disable-visualisation=1 # (bool , init-time) default = '0' : Enable/disable visualisation
6+
mps3_board.uart0.shutdown_on_eot=1 # (bool , init-time) default = '0' : Shutdown simulation when a EOT (ASCII 4) char is transmitted (useful for regression tests when semihosting is not available)
7+
#-----------------------------------------------------------------------------------------------------

0 commit comments

Comments
 (0)