Skip to content

Commit c437bb4

Browse files
nordicjmnordicjm
committed
boot: zephyr: Update sample file
Updates to fix styling issues Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
1 parent 44de2a3 commit c437bb4

10 files changed

Lines changed: 97 additions & 63 deletions

boot/zephyr/boards/nrf52840_single_slot.overlay renamed to boot/zephyr/boards/nrf52840_nrf52840_single_slot.overlay

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@
88
/delete-node/ &slot0_partition;
99
/delete-node/ &slot1_partition;
1010

11+
/ {
12+
chosen {
13+
zephyr,code-partition = &boot_partition;
14+
};
15+
};
16+
1117
&flash0 {
1218
partitions {
1319
boot_partition: partition@0 {

boot/zephyr/boards/nrf52840_big.overlay renamed to boot/zephyr/boards/nrf52840dk_nrf52840_big.overlay

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@
88
/delete-node/ &slot0_partition;
99
/delete-node/ &slot1_partition;
1010

11+
/ {
12+
chosen {
13+
zephyr,code-partition = &boot_partition;
14+
};
15+
};
16+
1117
&flash0 {
1218
partitions {
1319
boot_partition: partition@0 {

boot/zephyr/boards/nrf52840dk_qspi_nor.conf renamed to boot/zephyr/boards/nrf52840dk_nrf52840_qspi_nor.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
CONFIG_NORDIC_QSPI_NOR=y
22
CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
33
CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=16
4+
CONFIG_BOOT_MAX_IMG_SECTORS=256

boot/zephyr/boards/nrf52840dk_qspi_nor_secondary.overlay renamed to boot/zephyr/boards/nrf52840dk_nrf52840_qspi_nor.overlay

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@
88
/delete-node/ &slot0_partition;
99
/delete-node/ &slot1_partition;
1010

11+
/ {
12+
chosen {
13+
zephyr,code-partition = &boot_partition;
14+
};
15+
};
16+
1117
&flash0 {
1218
partitions {
1319
boot_partition: partition@0 {

boot/zephyr/boards/nrf52840dk_ram.overlay renamed to boot/zephyr/boards/nrf52840dk_nrf52840_ram.overlay

File renamed without changes.

boot/zephyr/boards/nrf52840dk_ram_multi.overlay renamed to boot/zephyr/boards/nrf52840dk_nrf52840_ram_multi.overlay

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@
88
/delete-node/ &slot0_partition;
99
/delete-node/ &boot_partition;
1010

11+
/ {
12+
chosen {
13+
zephyr,code-partition = &boot_partition;
14+
};
15+
};
16+
1117
&flash0 {
1218
partitions {
1319
boot_partition: partition@0 {

‎boot/zephyr/boards/nrf52840dk_nrf52840_usb_cdc_acm.overlay‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
/delete-node/ &boot_partition;
2+
/delete-node/ &slot0_partition;
3+
/delete-node/ &slot1_partition;
4+
5+
/ {
6+
chosen {
7+
zephyr,code-partition = &boot_partition;
8+
};
9+
};
10+
11+
&flash0 {
12+
partitions {
13+
boot_partition: partition@0 {
14+
compatible = "zephyr,mapped-partition";
15+
label = "mcuboot";
16+
reg = <0x0 0x10000>;
17+
};
18+
19+
slot0_partition: partition@10000 {
20+
compatible = "zephyr,mapped-partition";
21+
label = "image-0";
22+
reg = <0x10000 0x74000>;
23+
};
24+
25+
slot1_partition: partition@84000 {
26+
compatible = "zephyr,mapped-partition";
27+
label = "image-1";
28+
reg = <0x84000 0x74000>;
29+
};
30+
};
31+
};

‎boot/zephyr/boards/nrf52840dk_qspi_secondary_boot.conf‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

boot/zephyr/boards/nrf52840dk_hooks_sample_overlay.conf renamed to boot/zephyr/hooks_sample.conf

File renamed without changes.

‎boot/zephyr/tests.yaml‎

Lines changed: 41 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
sample:
2-
description: mcuboot test build sample
2+
description: MCUboot test build sample
33
name: mcuboot
4-
4+
common:
5+
tags: bootloader_mcuboot
6+
platform_allow:
7+
- nrf52840dk/nrf52840
8+
integration_platforms:
9+
- nrf52840dk/nrf52840
510
tests:
611
sample.bootloader.mcuboot:
7-
tags: bootloader_mcuboot
812
platform_allow:
913
- frdm_k22f
1014
- frdm_k64f
@@ -35,26 +39,19 @@ tests:
3539
- twr_ke18f
3640
- twr_kv58f220m
3741
- vmu_rt1170/mimxrt1176/cm7
38-
- nrf52840dk/nrf52840
3942
- disco_l475_iot1
4043
integration_platforms:
41-
- nrf52840dk/nrf52840
4244
- frdm_k64f
4345
- disco_l475_iot1
4446
sample.bootloader.mcuboot.serial_recovery:
45-
extra_args: EXTRA_CONF_FILE=serial_recovery.conf
46-
platform_allow: nrf52840dk/nrf52840
47-
integration_platforms:
48-
- nrf52840dk/nrf52840
49-
tags: bootloader_mcuboot
47+
extra_args:
48+
- EXTRA_CONF_FILE="serial_recovery.conf"
5049
sample.bootloader.mcuboot.serial_recovery_raw:
51-
extra_args: EXTRA_CONF_FILE=serial_recovery_raw.conf
52-
platform_allow: nrf52840dk/nrf52840
53-
integration_platforms:
54-
- nrf52840dk/nrf52840
55-
tags: bootloader_mcuboot
50+
extra_args:
51+
- EXTRA_CONF_FILE="serial_recovery_raw.conf"
5652
sample.bootloader.mcuboot.serial_recovery_all_options:
57-
extra_args: EXTRA_CONF_FILE=serial_recovery.conf
53+
extra_args:
54+
- EXTRA_CONF_FILE="serial_recovery.conf"
5855
extra_configs:
5956
- CONFIG_MCUBOOT_SERIAL=y
6057
- CONFIG_ENABLE_MGMT_PERUSER=y
@@ -63,72 +60,54 @@ tests:
6360
- CONFIG_BOOT_MGMT_MCUMGR_PARAMS=y
6461
- CONFIG_BOOT_SERIAL_IMG_GRP_IMAGE_STATE=y
6562
- CONFIG_BOOT_SERIAL_IMG_GRP_SLOT_INFO=y
66-
platform_allow: nrf52840dk/nrf52840
67-
integration_platforms:
68-
- nrf52840dk/nrf52840
69-
tags: bootloader_mcuboot
7063
sample.bootloader.mcuboot.usb_cdc_acm_recovery:
71-
tags: bootloader_mcuboot
72-
platform_allow: nrf52840dongle/nrf52840
64+
platform_allow:
65+
- nrf52840dongle/nrf52840
66+
integration_platforms:
67+
- nrf52840dongle/nrf52840
7368
extra_args:
74-
- EXTRA_CONF_FILE=./usb_cdc_acm_recovery.conf
75-
- DTC_OVERLAY_FILE="./usb_cdc_acm.overlay;app.overlay"
69+
- EXTRA_CONF_FILE="usb_cdc_acm_recovery.conf"
70+
- EXTRA_DTC_OVERLAY_FILE="usb_cdc_acm.overlay"
71+
- FILE_SUFFIX="usb_cdc_acm"
7672
extra_configs:
7773
- CONFIG_DEPRECATION_TEST=y
7874
sample.bootloader.mcuboot.usb_cdc_acm_recovery_log:
79-
tags: bootloader_mcuboot
80-
platform_allow: nrf52840dk/nrf52840
8175
extra_args:
82-
- EXTRA_CONF_FILE=./usb_cdc_acm_log_recovery.conf
83-
- DTC_OVERLAY_FILE="./boards/nrf52840_big.overlay;app.overlay"
76+
- EXTRA_CONF_FILE="usb_cdc_acm_log_recovery.conf"
77+
- FILE_SUFFIX="big"
8478
extra_configs:
8579
- CONFIG_DEPRECATION_TEST=y
8680
sample.bootloader.mcuboot.single_slot:
87-
extra_args: EXTRA_CONF_FILE=./single_slot.conf
88-
DTC_OVERLAY_FILE="./boards/nrf52840_single_slot.overlay;app.overlay"
89-
platform_allow: nrf52840dk/nrf52840
90-
integration_platforms:
91-
- nrf52840dk/nrf52840
92-
tags: bootloader_mcuboot
81+
extra_args:
82+
- EXTRA_CONF_FILE="single_slot.conf"
83+
- FILE_SUFFIX="single_slot"
9384
sample.bootloader.mcuboot.qspi_nor_slot:
94-
extra_args: DTC_OVERLAY_FILE="./boards/nrf52840dk_qspi_nor_secondary.overlay;app.overlay"
95-
EXTRA_CONF_FILE="./boards/nrf52840dk_qspi_nor.conf;./boards/nrf52840dk_qspi_secondary_boot.conf"
96-
platform_allow: nrf52840dk/nrf52840
97-
integration_platforms:
98-
- nrf52840dk/nrf52840
99-
tags: bootloader_mcuboot
85+
extra_args:
86+
- FILE_SUFFIX="qspi_nor"
10087
sample.bootloader.mcuboot.hooks_multi:
101-
extra_args: DTC_OVERLAY_FILE="./boards/nrf52840dk_ram_multi.overlay;app.overlay"
102-
EXTRA_CONF_FILE=./boards/nrf52840dk_hooks_sample_overlay.conf
103-
TEST_BOOT_IMAGE_ACCESS_HOOKS=Y
104-
platform_allow: nrf52840dk/nrf52840
105-
integration_platforms:
106-
- nrf52840dk/nrf52840
107-
tags: bootloader_mcuboot
88+
extra_args:
89+
- FILE_SUFFIX="ram_multi"
90+
- EXTRA_CONF_FILE="hooks_sample.conf"
91+
- TEST_BOOT_IMAGE_ACCESS_HOOKS=Y
10892
sample.bootloader.mcuboot.ram_load:
109-
extra_args: EXTRA_CONF_FILE=./ram_load.conf
110-
tags: bootloader_mcuboot
111-
platform_allow: mimxrt1020_evk
93+
extra_args:
94+
- EXTRA_CONF_FILE="ram_load.conf"
95+
platform_allow:
96+
- mimxrt1020_evk
11297
integration_platforms:
11398
- mimxrt1020_evk
11499
sample.bootloader.mcuboot.swap_move:
115-
extra_args: EXTRA_CONF_FILE=./swap_move.conf
116-
platform_allow: nrf52840dk/nrf52840
117-
integration_platforms:
118-
- nrf52840dk/nrf52840
119-
tags: bootloader_mcuboot
100+
extra_args:
101+
- EXTRA_CONF_FILE="swap_move.conf"
120102
sample.bootloader.mcuboot.two_signing_keys:
121103
extra_configs:
122104
- CONFIG_BOOT_SIGNATURE_TYPE_ED25519=y
123105
- CONFIG_BOOT_SIGNATURE_KEY_FILE="root-ed25519.pem,root-ed25519-2-pub.pem"
124-
platform_allow: nrf52840dk/nrf52840
125-
integration_platforms:
126-
- nrf52840dk/nrf52840
127-
tags: bootloader_mcuboot
128106
sample.bootloader.mcuboot.runtime_source.hooks:
129-
extra_args: EXTRA_CONF_FILE=../../samples/runtime-source/zephyr/sample.conf
130-
TEST_RUNTIME_SOURCE_HOOKS=y
131-
tags: bootloader_mcuboot runtime_source
107+
extra_args:
108+
- EXTRA_CONF_FILE="../../samples/runtime-source/zephyr/sample.conf"
109+
- TEST_RUNTIME_SOURCE_HOOKS=y
110+
tags: runtime_source
132111
platform_allow: frdm_k64f
133112
build_only: true
134113
sample.bootloader.mcuboot.encryption:

0 commit comments

Comments
 (0)