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

diff --git a/target/Config.in b/target/Config.in
index 665922d616b5bf3da85048abd4e72538ec8aee29..a9d5c3537bc8db60d95fa36e25b9d15937678e0e 100644 (file)
--- 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 (file)
index 0000000..be5675f
--- /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 2b3d58c0084926388e78025453b248080883bc49..13d5b389cf2e9c2a94a41ae2e1e41e2c936dca51 100644 (file)
--- 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