boards: espressif: sysbuild: move BOOTLOADER_MCUBOOT default choice

almir-okato · almir-okato · commit bcd6f9ec1261 · 2025-04-11T10:01:36.000-03:00
Move BOOTLOADER_MCUBOOT configuration from
boards/espressif/&lt;BOARD&gt;/Kconfig.sysbuild to
soc/espressif/Kconfig.sysbuild so it applies generally to every
board with Espressif's SoC when building a project using sysbuild.

Signed-off-by: Almir Okato &lt;almir.okato@espressif.com&gt;
diff --git a/boards/espressif/esp32_devkitc_wroom/Kconfig.sysbuild b/boards/espressif/esp32_devkitc_wroom/Kconfig.sysbuild
@@ -1,10 +1,6 @@
 # Copyright (c) 2023 Espressif Systems (Shanghai) Co., Ltd.
 # SPDX-License-Identifier: Apache-2.0
 
-choice BOOTLOADER
-	default BOOTLOADER_MCUBOOT
-endchoice
-
 choice BOOT_SIGNATURE_TYPE
 	default BOOT_SIGNATURE_TYPE_NONE
 endchoice
diff --git a/boards/espressif/esp32_devkitc_wrover/Kconfig.sysbuild b/boards/espressif/esp32_devkitc_wrover/Kconfig.sysbuild
@@ -1,10 +1,6 @@
 # Copyright (c) 2023 Espressif Systems (Shanghai) Co., Ltd.
 # SPDX-License-Identifier: Apache-2.0
 
-choice BOOTLOADER
-	default BOOTLOADER_MCUBOOT
-endchoice
-
 choice BOOT_SIGNATURE_TYPE
 	default BOOT_SIGNATURE_TYPE_NONE
 endchoice
diff --git a/boards/espressif/esp32_ethernet_kit/Kconfig.sysbuild b/boards/espressif/esp32_ethernet_kit/Kconfig.sysbuild
@@ -1,10 +1,6 @@
 # Copyright (c) 2023 Espressif Systems (Shanghai) Co., Ltd.
 # SPDX-License-Identifier: Apache-2.0
 
-choice BOOTLOADER
-	default BOOTLOADER_MCUBOOT
-endchoice
-
 choice BOOT_SIGNATURE_TYPE
 	default BOOT_SIGNATURE_TYPE_NONE
 endchoice
diff --git a/boards/espressif/esp32c3_devkitc/Kconfig.sysbuild b/boards/espressif/esp32c3_devkitc/Kconfig.sysbuild
@@ -1,10 +1,6 @@
 # Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
 # SPDX-License-Identifier: Apache-2.0
 
-choice BOOTLOADER
-	default BOOTLOADER_MCUBOOT
-endchoice
-
 choice BOOT_SIGNATURE_TYPE
 	default BOOT_SIGNATURE_TYPE_NONE
 endchoice
diff --git a/boards/espressif/esp32c3_devkitm/Kconfig.sysbuild b/boards/espressif/esp32c3_devkitm/Kconfig.sysbuild
@@ -1,10 +1,6 @@
 # Copyright (c) 2023 Espressif Systems (Shanghai) Co., Ltd.
 # SPDX-License-Identifier: Apache-2.0
 
-choice BOOTLOADER
-	default BOOTLOADER_MCUBOOT
-endchoice
-
 choice BOOT_SIGNATURE_TYPE
 	default BOOT_SIGNATURE_TYPE_NONE
 endchoice
diff --git a/boards/espressif/esp32c3_rust/Kconfig.sysbuild b/boards/espressif/esp32c3_rust/Kconfig.sysbuild
@@ -1,10 +1,6 @@
 # Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
 # SPDX-License-Identifier: Apache-2.0
 
-choice BOOTLOADER
-	default BOOTLOADER_MCUBOOT
-endchoice
-
 choice BOOT_SIGNATURE_TYPE
 	default BOOT_SIGNATURE_TYPE_NONE
 endchoice
diff --git a/boards/espressif/esp32c6_devkitc/Kconfig.sysbuild b/boards/espressif/esp32c6_devkitc/Kconfig.sysbuild
@@ -1,10 +1,6 @@
 # Copyright (c) 2023 Espressif Systems (Shanghai) Co., Ltd.
 # SPDX-License-Identifier: Apache-2.0
 
-choice BOOTLOADER
-	default BOOTLOADER_MCUBOOT
-endchoice
-
 choice BOOT_SIGNATURE_TYPE
 	default BOOT_SIGNATURE_TYPE_NONE
 endchoice
diff --git a/boards/espressif/esp32s2_devkitc/Kconfig.sysbuild b/boards/espressif/esp32s2_devkitc/Kconfig.sysbuild
@@ -1,10 +1,6 @@
 # Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
 # SPDX-License-Identifier: Apache-2.0
 
-choice BOOTLOADER
-	default BOOTLOADER_MCUBOOT
-endchoice
-
 choice BOOT_SIGNATURE_TYPE
 	default BOOT_SIGNATURE_TYPE_NONE
 endchoice
diff --git a/boards/espressif/esp32s2_saola/Kconfig.sysbuild b/boards/espressif/esp32s2_saola/Kconfig.sysbuild
@@ -1,10 +1,6 @@
 # Copyright (c) 2023 Espressif Systems (Shanghai) Co., Ltd.
 # SPDX-License-Identifier: Apache-2.0
 
-choice BOOTLOADER
-	default BOOTLOADER_MCUBOOT
-endchoice
-
 choice BOOT_SIGNATURE_TYPE
 	default BOOT_SIGNATURE_TYPE_NONE
 endchoice
diff --git a/boards/espressif/esp32s3_devkitc/Kconfig.sysbuild b/boards/espressif/esp32s3_devkitc/Kconfig.sysbuild
@@ -1,10 +1,6 @@
 # Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
 # SPDX-License-Identifier: Apache-2.0
 
-choice BOOTLOADER
-	default BOOTLOADER_MCUBOOT
-endchoice
-
 choice BOOT_SIGNATURE_TYPE
 	default BOOT_SIGNATURE_TYPE_NONE
 endchoice
diff --git a/boards/espressif/esp32s3_devkitm/Kconfig.sysbuild b/boards/espressif/esp32s3_devkitm/Kconfig.sysbuild
@@ -1,10 +1,6 @@
 # Copyright (c) 2023 Espressif Systems (Shanghai) Co., Ltd.
 # SPDX-License-Identifier: Apache-2.0
 
-choice BOOTLOADER
-	default BOOTLOADER_MCUBOOT
-endchoice
-
 choice BOOT_SIGNATURE_TYPE
 	default BOOT_SIGNATURE_TYPE_NONE
 endchoice
diff --git a/boards/espressif/esp32s3_eye/Kconfig.sysbuild b/boards/espressif/esp32s3_eye/Kconfig.sysbuild
@@ -1,10 +1,6 @@
 # Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
 # SPDX-License-Identifier: Apache-2.0
 
-choice BOOTLOADER
-	default BOOTLOADER_MCUBOOT
-endchoice
-
 choice BOOT_SIGNATURE_TYPE
 	default BOOT_SIGNATURE_TYPE_NONE
 endchoice
diff --git a/boards/espressif/esp8684_devkitm/Kconfig.sysbuild b/boards/espressif/esp8684_devkitm/Kconfig.sysbuild
@@ -1,10 +1,6 @@
 # Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
 # SPDX-License-Identifier: Apache-2.0
 
-choice BOOTLOADER
-	default BOOTLOADER_MCUBOOT
-endchoice
-
 choice BOOT_SIGNATURE_TYPE
 	default BOOT_SIGNATURE_TYPE_NONE
 endchoice
diff --git a/boards/espressif/esp_wrover_kit/Kconfig.sysbuild b/boards/espressif/esp_wrover_kit/Kconfig.sysbuild
@@ -1,10 +1,6 @@
 # Copyright (c) 2023 Espressif Systems (Shanghai) Co., Ltd.
 # SPDX-License-Identifier: Apache-2.0
 
-choice BOOTLOADER
-	default BOOTLOADER_MCUBOOT
-endchoice
-
 choice BOOT_SIGNATURE_TYPE
 	default BOOT_SIGNATURE_TYPE_NONE
 endchoice
diff --git a/soc/espressif/Kconfig.sysbuild b/soc/espressif/Kconfig.sysbuild
@@ -1,6 +1,10 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
+choice BOOTLOADER
+	default BOOTLOADER_MCUBOOT
+endchoice
+
 choice MCUBOOT_MODE
 	default MCUBOOT_MODE_OVERWRITE_ONLY if SOC_FAMILY_ESPRESSIF_ESP32
 endchoice
