From edb02f0274928689e65b534656f52ed1ad4d4d14 Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Sat, 20 Jun 2015 10:55:30 -0400 Subject: [PATCH] kconfig: move bootloader options to misc/ More bootloader options moved to 1 single menu. Change-Id: I6908de8e26b4a15617ad5aa738c9dc2a928ad6a4 Signed-off-by: Anas Nashif --- arch/x86/Kconfig | 31 ------------------------------- misc/Kconfig | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 31 deletions(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index a89f89eb926..9868b895bae 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -247,37 +247,6 @@ config ADVANCED_IDLE_SUPPORTED endmenu -config BOOTLOADER_UNKNOWN - bool - default n - help - This option signifies that the target has an unknown bootloader - or that it supports multiple ways of booting and it isn't clear - at build time which method is to be used. When this option is enabled - the BSP may have to do extra work to ensure a propert 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 - 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 - default n - help - This option causes the A20 line to be enabled during the transition - from real mode (16-bit) to protected mode (32-bit) during its initial - booting sequence. - -endmenu config SHUTOFF_PIC bool "Shutoff PIC" diff --git a/misc/Kconfig b/misc/Kconfig index 862ffc78f0a..5c7bea5bec6 100644 --- a/misc/Kconfig +++ b/misc/Kconfig @@ -137,6 +137,7 @@ menu "Bootloader Options" config BOOTLOADER_KEXEC bool prompt "Boot using Linux kexec() system call" + depends on X86_32 default n help This option signifies that Linux boots the kernel using kexec system call @@ -151,6 +152,38 @@ config BOOTLOADER_GRUB This option signifies that GRUB 2.0 is used to boot the kernel. GRUB 2.0 is used to boot the kernel from SD card. +config BOOTLOADER_UNKNOWN + bool + default n + help + This option signifies that the target has an unknown bootloader + or that it supports multiple ways of booting and it isn't clear + at build time which method is to be used. When this option is enabled + the BSP 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 + 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 + default n + help + This option causes the A20 line to be enabled during the transition + from real mode (16-bit) to protected mode (32-bit) during its initial + booting sequence. + +endmenu + endmenu menu "System Monitoring Options"