diff --git a/arch/x86/configs/micro_generic_pc_atom_n28xx_defconfig b/arch/x86/configs/micro_generic_pc_atom_n28xx_defconfig index 28bb7591c4e..ab489462d36 100644 --- a/arch/x86/configs/micro_generic_pc_atom_n28xx_defconfig +++ b/arch/x86/configs/micro_generic_pc_atom_n28xx_defconfig @@ -78,7 +78,6 @@ CONFIG_PRINTK=y # Bootloader Options # # CONFIG_BOOTLOADER_KEXEC is not set -# CONFIG_BOOTLOADER_GRUB is not set CONFIG_BOOTLOADER_UNKNOWN=y # diff --git a/arch/x86/configs/micro_generic_pc_minuteia_defconfig b/arch/x86/configs/micro_generic_pc_minuteia_defconfig index e96ad2244fd..2ab20670ab7 100644 --- a/arch/x86/configs/micro_generic_pc_minuteia_defconfig +++ b/arch/x86/configs/micro_generic_pc_minuteia_defconfig @@ -78,7 +78,6 @@ CONFIG_PRINTK=y # Bootloader Options # # CONFIG_BOOTLOADER_KEXEC is not set -# CONFIG_BOOTLOADER_GRUB is not set CONFIG_BOOTLOADER_UNKNOWN=y # diff --git a/arch/x86/configs/micro_quark_defconfig b/arch/x86/configs/micro_quark_defconfig index 954b364c15a..40e34b703dc 100644 --- a/arch/x86/configs/micro_quark_defconfig +++ b/arch/x86/configs/micro_quark_defconfig @@ -78,7 +78,6 @@ CONFIG_PRINTK=y # Bootloader Options # # CONFIG_BOOTLOADER_KEXEC is not set -CONFIG_BOOTLOADER_GRUB=y CONFIG_BOOTLOADER_UNKNOWN=y # diff --git a/arch/x86/configs/nano_generic_pc_atom_n28xx_defconfig b/arch/x86/configs/nano_generic_pc_atom_n28xx_defconfig index 5a96673688e..284eee33f74 100644 --- a/arch/x86/configs/nano_generic_pc_atom_n28xx_defconfig +++ b/arch/x86/configs/nano_generic_pc_atom_n28xx_defconfig @@ -57,7 +57,6 @@ CONFIG_PRINTK=y # Bootloader Options # # CONFIG_BOOTLOADER_KEXEC is not set -# CONFIG_BOOTLOADER_GRUB is not set CONFIG_BOOTLOADER_UNKNOWN=y # diff --git a/arch/x86/configs/nano_generic_pc_minuteia_defconfig b/arch/x86/configs/nano_generic_pc_minuteia_defconfig index 3fe8df000b9..9b1eb15d6f9 100644 --- a/arch/x86/configs/nano_generic_pc_minuteia_defconfig +++ b/arch/x86/configs/nano_generic_pc_minuteia_defconfig @@ -57,7 +57,6 @@ CONFIG_PRINTK=y # Bootloader Options # # CONFIG_BOOTLOADER_KEXEC is not set -# CONFIG_BOOTLOADER_GRUB is not set CONFIG_BOOTLOADER_UNKNOWN=y # diff --git a/arch/x86/configs/nano_quark_defconfig b/arch/x86/configs/nano_quark_defconfig index 62d89a89145..32c12deb5a3 100644 --- a/arch/x86/configs/nano_quark_defconfig +++ b/arch/x86/configs/nano_quark_defconfig @@ -57,7 +57,6 @@ CONFIG_PRINTK=y # Bootloader Options # # CONFIG_BOOTLOADER_KEXEC is not set -CONFIG_BOOTLOADER_GRUB=y CONFIG_BOOTLOADER_UNKNOWN=y # diff --git a/arch/x86/defconfig b/arch/x86/defconfig index 954b364c15a..40e34b703dc 100644 --- a/arch/x86/defconfig +++ b/arch/x86/defconfig @@ -78,7 +78,6 @@ CONFIG_PRINTK=y # Bootloader Options # # CONFIG_BOOTLOADER_KEXEC is not set -CONFIG_BOOTLOADER_GRUB=y CONFIG_BOOTLOADER_UNKNOWN=y # diff --git a/misc/Kconfig b/misc/Kconfig index a686bffe107..5104aa3e299 100644 --- a/misc/Kconfig +++ b/misc/Kconfig @@ -149,15 +149,6 @@ config BOOTLOADER_KEXEC This option signifies that Linux boots the kernel using kexec system call and utility. This method is used to boot the kernel over the network. -config BOOTLOADER_GRUB - bool - prompt "Boot using GRUB 2.0" - default n - depends on !BOOTLOADER_KEXEC && X86_32 - help - 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