diff --git a/arch/arc/defconfig b/arch/arc/defconfig index cb59c04bcf2..2e763a94dfe 100644 --- a/arch/arc/defconfig +++ b/arch/arc/defconfig @@ -45,7 +45,7 @@ CONFIG_PRINTK=y # CONFIG_ASSERT is not set # -# Bootloader Options +# Boot Options # # CONFIG_BOOTLOADER_UNKNOWN is not set diff --git a/arch/arm/configs/micro_basic_cortex_m3_defconfig b/arch/arm/configs/micro_basic_cortex_m3_defconfig index 9f4577732e3..f679b9d7325 100644 --- a/arch/arm/configs/micro_basic_cortex_m3_defconfig +++ b/arch/arm/configs/micro_basic_cortex_m3_defconfig @@ -67,7 +67,7 @@ CONFIG_PRINTK=y # CONFIG_ASSERT is not set # -# Bootloader Options +# Boot Options # # CONFIG_BOOTLOADER_UNKNOWN is not set diff --git a/arch/arm/configs/micro_fsl_frdm_k64f_defconfig b/arch/arm/configs/micro_fsl_frdm_k64f_defconfig index 059ed912a17..1b6cabcd2e0 100644 --- a/arch/arm/configs/micro_fsl_frdm_k64f_defconfig +++ b/arch/arm/configs/micro_fsl_frdm_k64f_defconfig @@ -67,7 +67,7 @@ CONFIG_PRINTK=y # CONFIG_ASSERT is not set # -# Bootloader Options +# Boot Options # # CONFIG_BOOTLOADER_UNKNOWN is not set diff --git a/arch/arm/configs/nano_basic_cortex_m3_defconfig b/arch/arm/configs/nano_basic_cortex_m3_defconfig index 4f2799d24e7..3933468fd8b 100644 --- a/arch/arm/configs/nano_basic_cortex_m3_defconfig +++ b/arch/arm/configs/nano_basic_cortex_m3_defconfig @@ -46,7 +46,7 @@ CONFIG_PRINTK=y # CONFIG_ASSERT is not set # -# Bootloader Options +# Boot Options # # CONFIG_BOOTLOADER_UNKNOWN is not set diff --git a/arch/arm/configs/nano_fsl_frdm_k64f_defconfig b/arch/arm/configs/nano_fsl_frdm_k64f_defconfig index df95e26bd58..3d6a18cd53a 100644 --- a/arch/arm/configs/nano_fsl_frdm_k64f_defconfig +++ b/arch/arm/configs/nano_fsl_frdm_k64f_defconfig @@ -46,7 +46,7 @@ CONFIG_PRINTK=y # CONFIG_ASSERT is not set # -# Bootloader Options +# Boot Options # # CONFIG_BOOTLOADER_UNKNOWN is not set diff --git a/arch/arm/defconfig b/arch/arm/defconfig index 059ed912a17..1b6cabcd2e0 100644 --- a/arch/arm/defconfig +++ b/arch/arm/defconfig @@ -67,7 +67,7 @@ CONFIG_PRINTK=y # CONFIG_ASSERT is not set # -# Bootloader Options +# Boot Options # # CONFIG_BOOTLOADER_UNKNOWN is not set diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 0060d8876a0..3d679c70b2f 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -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 diff --git a/arch/x86/configs/micro_basic_atom_defconfig b/arch/x86/configs/micro_basic_atom_defconfig index 5aa612bf108..485ffa0e3aa 100644 --- a/arch/x86/configs/micro_basic_atom_defconfig +++ b/arch/x86/configs/micro_basic_atom_defconfig @@ -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 diff --git a/arch/x86/configs/micro_basic_minuteia_defconfig b/arch/x86/configs/micro_basic_minuteia_defconfig index fbb31d983e1..c189369ee36 100644 --- a/arch/x86/configs/micro_basic_minuteia_defconfig +++ b/arch/x86/configs/micro_basic_minuteia_defconfig @@ -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 # diff --git a/arch/x86/configs/micro_galileo_defconfig b/arch/x86/configs/micro_galileo_defconfig index caed3c0afb9..5797d7cd821 100644 --- a/arch/x86/configs/micro_galileo_defconfig +++ b/arch/x86/configs/micro_galileo_defconfig @@ -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 diff --git a/arch/x86/configs/nano_basic_atom_defconfig b/arch/x86/configs/nano_basic_atom_defconfig index db232487850..0f64b9a6f78 100644 --- a/arch/x86/configs/nano_basic_atom_defconfig +++ b/arch/x86/configs/nano_basic_atom_defconfig @@ -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 diff --git a/arch/x86/configs/nano_basic_minuteia_defconfig b/arch/x86/configs/nano_basic_minuteia_defconfig index e9b7e959438..9648ea3b7d2 100644 --- a/arch/x86/configs/nano_basic_minuteia_defconfig +++ b/arch/x86/configs/nano_basic_minuteia_defconfig @@ -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 # diff --git a/arch/x86/configs/nano_galileo_defconfig b/arch/x86/configs/nano_galileo_defconfig index 17057294b41..c986d803c0f 100644 --- a/arch/x86/configs/nano_galileo_defconfig +++ b/arch/x86/configs/nano_galileo_defconfig @@ -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 diff --git a/arch/x86/defconfig b/arch/x86/defconfig index caed3c0afb9..5797d7cd821 100644 --- a/arch/x86/defconfig +++ b/arch/x86/defconfig @@ -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 diff --git a/misc/Kconfig b/misc/Kconfig index 33b5d57d6f4..0c848de2db1 100644 --- a/misc/Kconfig +++ b/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