Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hwmv2 changes #1910

Merged
merged 4 commits into from
Mar 1, 2024
Merged

Hwmv2 changes #1910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ed0b95f
zephyr: Update board names for hwmv2
nordicjm Feb 8, 2024
b45ae08
boot: zephyr: boards: Remove removed boards
nordicjm Feb 27, 2024
72c3f64
boot: zephyr: boards: Rename configuration files
nordicjm Feb 27, 2024
0f91469
zephyr: nxp: Update board names for hwmv2
dleach02 Feb 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 boot/zephyr/boards/bl5340_dvk_cpuapp.conf → ...hyr/boards/bl5340_dvk_nrf5340_cpuapp.conf
View file
Open in desktop
File renamed without changes.
4 changes: 0 additions & 4 deletions boot/zephyr/boards/intel_s1000_crb.conf
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions boot/zephyr/boards/intel_s1000_crb.overlay
View file
Open in desktop

This file was deleted.

0 boot/zephyr/boards/lpcxpresso55s69_cpu0.conf → ...boards/lpcxpresso55s69_lpc55s69_cpu0.conf
View file
Open in desktop
File renamed without changes.
0 boot/zephyr/boards/nrf51dk_nrf51422.conf → boot/zephyr/boards/nrf51dk_nrf51822.conf
View file
Open in desktop
File renamed without changes.
28 changes: 14 additions & 14 deletions boot/zephyr/sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,51 +5,51 @@ sample:
tests:
sample.bootloader.mcuboot:
tags: bootloader_mcuboot
platform_allow: nrf52840dk_nrf52840 frdm_k64f disco_l475_iot1
platform_allow: nrf52840dk/nrf52840 frdm_k64f disco_l475_iot1
integration_platforms:
- nrf52840dk_nrf52840
- nrf52840dk/nrf52840
- frdm_k64f
- disco_l475_iot1
sample.bootloader.mcuboot.serial_recovery:
extra_args: OVERLAY_CONFIG=serial_recovery.conf
platform_allow: nrf52840dk_nrf52840
platform_allow: nrf52840dk/nrf52840
integration_platforms:
- nrf52840dk_nrf52840
- nrf52840dk/nrf52840
tags: bootloader_mcuboot
sample.bootloader.mcuboot.usb_cdc_acm_recovery:
tags: bootloader_mcuboot
platform_allow: nrf52840dongle_nrf52840
platform_allow: nrf52840dongle/nrf52840
extra_args: DTC_OVERLAY_FILE="./usb_cdc_acm.overlay;app.overlay"
integration_platforms:
- nrf52840dongle_nrf52840
- nrf52840dongle/nrf52840
sample.bootloader.mcuboot.usb_cdc_acm_recovery_log:
extra_args: OVERLAY_CONFIG=./usb_cdc_acm_log_recovery.conf
DTC_OVERLAY_FILE="./boards/nrf52840_big.overlay;app.overlay"
platform_allow: nrf52840dk_nrf52840
platform_allow: nrf52840dk/nrf52840
integration_platforms:
- nrf52840dk_nrf52840
- nrf52840dk/nrf52840
tags: bootloader_mcuboot
sample.bootloader.mcuboot.single_slot:
extra_args: OVERLAY_CONFIG=./single_slot.conf
DTC_OVERLAY_FILE="./boards/nrf52840_single_slot.overlay;app.overlay"
platform_allow: nrf52840dk_nrf52840
platform_allow: nrf52840dk/nrf52840
integration_platforms:
- nrf52840dk_nrf52840
- nrf52840dk/nrf52840
tags: bootloader_mcuboot
sample.bootloader.mcuboot.qspi_nor_slot:
extra_args: DTC_OVERLAY_FILE="./boards/nrf52840dk_qspi_nor_secondary.overlay;app.overlay"
OVERLAY_CONFIG="./boards/nrf52840dk_qspi_nor.conf;./boards/nrf52840dk_qspi_secondary_boot.conf"
platform_allow: nrf52840dk_nrf52840
platform_allow: nrf52840dk/nrf52840
integration_platforms:
- nrf52840dk_nrf52840
- nrf52840dk/nrf52840
tags: bootloader_mcuboot
sample.bootloader.mcuboot.hooks_multi:
extra_args: DTC_OVERLAY_FILE="./boards/nrf52840dk_ram_multi.overlay;app.overlay"
OVERLAY_CONFIG=./boards/nrf52840dk_hooks_sample_overlay.conf
TEST_BOOT_IMAGE_ACCESS_HOOKS=Y
platform_allow: nrf52840dk_nrf52840
platform_allow: nrf52840dk/nrf52840
integration_platforms:
- nrf52840dk_nrf52840
- nrf52840dk/nrf52840
tags: bootloader_mcuboot
sample.bootloader.mcuboot.ram_load:
extra_args: OVERLAY_CONFIG=./ram_load.conf
Expand Down
2 changes: 1 addition & 1 deletion ext/nrf/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Since it defaults to tinycrypt you'll have to go into `menuconfig` and change th

```
mkdir build && cd build
cmake -GNinja -DBOARD=nrf52840dk_nrf52840
cmake -GNinja -DBOARD=nrf52840dk/nrf52840
ninja flash
```

Expand Down