Remove Kconfig option PROT_MODE_SWITCH_PROMPT
The Kconfig option PROT_MODE_SWITCH_PROMPT was being used to conditionally display the "Boot Sequence Options" Kconfig menu. It is simpler to include both PROT_MODE_SWITCH and its dependent BOOT_A20_ENABLE in the parent menu. However, doing so necessitates that the name of the parent menu be changed from "Bootloader Options" to "Boot Options". Change-Id: I9b9a074a0d4ec5209f5349b42178409c73875b00 Signed-off-by: Peter Mitsis <peter.mitsis@windriver.com>
This commit is contained in:
parent
39fc84e65a
commit
e8839abb4a
15 changed files with 23 additions and 35 deletions
|
@ -45,7 +45,7 @@ CONFIG_PRINTK=y
|
|||
# CONFIG_ASSERT is not set
|
||||
|
||||
#
|
||||
# Bootloader Options
|
||||
# Boot Options
|
||||
#
|
||||
# CONFIG_BOOTLOADER_UNKNOWN is not set
|
||||
|
||||
|
|
|
@ -67,7 +67,7 @@ CONFIG_PRINTK=y
|
|||
# CONFIG_ASSERT is not set
|
||||
|
||||
#
|
||||
# Bootloader Options
|
||||
# Boot Options
|
||||
#
|
||||
# CONFIG_BOOTLOADER_UNKNOWN is not set
|
||||
|
||||
|
|
|
@ -67,7 +67,7 @@ CONFIG_PRINTK=y
|
|||
# CONFIG_ASSERT is not set
|
||||
|
||||
#
|
||||
# Bootloader Options
|
||||
# Boot Options
|
||||
#
|
||||
# CONFIG_BOOTLOADER_UNKNOWN is not set
|
||||
|
||||
|
|
|
@ -46,7 +46,7 @@ CONFIG_PRINTK=y
|
|||
# CONFIG_ASSERT is not set
|
||||
|
||||
#
|
||||
# Bootloader Options
|
||||
# Boot Options
|
||||
#
|
||||
# CONFIG_BOOTLOADER_UNKNOWN is not set
|
||||
|
||||
|
|
|
@ -46,7 +46,7 @@ CONFIG_PRINTK=y
|
|||
# CONFIG_ASSERT is not set
|
||||
|
||||
#
|
||||
# Bootloader Options
|
||||
# Boot Options
|
||||
#
|
||||
# CONFIG_BOOTLOADER_UNKNOWN is not set
|
||||
|
||||
|
|
|
@ -67,7 +67,7 @@ CONFIG_PRINTK=y
|
|||
# CONFIG_ASSERT is not set
|
||||
|
||||
#
|
||||
# Bootloader Options
|
||||
# Boot Options
|
||||
#
|
||||
# CONFIG_BOOTLOADER_UNKNOWN is not set
|
||||
|
||||
|
|
|
@ -187,13 +187,6 @@ config NUM_DYNAMIC_STUBS
|
|||
This option specifies the number of interrupt handlers that can be
|
||||
installed dynamically using irq_connect().
|
||||
|
||||
config PROT_MODE_SWITCH_PROMPT
|
||||
bool "Prot Mode switch prompt"
|
||||
default n
|
||||
help
|
||||
This option allows users to select the value of the PROT_MODE_SWITCH
|
||||
configuration option.
|
||||
|
||||
config ADVANCED_IDLE_SUPPORTED
|
||||
bool "Advanced idle supported"
|
||||
default n
|
||||
|
|
|
@ -76,10 +76,11 @@ CONFIG_PRINTK=y
|
|||
# CONFIG_ASSERT is not set
|
||||
|
||||
#
|
||||
# Bootloader Options
|
||||
# Boot Options
|
||||
#
|
||||
# CONFIG_BOOTLOADER_KEXEC is not set
|
||||
CONFIG_BOOTLOADER_UNKNOWN=y
|
||||
# CONFIG_PROT_MODE_SWITCH is not set
|
||||
|
||||
#
|
||||
# General Platform Configuration
|
||||
|
@ -111,7 +112,6 @@ CONFIG_CACHE_LINE_SIZE=64
|
|||
# Specific Platform Capability Support
|
||||
#
|
||||
CONFIG_NUM_DYNAMIC_STUBS=0
|
||||
# CONFIG_PROT_MODE_SWITCH_PROMPT is not set
|
||||
# CONFIG_ADVANCED_IDLE_SUPPORTED is not set
|
||||
CONFIG_SHUTOFF_PIC=y
|
||||
|
||||
|
|
|
@ -76,10 +76,11 @@ CONFIG_PRINTK=y
|
|||
# CONFIG_ASSERT is not set
|
||||
|
||||
#
|
||||
# Bootloader Options
|
||||
# Boot Options
|
||||
#
|
||||
# CONFIG_BOOTLOADER_KEXEC is not set
|
||||
CONFIG_BOOTLOADER_UNKNOWN=y
|
||||
# CONFIG_PROT_MODE_SWITCH is not set
|
||||
|
||||
#
|
||||
# General Platform Configuration
|
||||
|
@ -111,7 +112,6 @@ CONFIG_CACHE_LINE_SIZE=0
|
|||
# Specific Platform Capability Support
|
||||
#
|
||||
CONFIG_NUM_DYNAMIC_STUBS=0
|
||||
# CONFIG_PROT_MODE_SWITCH_PROMPT is not set
|
||||
# CONFIG_ADVANCED_IDLE_SUPPORTED is not set
|
||||
|
||||
#
|
||||
|
|
|
@ -76,10 +76,11 @@ CONFIG_PRINTK=y
|
|||
# CONFIG_ASSERT is not set
|
||||
|
||||
#
|
||||
# Bootloader Options
|
||||
# Boot Options
|
||||
#
|
||||
# CONFIG_BOOTLOADER_KEXEC is not set
|
||||
CONFIG_BOOTLOADER_UNKNOWN=y
|
||||
# CONFIG_PROT_MODE_SWITCH is not set
|
||||
|
||||
#
|
||||
# General Platform Configuration
|
||||
|
@ -111,7 +112,6 @@ CONFIG_CACHE_LINE_SIZE=0
|
|||
# Specific Platform Capability Support
|
||||
#
|
||||
CONFIG_NUM_DYNAMIC_STUBS=0
|
||||
# CONFIG_PROT_MODE_SWITCH_PROMPT is not set
|
||||
# CONFIG_ADVANCED_IDLE_SUPPORTED is not set
|
||||
# CONFIG_SHUTOFF_PIC is not set
|
||||
|
||||
|
|
|
@ -55,10 +55,11 @@ CONFIG_PRINTK=y
|
|||
# CONFIG_ASSERT is not set
|
||||
|
||||
#
|
||||
# Bootloader Options
|
||||
# Boot Options
|
||||
#
|
||||
# CONFIG_BOOTLOADER_KEXEC is not set
|
||||
CONFIG_BOOTLOADER_UNKNOWN=y
|
||||
# CONFIG_PROT_MODE_SWITCH is not set
|
||||
|
||||
#
|
||||
# General Platform Configuration
|
||||
|
@ -90,7 +91,6 @@ CONFIG_CACHE_LINE_SIZE=64
|
|||
# Specific Platform Capability Support
|
||||
#
|
||||
CONFIG_NUM_DYNAMIC_STUBS=0
|
||||
# CONFIG_PROT_MODE_SWITCH_PROMPT is not set
|
||||
# CONFIG_ADVANCED_IDLE_SUPPORTED is not set
|
||||
CONFIG_SHUTOFF_PIC=y
|
||||
|
||||
|
|
|
@ -55,10 +55,11 @@ CONFIG_PRINTK=y
|
|||
# CONFIG_ASSERT is not set
|
||||
|
||||
#
|
||||
# Bootloader Options
|
||||
# Boot Options
|
||||
#
|
||||
# CONFIG_BOOTLOADER_KEXEC is not set
|
||||
CONFIG_BOOTLOADER_UNKNOWN=y
|
||||
# CONFIG_PROT_MODE_SWITCH is not set
|
||||
|
||||
#
|
||||
# General Platform Configuration
|
||||
|
@ -90,7 +91,6 @@ CONFIG_CACHE_LINE_SIZE=0
|
|||
# Specific Platform Capability Support
|
||||
#
|
||||
CONFIG_NUM_DYNAMIC_STUBS=0
|
||||
# CONFIG_PROT_MODE_SWITCH_PROMPT is not set
|
||||
# CONFIG_ADVANCED_IDLE_SUPPORTED is not set
|
||||
|
||||
#
|
||||
|
|
|
@ -55,10 +55,11 @@ CONFIG_PRINTK=y
|
|||
# CONFIG_ASSERT is not set
|
||||
|
||||
#
|
||||
# Bootloader Options
|
||||
# Boot Options
|
||||
#
|
||||
# CONFIG_BOOTLOADER_KEXEC is not set
|
||||
CONFIG_BOOTLOADER_UNKNOWN=y
|
||||
# CONFIG_PROT_MODE_SWITCH is not set
|
||||
|
||||
#
|
||||
# General Platform Configuration
|
||||
|
@ -90,7 +91,6 @@ CONFIG_CACHE_LINE_SIZE=0
|
|||
# Specific Platform Capability Support
|
||||
#
|
||||
CONFIG_NUM_DYNAMIC_STUBS=0
|
||||
# CONFIG_PROT_MODE_SWITCH_PROMPT is not set
|
||||
# CONFIG_ADVANCED_IDLE_SUPPORTED is not set
|
||||
# CONFIG_SHUTOFF_PIC is not set
|
||||
|
||||
|
|
|
@ -76,10 +76,11 @@ CONFIG_PRINTK=y
|
|||
# CONFIG_ASSERT is not set
|
||||
|
||||
#
|
||||
# Bootloader Options
|
||||
# Boot Options
|
||||
#
|
||||
# CONFIG_BOOTLOADER_KEXEC is not set
|
||||
CONFIG_BOOTLOADER_UNKNOWN=y
|
||||
# CONFIG_PROT_MODE_SWITCH is not set
|
||||
|
||||
#
|
||||
# General Platform Configuration
|
||||
|
@ -111,7 +112,6 @@ CONFIG_CACHE_LINE_SIZE=0
|
|||
# Specific Platform Capability Support
|
||||
#
|
||||
CONFIG_NUM_DYNAMIC_STUBS=0
|
||||
# CONFIG_PROT_MODE_SWITCH_PROMPT is not set
|
||||
# CONFIG_ADVANCED_IDLE_SUPPORTED is not set
|
||||
# CONFIG_SHUTOFF_PIC is not set
|
||||
|
||||
|
|
11
misc/Kconfig
11
misc/Kconfig
|
@ -146,7 +146,7 @@ config ASSERT_LEVEL
|
|||
endmenu
|
||||
|
||||
|
||||
menu "Bootloader Options"
|
||||
menu "Boot Options"
|
||||
|
||||
config BOOTLOADER_KEXEC
|
||||
bool
|
||||
|
@ -166,21 +166,18 @@ config BOOTLOADER_UNKNOWN
|
|||
at build time which method is to be used. When this option is enabled
|
||||
the platform may have to do extra work to ensure a proper startup.
|
||||
|
||||
menu "Boot Sequence Options"
|
||||
depends on PROT_MODE_SWITCH_PROMPT
|
||||
|
||||
config PROT_MODE_SWITCH
|
||||
bool
|
||||
prompt "Switch to 32-bit protected mode when booting"
|
||||
default n
|
||||
depends on PROT_MODE_SWITCH_PROMPT && X86_32
|
||||
depends on X86_32
|
||||
help
|
||||
This option causes the kernel to transition from real mode (16-bit)
|
||||
to protected mode (32-bit) during its initial booting sequence.
|
||||
|
||||
config BOOT_A20_ENABLE
|
||||
bool "Boot A20 enable"
|
||||
depends on PROT_MODE_SWITCH && X86_32
|
||||
depends on PROT_MODE_SWITCH
|
||||
default n
|
||||
help
|
||||
This option causes the A20 line to be enabled during the transition
|
||||
|
@ -189,8 +186,6 @@ config BOOT_A20_ENABLE
|
|||
|
||||
endmenu
|
||||
|
||||
endmenu
|
||||
|
||||
menu "System Monitoring Options"
|
||||
depends on EXPERIMENTAL
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue