Configure linux within target/linux/Config.in instead of within target/device/Config.in

2 files changed, 1 insertions, 41 deletions

diff --git a/target/Config.in b/target/Config.in
index 5913ffc6d..665922d61 100644
--- a/target/Config.in
+++ b/target/Config.in
@@ -21,4 +21,5 @@ source "target/powerpc/yaboot/Config.in"
 
 endmenu
 
+source "target/linux/Config.in"
 source "target/device/Config.in"
diff --git a/target/device/Config.in b/target/device/Config.in
index cbad6fd6b..c2c300e73 100644
--- a/target/device/Config.in
+++ b/target/device/Config.in
@@ -1,46 +1,5 @@
 menu "Board Support Options"
 
-config BR2_PACKAGE_LINUX
-	bool "linux kernel"
-	default n
-	help
-	  The Linux kernel.
-	  http://www.kernel.org/
-
-	  Note: Requires kernel-headers >= 2.6.19 since the other
-	        kernel headers are just that (headers) and not full
-		kernels. This is a feature.
-
-config BR2_PACKAGE_LINUX_KCONFIG
-	string ".config file"
-	depends on BR2_PACKAGE_LINUX
-	default ""
-	help
-	  kernel's .config to use to build a kernel for the target.
-
-	  If the above setting is empty, you can change the default
-	  board-imposed value by passing LINUX26_KCONFIG=<path> to
-	  make.
-
-config BR2_PACKAGE_LINUX_FORMAT
-	string "kernel binary format"
-	depends on BR2_PACKAGE_LINUX
-	default ""
-	help
-	  kernel binary format.
-	  Popular values include:
-	  - bzImage
-	  - zImage
-	  and other, architecture dependant formats.
-
-	  Note that the default format is supposed to be set by your
-	  board-description, if any.
-	  i386 and compatible default to bzImage if nothing was given
-	  above.
-	  If the above setting is empty, you can change the default
-	  board-imposed value by passing LINUX26_FORMAT=<string> to
-	  make.
-
 source "target/device/AMD/Config.in"
 source "target/device/Arm/Config.in"
 source "target/device/Atmel/Config.in"