From ed0b95f03b48ccbce935c699fd1e6bb1ef8b4d5b Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Thu, 8 Feb 2024 14:04:19 +0000 Subject: [PATCH 1/4] zephyr: Update board names for hwmv2 Updates board names as per hwmv2 Signed-off-by: Jamie McCrae --- boot/zephyr/sample.yaml | 28 ++++++++++++++-------------- ext/nrf/README.md | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/boot/zephyr/sample.yaml b/boot/zephyr/sample.yaml index 54c236773..9ab330781 100644 --- a/boot/zephyr/sample.yaml +++ b/boot/zephyr/sample.yaml @@ -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 diff --git a/ext/nrf/README.md b/ext/nrf/README.md index 727af5edb..8346f4206 100644 --- a/ext/nrf/README.md +++ b/ext/nrf/README.md @@ -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 ``` From b45ae08f891fff45a1f8abe15c2e99c4e032e400 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Tue, 27 Feb 2024 15:29:43 +0000 Subject: [PATCH 2/4] boot: zephyr: boards: Remove removed boards Removes configuration for boards that have not been in zephyr for a long time Signed-off-by: Jamie McCrae --- boot/zephyr/boards/intel_s1000_crb.conf | 4 ---- boot/zephyr/boards/intel_s1000_crb.overlay | 13 ------------- 2 files changed, 17 deletions(-) delete mode 100644 boot/zephyr/boards/intel_s1000_crb.conf delete mode 100644 boot/zephyr/boards/intel_s1000_crb.overlay diff --git a/boot/zephyr/boards/intel_s1000_crb.conf b/boot/zephyr/boards/intel_s1000_crb.conf deleted file mode 100644 index ab2bfd692..000000000 --- a/boot/zephyr/boards/intel_s1000_crb.conf +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG_DEBUG=n -CONFIG_I2C=n -CONFIG_BOOT_MAX_IMG_SECTORS=512 -CONFIG_BOOT_WAIT_FOR_USB_DFU=y diff --git a/boot/zephyr/boards/intel_s1000_crb.overlay b/boot/zephyr/boards/intel_s1000_crb.overlay deleted file mode 100644 index 61f0d436c..000000000 --- a/boot/zephyr/boards/intel_s1000_crb.overlay +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright (c) 2018 Intel Corporation - * - * SPDX-License-Identifier: Apache-2.0 - */ -/ { - sram0: memory@be000000 { - device_type = "memory"; - compatible = "mmio-sram"; - reg = <0xbe000000 0x30000>; - }; -}; - From 72c3f6429e3a05c43251ecdba148ddf11dc23d96 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Tue, 27 Feb 2024 15:30:15 +0000 Subject: [PATCH 3/4] boot: zephyr: boards: Rename configuration files Renames configuration files for board names that have changed with hwmv2 Signed-off-by: Jamie McCrae --- .../{bl5340_dvk_cpuapp.conf => bl5340_dvk_nrf5340_cpuapp.conf} | 0 .../boards/{nrf51dk_nrf51422.conf => nrf51dk_nrf51822.conf} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename boot/zephyr/boards/{bl5340_dvk_cpuapp.conf => bl5340_dvk_nrf5340_cpuapp.conf} (100%) rename boot/zephyr/boards/{nrf51dk_nrf51422.conf => nrf51dk_nrf51822.conf} (100%) diff --git a/boot/zephyr/boards/bl5340_dvk_cpuapp.conf b/boot/zephyr/boards/bl5340_dvk_nrf5340_cpuapp.conf similarity index 100% rename from boot/zephyr/boards/bl5340_dvk_cpuapp.conf rename to boot/zephyr/boards/bl5340_dvk_nrf5340_cpuapp.conf diff --git a/boot/zephyr/boards/nrf51dk_nrf51422.conf b/boot/zephyr/boards/nrf51dk_nrf51822.conf similarity index 100% rename from boot/zephyr/boards/nrf51dk_nrf51422.conf rename to boot/zephyr/boards/nrf51dk_nrf51822.conf From 0f914698c285d5cf05f38e559777b55eec743caa Mon Sep 17 00:00:00 2001 From: David Leach Date: Sun, 25 Feb 2024 21:36:38 -0600 Subject: [PATCH 4/4] zephyr: nxp: Update board names for hwmv2 Updates board names as per hwmv2 Signed-off-by: David Leach Signed-off-by: Jamie McCrae --- ...cxpresso55s69_cpu0.conf => lpcxpresso55s69_lpc55s69_cpu0.conf} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename boot/zephyr/boards/{lpcxpresso55s69_cpu0.conf => lpcxpresso55s69_lpc55s69_cpu0.conf} (100%) diff --git a/boot/zephyr/boards/lpcxpresso55s69_cpu0.conf b/boot/zephyr/boards/lpcxpresso55s69_lpc55s69_cpu0.conf similarity index 100% rename from boot/zephyr/boards/lpcxpresso55s69_cpu0.conf rename to boot/zephyr/boards/lpcxpresso55s69_lpc55s69_cpu0.conf