Skip to content

Commit 1ead4a6

Browse files
committed
boot: zephyr: kconfig: Remove superflous default n lines
Removes lines that have never done anything because this is already the default Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
1 parent e5d8640 commit 1ead4a6

File tree

2 files changed

+0
-22
lines changed

2 files changed

+0
-22
lines changed

boot/zephyr/Kconfig

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ config MCUBOOT
2020
config BOOT_USE_MBEDTLS
2121
bool
2222
# Hidden option
23-
default n
2423
help
2524
Use mbedTLS for crypto primitives.
2625

@@ -33,7 +32,6 @@ config BOOT_USE_PSA_CRYPTO
3332
config BOOT_USE_TINYCRYPT
3433
bool
3534
# Hidden option
36-
default n
3735
# When building for ECDSA, we use our own copy of mbedTLS, so the
3836
# Zephyr one must not be enabled or the MBEDTLS_CONFIG_FILE macros
3937
# will collide.
@@ -44,7 +42,6 @@ config BOOT_USE_TINYCRYPT
4442
config BOOT_USE_CC310
4543
bool
4644
# Hidden option
47-
default n
4845
# When building for ECDSA, we use our own copy of mbedTLS, so the
4946
# Zephyr one must not be enabled or the MBEDTLS_CONFIG_FILE macros
5047
# will collide.
@@ -53,15 +50,12 @@ config BOOT_USE_CC310
5350

5451
config BOOT_USE_NRF_CC310_BL
5552
bool
56-
default n
5753

5854
config NRFXLIB_CRYPTO
5955
bool
60-
default n
6156

6257
config NRF_CC310_BL
6358
bool
64-
default n
6559

6660
if BOOT_USE_MBEDTLS && MBEDTLS_BUILTIN
6761

@@ -130,7 +124,6 @@ menu "MCUBoot settings"
130124

131125
config SINGLE_APPLICATION_SLOT
132126
bool "Single slot bootloader"
133-
default n
134127
help
135128
Single image area is used for application which means that
136129
uploading a new application overwrites the one that previously
@@ -376,7 +369,6 @@ config MBEDTLS_CFG_FILE
376369

377370
config BOOT_HW_KEY
378371
bool "Use HW key for image verification"
379-
default n
380372
help
381373
Use HW key for image verification, otherwise the public key is embedded
382374
in MCUBoot. If enabled the public key is appended to the signed image
@@ -395,7 +387,6 @@ config BOOT_VALIDATE_SLOT0
395387
config BOOT_VALIDATE_SLOT0_ONCE
396388
bool "Validate image in the primary slot just once after after upgrade"
397389
depends on !BOOT_VALIDATE_SLOT0 && SINGLE_APPLICATION_SLOT
398-
default n
399390
help
400391
If y, the bootloader attempts to validate the signature of the
401392
primary slot only once after an upgrade of the main slot.
@@ -501,7 +492,6 @@ endchoice
501492
config BOOT_DIRECT_XIP_REVERT
502493
bool "Enable the revert mechanism in direct-xip mode"
503494
depends on BOOT_DIRECT_XIP
504-
default n
505495
help
506496
If y, enables the revert mechanism in direct-xip similar to the one in
507497
swap mode. It requires the trailer magic to be added to the signed image.
@@ -512,15 +502,13 @@ config BOOT_DIRECT_XIP_REVERT
512502

513503
config BOOT_BOOTSTRAP
514504
bool "Bootstrap erased the primary slot from the secondary slot"
515-
default n
516505
help
517506
If y, enables bootstraping support. Bootstrapping allows an erased
518507
primary slot to be initialized from a valid image in the secondary slot.
519508
If unsure, leave at the default value.
520509

521510
config BOOT_SWAP_SAVE_ENCTLV
522511
bool "Save encrypted key TLVs instead of plaintext keys in swap metadata"
523-
default n
524512
depends on BOOT_ENCRYPT_IMAGE
525513
help
526514
If y, instead of saving the encrypted image keys in plaintext in the
@@ -649,7 +637,6 @@ config BOOT_MAX_IMG_SECTORS
649637

650638
config BOOT_SHARE_BACKEND_AVAILABLE
651639
bool
652-
default n
653640
help
654641
Hidden open which indicates if there is a sharing backend available.
655642

@@ -658,7 +645,6 @@ DT_CHOSEN_BOOTLOADER_INFO := zephyr,bootloader-info
658645

659646
config BOOT_SHARE_BACKEND_AVAILABLE
660647
bool
661-
default n
662648
help
663649
Hidden open which indicates if there is a sharing backend available.
664650

@@ -693,7 +679,6 @@ endchoice
693679

694680
menuconfig BOOT_SHARE_DATA
695681
bool "Save application specific data"
696-
default n
697682
depends on BOOT_SHARE_BACKEND_AVAILABLE
698683
help
699684
This will allow data to be shared between MCUboot and an application,
@@ -705,15 +690,13 @@ menuconfig BOOT_SHARE_DATA
705690

706691
config BOOT_SHARE_DATA_BOOTINFO
707692
bool "Save boot information data"
708-
default n
709693
depends on BOOT_SHARE_DATA
710694
help
711695
This will place information about the MCUboot configuration and
712696
running application into a shared memory area.
713697

714698
menuconfig MEASURED_BOOT
715699
bool "Store the boot state/measurements in shared memory area"
716-
default n
717700
depends on BOOT_SHARE_BACKEND_AVAILABLE
718701
help
719702
If enabled, the bootloader will store certain boot measurements such as
@@ -830,7 +813,6 @@ config BOOT_USB_DFU_NO_APPLICATION
830813

831814
config BOOT_USE_BENCH
832815
bool "Enable benchmark code"
833-
default n
834816
help
835817
If y, adds support for simple benchmarking that can record
836818
time intervals between two calls. The time printed depends
@@ -867,7 +849,6 @@ rsource "Kconfig.firmware_loader"
867849

868850
config BOOT_INTR_VEC_RELOC
869851
bool "Relocate the interrupt vector to the application"
870-
default n
871852
depends on SW_VECTOR_RELAY || CPU_CORTEX_M_HAS_VTOR
872853
help
873854
Relocate the interrupt vector to the application before it is started.
@@ -1062,7 +1043,6 @@ config MCUBOOT_DEVICE_SETTINGS
10621043
config MCUBOOT_DEVICE_CPU_CORTEX_M0
10631044
# Hidden selector for Cortex-M0 settings
10641045
bool
1065-
default n
10661046
select SW_VECTOR_RELAY if !CPU_CORTEX_M0_HAS_VECTOR_TABLE_REMAP
10671047

10681048
comment "Zephyr configuration options"
@@ -1091,7 +1071,6 @@ config USB_DEVICE_PRODUCT
10911071
# use MCUboot's own log configuration
10921072
config MCUBOOT_BOOTUTIL_LIB_OWN_LOG
10931073
bool
1094-
default n
10951074

10961075
config MCUBOOT_VERIFY_IMG_ADDRESS
10971076
bool "Verify reset address of image in secondary slot"

boot/zephyr/Kconfig.serial_recovery

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
menuconfig MCUBOOT_SERIAL
88
bool "MCUboot serial recovery"
9-
default n
109
select REBOOT
1110
select SERIAL
1211
select UART_INTERRUPT_DRIVEN

0 commit comments

Comments
 (0)