- add a more generic "Kernel" menu instead of "Linux Options"

3 files changed, 41 insertions, 4 deletions

diff --git a/target/Config.in b/target/Config.in
index 665922d61..a9d5c3537 100644
--- a/target/Config.in
+++ b/target/Config.in
@@ -18,8 +18,34 @@ source "target/x86/grub/Config.in"
 #source "target/x86/grub2/Config.in"
 source "target/x86/syslinux/Config.in"
 source "target/powerpc/yaboot/Config.in"
-
 endmenu
 
+menu "Kernel"
+choice
+	prompt "Kernel type"
+	default BR2_KERNEL_LINUX
+
+config BR2_KERNEL_none
+	bool "none"
+	help
+	  Do not build a kernel
+
+config BR2_KERNEL_LINUX
+	bool "linux"
+	help
+	  Linux kernel
+
+config BR2_KERNEL_HURD
+	bool "hurd"
+	help
+	  GNU/Hurd kernel
+endchoice
+if BR2_KERNEL_LINUX
 source "target/linux/Config.in"
+endif
+if BR2_KERNEL_HURD
+source "target/hurd/Config.in"
+endif
+endmenu
+
 source "target/device/Config.in"
diff --git a/target/hurd/Config.in b/target/hurd/Config.in
new file mode 100644
index 000000000..be5675f5b
--- /dev/null
+++ b/target/hurd/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_HURD
+	bool "Hurd kernel"
+	depends on BR2_KERNEL_HURD
+	default y
+	help
+	  The GNU/Hurd kernel.
+	  http://www.gnu.org/software/hurd/
+
+	  FIXME: Currently not implemented.
+
+
diff --git a/target/linux/Config.in b/target/linux/Config.in
index 2b3d58c00..13d5b389c 100644
--- a/target/linux/Config.in
+++ b/target/linux/Config.in
@@ -1,8 +1,9 @@
-menu "Linux Options"
+#comment "Linux kernel options"
 
 config BR2_PACKAGE_LINUX
 	bool "linux kernel"
-	default n
+	depends on BR2_KERNEL_LINUX
+	default y
 	help
 	  The Linux kernel.
 	  http://www.kernel.org/
@@ -387,4 +388,3 @@ config BR2_LINUX_COPYTO
 	  	Copy kernel to secondary location
 
 endif
-endmenu