Marcello Sylvester Bauer has uploaded this change for review.

View Change

arch/x86/Kconfig: move MAX_REBOOT_CNT option

Move the MAX_REBOOT_CNT option to arch/x86/Kconfig, to make it in the
menuconfig reachable. This simplifies the change of this option.

Change-Id: Ice26e2ef349f1172b564edc14f1012c33546a93c
Signed-off-by: Marcello Sylvester Bauer <info@marcellobauer.com>
---
M src/Kconfig
M src/arch/x86/Kconfig
2 files changed, 10 insertions(+), 8 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/79/29979/1

diff --git a/src/Kconfig b/src/Kconfig
index 62a7a92..812e83e 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -1085,14 +1085,6 @@
 	help
 	  Internal option that controls whether we compile in register scripts.
 
-config MAX_REBOOT_CNT
-	int
-	default 3
-	help
-	  Internal option that sets the maximum number of bootblock executions allowed
-	  with the normal image enabled before assuming the normal image is defective
-	  and switching to the fallback image.
-
 config CREATE_BOARD_CHECKLIST
 	bool
 	default n
diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig
index 7c8371e..0bbd0b0 100644
--- a/src/arch/x86/Kconfig
+++ b/src/arch/x86/Kconfig
@@ -268,6 +268,16 @@
 	default "bootblock_simple.c" if BOOTBLOCK_SIMPLE
 	default "bootblock_normal.c" if BOOTBLOCK_NORMAL
 
+config MAX_REBOOT_CNT
+	int "Max reboot count"
+	default 3
+	range 0 15
+	depends on BOOTBLOCK_NORMAL
+	help
+	  Sets the maximum number of bootblock executions allowed with the
+	  normal image enabled before assuming the normal image is defective
+	  and switching to the fallback image.
+
 config SKIP_MAX_REBOOT_CNT_CLEAR
 	bool "Do not clear reboot count after successful boot"
 	depends on BOOTBLOCK_NORMAL

To view, visit change 29979. To unsubscribe, or for help writing mail filters, visit settings.