diff --git a/boot/afboot-stm32/Config.in b/boot/afboot-stm32/Config.in
index 23372705ad..23d6eda5d4 100644
--- a/boot/afboot-stm32/Config.in
+++ b/boot/afboot-stm32/Config.in
@@ -1,4 +1,4 @@
-config BR2_TARGET_AFBOOT_STM32
+menuconfig BR2_TARGET_AFBOOT_STM32
 	bool "afboot-stm32"
 	depends on BR2_arm
 	help
diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted-firmware/Config.in
index becc3f69c3..72684e5974 100644
--- a/boot/arm-trusted-firmware/Config.in
+++ b/boot/arm-trusted-firmware/Config.in
@@ -1,4 +1,4 @@
-config BR2_TARGET_ARM_TRUSTED_FIRMWARE
+menuconfig BR2_TARGET_ARM_TRUSTED_FIRMWARE
 	bool "ARM Trusted Firmware (ATF)"
 	depends on (BR2_ARM_CPU_ARMV8A || BR2_ARM_CPU_ARMV7A)
 	help
diff --git a/boot/at91bootstrap3/Config.in b/boot/at91bootstrap3/Config.in
index b3e18fce7c..35bdb28162 100644
--- a/boot/at91bootstrap3/Config.in
+++ b/boot/at91bootstrap3/Config.in
@@ -1,4 +1,4 @@
-config BR2_TARGET_AT91BOOTSTRAP3
+menuconfig BR2_TARGET_AT91BOOTSTRAP3
 	bool "AT91 Bootstrap 3+"
 	depends on BR2_arm926t || BR2_cortex_a5 || BR2_cortex_a7
 	help
diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in
index 0bd3386795..c3cb0b3332 100644
--- a/boot/barebox/Config.in
+++ b/boot/barebox/Config.in
@@ -1,4 +1,4 @@
-config BR2_TARGET_BAREBOX
+menuconfig BR2_TARGET_BAREBOX
 	bool "Barebox"
 	help
 	  The Barebox bootloader, formerly known as U-Boot v2.
diff --git a/boot/boot-wrapper-aarch64/Config.in b/boot/boot-wrapper-aarch64/Config.in
index cf7389282f..dfefb7a9fd 100644
--- a/boot/boot-wrapper-aarch64/Config.in
+++ b/boot/boot-wrapper-aarch64/Config.in
@@ -2,7 +2,7 @@ comment "boot-wrapper-aarch64 needs a Linux kernel to be built"
 	depends on BR2_aarch64
 	depends on !BR2_LINUX_KERNEL
 
-config BR2_TARGET_BOOT_WRAPPER_AARCH64
+menuconfig BR2_TARGET_BOOT_WRAPPER_AARCH64
 	bool "boot-wrapper-aarch64"
 	depends on BR2_aarch64
 	depends on BR2_LINUX_KERNEL
diff --git a/boot/grub2/Config.in b/boot/grub2/Config.in
index e1f2fc105e..ecee9ef74c 100644
--- a/boot/grub2/Config.in
+++ b/boot/grub2/Config.in
@@ -7,7 +7,7 @@ config BR2_TARGET_GRUB2_ARCH_SUPPORTS
 	default y if BR2_RISCV_64
 	depends on BR2_USE_MMU
 
-config BR2_TARGET_GRUB2
+menuconfig BR2_TARGET_GRUB2
 	bool "grub2"
 	depends on BR2_TARGET_GRUB2_ARCH_SUPPORTS
 	depends on BR2_USE_WCHAR
diff --git a/boot/mxs-bootlets/Config.in b/boot/mxs-bootlets/Config.in
index 8f9334b610..00819c5ad6 100644
--- a/boot/mxs-bootlets/Config.in
+++ b/boot/mxs-bootlets/Config.in
@@ -1,4 +1,4 @@
-config BR2_TARGET_MXS_BOOTLETS
+menuconfig BR2_TARGET_MXS_BOOTLETS
 	bool "mxs-bootlets"
 	depends on BR2_arm
 	depends on BR2_TARGET_BAREBOX || BR2_LINUX_KERNEL || \
diff --git a/boot/opensbi/Config.in b/boot/opensbi/Config.in
index 98d6103ed6..37f06cd99d 100644
--- a/boot/opensbi/Config.in
+++ b/boot/opensbi/Config.in
@@ -1,4 +1,4 @@
-config BR2_TARGET_OPENSBI
+menuconfig BR2_TARGET_OPENSBI
 	bool "opensbi"
 	depends on BR2_riscv
 	help
diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in
index 6c4afccc7a..563f192b18 100644
--- a/boot/optee-os/Config.in
+++ b/boot/optee-os/Config.in
@@ -1,4 +1,4 @@
-config BR2_TARGET_OPTEE_OS
+menuconfig BR2_TARGET_OPTEE_OS
 	bool "optee_os"
 	depends on BR2_ARM_CPU_ARMV8A || BR2_ARM_CPU_ARMV7A || BR2_RISCV_64
 	help
diff --git a/boot/syslinux/Config.in b/boot/syslinux/Config.in
index c95dac1804..2891eae013 100644
--- a/boot/syslinux/Config.in
+++ b/boot/syslinux/Config.in
@@ -1,4 +1,4 @@
-config BR2_TARGET_SYSLINUX
+menuconfig BR2_TARGET_SYSLINUX
 	bool "syslinux"
 	depends on BR2_i386 || BR2_x86_64
 	# Make sure at least one of the flavors is installed
diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3-r5-loader/Config.in
index fe429bb8b4..b4fb46e55b 100644
--- a/boot/ti-k3-r5-loader/Config.in
+++ b/boot/ti-k3-r5-loader/Config.in
@@ -1,4 +1,4 @@
-config BR2_TARGET_TI_K3_R5_LOADER
+menuconfig BR2_TARGET_TI_K3_R5_LOADER
 	bool "ti-k3-r5-loader"
 	depends on BR2_aarch64
 	depends on BR2_PACKAGE_HOST_ARM_GNU_TOOLCHAIN_SUPPORTS
diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index 10098ed227..6739d53cb8 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -1,4 +1,4 @@
-config BR2_TARGET_UBOOT
+menuconfig BR2_TARGET_UBOOT
 	bool "U-Boot"
 	help
 	  Build "Das U-Boot" Boot Monitor
diff --git a/boot/xilinx-embeddedsw/Config.in b/boot/xilinx-embeddedsw/Config.in
index 007b24e668..a27253d594 100644
--- a/boot/xilinx-embeddedsw/Config.in
+++ b/boot/xilinx-embeddedsw/Config.in
@@ -1,7 +1,7 @@
 comment "xilinx-embeddedsw needs a bare metal toolchain for tuple microblazeel-xilinx-elf"
 	depends on BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH != "microblazeel-xilinx-elf"
 
-config BR2_TARGET_XILINX_EMBEDDEDSW
+menuconfig BR2_TARGET_XILINX_EMBEDDEDSW
 	bool "xilinx-embeddedsw"
 	depends on BR2_aarch64
 	depends on BR2_TOOLCHAIN_BARE_METAL_BUILDROOT
diff --git a/boot/xilinx-prebuilt/Config.in b/boot/xilinx-prebuilt/Config.in
index 4e0850f3ce..b95df5cbf4 100644
--- a/boot/xilinx-prebuilt/Config.in
+++ b/boot/xilinx-prebuilt/Config.in
@@ -1,4 +1,4 @@
-config BR2_TARGET_XILINX_PREBUILT
+menuconfig BR2_TARGET_XILINX_PREBUILT
 	bool "xilinx-prebuilt"
 	depends on BR2_aarch64
 	help