From def4fc89c1a98df59ba16db391451a5ff9819392 Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Sat, 20 Jun 2015 10:50:49 -0400 Subject: [PATCH] kconfig: move bootloader options to misc/ Repeating options per BSP should all be maintained in one single place. Change-Id: I45394a5230978effa8fff93ecef736ba44e382d2 Signed-off-by: Anas Nashif --- arch/x86/quark/Kconfig | 18 ------------------ misc/Kconfig | 22 ++++++++++++++++++++++ 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/arch/x86/quark/Kconfig b/arch/x86/quark/Kconfig index c03eb6612f8..a5c4d854c5a 100644 --- a/arch/x86/quark/Kconfig +++ b/arch/x86/quark/Kconfig @@ -39,24 +39,6 @@ config BSP_DIR the location of the config1p.mdef file and is used by the build system to locate the correct linker file. - -config BOOTLOADER_KEXEC - bool - prompt "Boot using Linux kexec() system call" - default n - help - 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 y - depends on !BOOTLOADER_KEXEC - 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 PHYS_LOAD_ADDR default 0x00100000 diff --git a/misc/Kconfig b/misc/Kconfig index e73225a3b54..862ffc78f0a 100644 --- a/misc/Kconfig +++ b/misc/Kconfig @@ -131,6 +131,28 @@ config ASSERT_LEVEL endmenu + +menu "Bootloader Options" + +config BOOTLOADER_KEXEC + bool + prompt "Boot using Linux kexec() system call" + default n + help + 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. + +endmenu + menu "System Monitoring Options" depends on EXPERIMENTAL