Skip to content

Commit 60b208e

Browse files
authored
Merge pull request #562 from danielinux/update-flash-elf
Scatter/gather ELF files according to segments `paddr`
2 parents fec31c5 + e7f151d commit 60b208e

28 files changed

+871
-97
lines changed

.github/workflows/test-configs.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,18 @@ jobs:
220220
config-file: ./config/examples/sim.config
221221
make-args: CFLAGS_EXTRA=-DWOLFBOOT_FLASH_MULTI_SECTOR_ERASE
222222

223+
sim_elf_scattered:
224+
uses: ./.github/workflows/test-build.yml
225+
with:
226+
arch: host
227+
config-file: ./config/examples/sim-elf-scattered.config
228+
229+
sim_elf_scattered_nobackup:
230+
uses: ./.github/workflows/test-build.yml
231+
with:
232+
arch: host
233+
config-file: ./config/examples/sim-elf-scattered.config
234+
make-args: DISABLE_BACKUP=1
223235

224236
# TODO: SP math with small stack has issues
225237

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: Test for scattered elf validation
2+
3+
on:
4+
push:
5+
branches: [ 'master', 'main', 'release/**' ]
6+
pull_request:
7+
branches: [ '*' ]
8+
9+
jobs:
10+
elf_scattered_test:
11+
runs-on: ubuntu-latest
12+
13+
steps:
14+
- uses: actions/checkout@v4
15+
with:
16+
submodules: true
17+
18+
- name: make clean
19+
run: |
20+
make keysclean
21+
22+
- name: Select config
23+
run: |
24+
cp config/examples/sim.config .config
25+
26+
- name: Build tools
27+
run: |
28+
make -C tools/keytools && make -C tools/bin-assemble
29+
30+
- name: Build wolfboot.elf
31+
run: |
32+
make clean && make test-sim-internal-flash-with-update ELF=1 ELF_SCATTERED=1
33+
34+
- name: Run bootloader with no arguments
35+
run: |
36+
./wolfboot.elf

.github/workflows/test-renode-fastmath-smallstack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
renode_automated_fastmath_smallstack:
11-
runs-on: ubuntu-20.04
11+
runs-on: ubuntu-22.04
1212

1313
steps:
1414
- uses: actions/checkout@v4

.github/workflows/test-renode-fastmath.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
renode_automated_fastmath:
11-
runs-on: ubuntu-20.04
11+
runs-on: ubuntu-22.04
1212

1313
steps:
1414
- uses: actions/checkout@v2

.github/workflows/test-renode-noasm-smallstack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
renode_automated_noasm_smallstack:
11-
runs-on: ubuntu-20.04
11+
runs-on: ubuntu-22.04
1212

1313
steps:
1414
- uses: actions/checkout@v4

.github/workflows/test-renode-noasm.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
renode_automated_noasm:
11-
runs-on: ubuntu-20.04
11+
runs-on: ubuntu-22.04
1212

1313
steps:
1414
- uses: actions/checkout@v4

.github/workflows/test-renode-nrf52.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
renode_automated_base:
11-
runs-on: ubuntu-20.04
11+
runs-on: ubuntu-22.04
1212

1313
steps:
1414
- uses: actions/checkout@v4

.github/workflows/test-renode-sha3.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
renode_automated_multi_sha:
11-
runs-on: ubuntu-20.04
11+
runs-on: ubuntu-22.04
1212

1313
steps:
1414
- uses: actions/checkout@v4

.github/workflows/test-renode-sha384.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
renode_automated_multi_sha:
11-
runs-on: ubuntu-20.04
11+
runs-on: ubuntu-22.04
1212

1313
steps:
1414
- uses: actions/checkout@v4

.github/workflows/test-renode-smallstack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
renode_automated_smallstack:
11-
runs-on: ubuntu-20.04
11+
runs-on: ubuntu-22.04
1212

1313
steps:
1414
- uses: actions/checkout@v4

0 commit comments

Comments
 (0)