boot: zephyr: Rename boards
Renames boards to account for hwmv2 changes
Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
diff --git a/boot/zephyr/boards/actinius_icarus.conf b/boot/zephyr/boards/actinius_icarus_nrf9160.conf
similarity index 100%
rename from boot/zephyr/boards/actinius_icarus.conf
rename to boot/zephyr/boards/actinius_icarus_nrf9160.conf
diff --git a/boot/zephyr/boards/disco_l475_iot1.conf b/boot/zephyr/boards/disco_l475_iot1_stm32l475xx.conf
similarity index 100%
rename from boot/zephyr/boards/disco_l475_iot1.conf
rename to boot/zephyr/boards/disco_l475_iot1_stm32l475xx.conf
diff --git a/boot/zephyr/boards/esp32c3_devkitm.conf b/boot/zephyr/boards/esp32c3_devkitm.conf
deleted file mode 100644
index 56298cd..0000000
--- a/boot/zephyr/boards/esp32c3_devkitm.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-# SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
-# SPDX-License-Identifier: Apache-2.0
-
-CONFIG_BOOT_MAX_IMG_SECTORS=512
-CONFIG_BOOT_UPGRADE_ONLY=y
-CONFIG_BOOT_VALIDATE_SLOT0=n
-CONFIG_BOOT_SIGNATURE_TYPE_NONE=y
-CONFIG_BOOT_BANNER=n
-
-CONFIG_UART_CONSOLE=n
-CONFIG_CONSOLE=n
-CONFIG_SERIAL=n
-
-CONFIG_MCUBOOT_LOG_LEVEL_OFF=y
-CONFIG_LOG_DEFAULT_LEVEL=0
-CONFIG_DEBUG=n
-
-CONFIG_XIP=n
-CONFIG_HEAP_MEM_POOL_SIZE=4096
-CONFIG_MINIMAL_LIBC=y
diff --git a/boot/zephyr/boards/xiao_esp32c3.conf b/boot/zephyr/boards/esp32c3_devkitm_esp32c3.conf
similarity index 100%
copy from boot/zephyr/boards/xiao_esp32c3.conf
copy to boot/zephyr/boards/esp32c3_devkitm_esp32c3.conf
diff --git a/boot/zephyr/boards/esp32s2_franzininho.conf b/boot/zephyr/boards/esp32s2_franzininho_esp32s2.conf
similarity index 100%
copy from boot/zephyr/boards/esp32s2_franzininho.conf
copy to boot/zephyr/boards/esp32s2_franzininho_esp32s2.conf
diff --git a/boot/zephyr/boards/esp32s2_saola.conf b/boot/zephyr/boards/esp32s2_saola.conf
deleted file mode 100644
index b2b4059..0000000
--- a/boot/zephyr/boards/esp32s2_saola.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-# SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
-# SPDX-License-Identifier: Apache-2.0
-
-CONFIG_BOOT_MAX_IMG_SECTORS=512
-CONFIG_BOOT_UPGRADE_ONLY=y
-CONFIG_BOOT_VALIDATE_SLOT0=n
-CONFIG_BOOT_SIGNATURE_TYPE_NONE=y
-CONFIG_BOOT_BANNER=n
-
-CONFIG_UART_CONSOLE=n
-CONFIG_CONSOLE=n
-CONFIG_SERIAL=n
-
-CONFIG_MCUBOOT_LOG_LEVEL_OFF=y
-CONFIG_LOG_DEFAULT_LEVEL=0
-CONFIG_DEBUG=n
-
-CONFIG_HEAP_MEM_POOL_SIZE=4096
-CONFIG_MINIMAL_LIBC=y
diff --git a/boot/zephyr/boards/esp32s2_franzininho.conf b/boot/zephyr/boards/esp32s2_saola_esp32s2.conf
similarity index 100%
rename from boot/zephyr/boards/esp32s2_franzininho.conf
rename to boot/zephyr/boards/esp32s2_saola_esp32s2.conf
diff --git a/boot/zephyr/boards/frdm_k64f.conf b/boot/zephyr/boards/frdm_k64f_mk64f12.conf
similarity index 100%
rename from boot/zephyr/boards/frdm_k64f.conf
rename to boot/zephyr/boards/frdm_k64f_mk64f12.conf
diff --git a/boot/zephyr/boards/icev_wireless.conf b/boot/zephyr/boards/icev_wireless_esp32c3.conf
similarity index 100%
rename from boot/zephyr/boards/icev_wireless.conf
rename to boot/zephyr/boards/icev_wireless_esp32c3.conf
diff --git a/boot/zephyr/boards/lpcxpresso55s06.conf b/boot/zephyr/boards/lpcxpresso55s06_lpc55s06.conf
similarity index 100%
rename from boot/zephyr/boards/lpcxpresso55s06.conf
rename to boot/zephyr/boards/lpcxpresso55s06_lpc55s06.conf
diff --git a/boot/zephyr/boards/lpcxpresso55s16.conf b/boot/zephyr/boards/lpcxpresso55s16_lpc55s16.conf
similarity index 100%
rename from boot/zephyr/boards/lpcxpresso55s16.conf
rename to boot/zephyr/boards/lpcxpresso55s16_lpc55s16.conf
diff --git a/boot/zephyr/boards/lpcxpresso55s28.conf b/boot/zephyr/boards/lpcxpresso55s28_lpc55s28.conf
similarity index 100%
rename from boot/zephyr/boards/lpcxpresso55s28.conf
rename to boot/zephyr/boards/lpcxpresso55s28_lpc55s28.conf
diff --git a/boot/zephyr/boards/lpcxpresso55s36.conf b/boot/zephyr/boards/lpcxpresso55s36_lpc55s36.conf
similarity index 100%
rename from boot/zephyr/boards/lpcxpresso55s36.conf
rename to boot/zephyr/boards/lpcxpresso55s36_lpc55s36.conf
diff --git a/boot/zephyr/boards/mimxrt1010_evk.conf b/boot/zephyr/boards/mimxrt1010_evk_mimxrt1011.conf
similarity index 100%
rename from boot/zephyr/boards/mimxrt1010_evk.conf
rename to boot/zephyr/boards/mimxrt1010_evk_mimxrt1011.conf
diff --git a/boot/zephyr/boards/mimxrt1015_evk.conf b/boot/zephyr/boards/mimxrt1015_evk.conf
deleted file mode 100644
index e7737af..0000000
--- a/boot/zephyr/boards/mimxrt1015_evk.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 2023 NXP
-# SPDX-License-Identifier: Apache-2.0
-
-CONFIG_BOOT_MAX_IMG_SECTORS=2048
diff --git a/boot/zephyr/boards/mimxrt1010_evk.conf b/boot/zephyr/boards/mimxrt1015_evk_mimxrt1015.conf
similarity index 100%
copy from boot/zephyr/boards/mimxrt1010_evk.conf
copy to boot/zephyr/boards/mimxrt1015_evk_mimxrt1015.conf
diff --git a/boot/zephyr/boards/mimxrt1020_evk.conf b/boot/zephyr/boards/mimxrt1020_evk_mimxrt1021.conf
similarity index 100%
rename from boot/zephyr/boards/mimxrt1020_evk.conf
rename to boot/zephyr/boards/mimxrt1020_evk_mimxrt1021.conf
diff --git a/boot/zephyr/boards/mimxrt1024_evk.conf b/boot/zephyr/boards/mimxrt1024_evk_mimxrt1024.conf
similarity index 100%
rename from boot/zephyr/boards/mimxrt1024_evk.conf
rename to boot/zephyr/boards/mimxrt1024_evk_mimxrt1024.conf
diff --git a/boot/zephyr/boards/mimxrt1040_evk.conf b/boot/zephyr/boards/mimxrt1040_evk_mimxrt1042.conf
similarity index 100%
rename from boot/zephyr/boards/mimxrt1040_evk.conf
rename to boot/zephyr/boards/mimxrt1040_evk_mimxrt1042.conf
diff --git a/boot/zephyr/boards/mimxrt1050_evk_qspi.conf b/boot/zephyr/boards/mimxrt1050_evk_mimxrt1052_qspi.conf
similarity index 100%
rename from boot/zephyr/boards/mimxrt1050_evk_qspi.conf
rename to boot/zephyr/boards/mimxrt1050_evk_mimxrt1052_qspi.conf
diff --git a/boot/zephyr/boards/mimxrt1060_evk.conf b/boot/zephyr/boards/mimxrt1060_evk.conf
deleted file mode 100644
index 7850953..0000000
--- a/boot/zephyr/boards/mimxrt1060_evk.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 2021-2022 NXP
-# SPDX-License-Identifier: Apache-2.0
-
-CONFIG_BOOT_MAX_IMG_SECTORS=1024
-CONFIG_BOOT_ERASE_PROGRESSIVELY=y
diff --git a/boot/zephyr/boards/mimxrt1050_evk_qspi.conf b/boot/zephyr/boards/mimxrt1060_evk_mimxrt1062.conf
similarity index 100%
copy from boot/zephyr/boards/mimxrt1050_evk_qspi.conf
copy to boot/zephyr/boards/mimxrt1060_evk_mimxrt1062.conf
diff --git a/boot/zephyr/boards/mimxrt1160_evk_cm7.conf b/boot/zephyr/boards/mimxrt1060_evk_mimxrt1062_cm7.conf
similarity index 100%
rename from boot/zephyr/boards/mimxrt1160_evk_cm7.conf
rename to boot/zephyr/boards/mimxrt1060_evk_mimxrt1062_cm7.conf
diff --git a/boot/zephyr/boards/mimxrt1060_evkb.conf b/boot/zephyr/boards/mimxrt1060_evkb.conf
deleted file mode 100644
index 7850953..0000000
--- a/boot/zephyr/boards/mimxrt1060_evkb.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 2021-2022 NXP
-# SPDX-License-Identifier: Apache-2.0
-
-CONFIG_BOOT_MAX_IMG_SECTORS=1024
-CONFIG_BOOT_ERASE_PROGRESSIVELY=y
diff --git a/boot/zephyr/boards/mimxrt1050_evk_qspi.conf b/boot/zephyr/boards/mimxrt1060_evkb_mimxrt1062.conf
similarity index 100%
copy from boot/zephyr/boards/mimxrt1050_evk_qspi.conf
copy to boot/zephyr/boards/mimxrt1060_evkb_mimxrt1062.conf
diff --git a/boot/zephyr/boards/mimxrt1064_evk.conf b/boot/zephyr/boards/mimxrt1064_evk_mimxrt1064.conf
similarity index 100%
rename from boot/zephyr/boards/mimxrt1064_evk.conf
rename to boot/zephyr/boards/mimxrt1064_evk_mimxrt1064.conf
diff --git a/boot/zephyr/boards/mimxrt1170_evk_cm7.conf b/boot/zephyr/boards/mimxrt1170_evk_cm7.conf
deleted file mode 100644
index 480796d..0000000
--- a/boot/zephyr/boards/mimxrt1170_evk_cm7.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 2022 NXP
-# SPDX-License-Identifier: Apache-2.0
-
-CONFIG_BOOT_MAX_IMG_SECTORS=1024
-CONFIG_BOOT_ERASE_PROGRESSIVELY=y
-# Move swap provides better wear levelling, so use it by default
-CONFIG_BOOT_SWAP_USING_MOVE=y
diff --git a/boot/zephyr/boards/mimxrt1160_evk_cm7.conf b/boot/zephyr/boards/mimxrt1170_evk_mimxrt1176_cm7.conf
similarity index 100%
copy from boot/zephyr/boards/mimxrt1160_evk_cm7.conf
copy to boot/zephyr/boards/mimxrt1170_evk_mimxrt1176_cm7.conf
diff --git a/boot/zephyr/boards/mimxrt595_evk_cm33.conf b/boot/zephyr/boards/mimxrt595_evk_mimxrt595s_cm33.conf
similarity index 100%
rename from boot/zephyr/boards/mimxrt595_evk_cm33.conf
rename to boot/zephyr/boards/mimxrt595_evk_mimxrt595s_cm33.conf
diff --git a/boot/zephyr/boards/mimxrt685_evk_cm33.conf b/boot/zephyr/boards/mimxrt685_evk_mimxrt685s_cm33.conf
similarity index 100%
rename from boot/zephyr/boards/mimxrt685_evk_cm33.conf
rename to boot/zephyr/boards/mimxrt685_evk_mimxrt685s_cm33.conf
diff --git a/boot/zephyr/boards/pinnacle_100_dvk.conf b/boot/zephyr/boards/pinnacle_100_dvk_nrf52840.conf
similarity index 100%
rename from boot/zephyr/boards/pinnacle_100_dvk.conf
rename to boot/zephyr/boards/pinnacle_100_dvk_nrf52840.conf
diff --git a/boot/zephyr/boards/rd_rw612_bga.conf b/boot/zephyr/boards/rd_rw612_bga_rw612.conf
similarity index 100%
rename from boot/zephyr/boards/rd_rw612_bga.conf
rename to boot/zephyr/boards/rd_rw612_bga_rw612.conf
diff --git a/boot/zephyr/boards/stamp_c3.conf b/boot/zephyr/boards/stamp_c3.conf
deleted file mode 100644
index 56298cd..0000000
--- a/boot/zephyr/boards/stamp_c3.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-# SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
-# SPDX-License-Identifier: Apache-2.0
-
-CONFIG_BOOT_MAX_IMG_SECTORS=512
-CONFIG_BOOT_UPGRADE_ONLY=y
-CONFIG_BOOT_VALIDATE_SLOT0=n
-CONFIG_BOOT_SIGNATURE_TYPE_NONE=y
-CONFIG_BOOT_BANNER=n
-
-CONFIG_UART_CONSOLE=n
-CONFIG_CONSOLE=n
-CONFIG_SERIAL=n
-
-CONFIG_MCUBOOT_LOG_LEVEL_OFF=y
-CONFIG_LOG_DEFAULT_LEVEL=0
-CONFIG_DEBUG=n
-
-CONFIG_XIP=n
-CONFIG_HEAP_MEM_POOL_SIZE=4096
-CONFIG_MINIMAL_LIBC=y
diff --git a/boot/zephyr/boards/xiao_esp32c3.conf b/boot/zephyr/boards/stamp_c3_esp32c3.conf
similarity index 100%
rename from boot/zephyr/boards/xiao_esp32c3.conf
rename to boot/zephyr/boards/stamp_c3_esp32c3.conf
diff --git a/boot/zephyr/boards/tlsr9518adk80d.conf b/boot/zephyr/boards/tlsr9518adk80d_tlsr9518.conf
similarity index 100%
rename from boot/zephyr/boards/tlsr9518adk80d.conf
rename to boot/zephyr/boards/tlsr9518adk80d_tlsr9518.conf
diff --git a/boot/zephyr/boards/xiao_esp32c3.conf b/boot/zephyr/boards/xiao_esp32c3_esp32c3.conf
similarity index 100%
copy from boot/zephyr/boards/xiao_esp32c3.conf
copy to boot/zephyr/boards/xiao_esp32c3_esp32c3.conf