kconfig: move initramfs options to General Setup

Move initramfs options from Device Drivers | Block Drivers to General Setup This is a more natural place for this option. Furthermore separate out intramfs options to usr/Kconfig Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

kconfig: move initramfs options to General Setup
Move initramfs options from Device Drivers | Block Drivers to General Setup This is a more natural place for this option. Furthermore separate out intramfs options to usr/Kconfig Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Sam Ravnborg
1 parent fb7f6ff614
Showing 3 changed files with 48 additions and 42 deletions Side-by-side Diff
drivers/block/Kconfig
init/Kconfig
usr/Kconfig
@@ -408,48 +408,6 @@
 	  "real" root file system, etc. See <file:Documentation/initrd.txt>
 	  for details.
  
-config INITRAMFS_SOURCE
-	string "Initramfs source file(s)"
-	default ""
-	help
-	  This can be either a single cpio archive with a .cpio suffix or a
-	  space-separated list of directories and files for building the
-	  initramfs image.  A cpio archive should contain a filesystem archive
-	  to be used as an initramfs image.  Directories should contain a
-	  filesystem layout to be included in the initramfs image.  Files
-	  should contain entries according to the format described by the
-	  "usr/gen_init_cpio" program in the kernel tree.
-
-	  When multiple directories and files are specified then the
-	  initramfs image will be the aggregate of all of them.
-
-	  See <file:Documentation/early-userspace/README for more details.
-
-	  If you are not sure, leave it blank.
-
-config INITRAMFS_ROOT_UID
-	int "User ID to map to 0 (user root)"
-	depends on INITRAMFS_SOURCE!=""
-	default "0"
-	help
-	  This setting is only meaningful if the INITRAMFS_SOURCE is
-	  contains a directory.  Setting this user ID (UID) to something
-	  other than "0" will cause all files owned by that UID to be
-	  owned by user root in the initial ramdisk image.
-
-	  If you are not sure, leave it set to "0".
-
-config INITRAMFS_ROOT_GID
-	int "Group ID to map to 0 (group root)"
-	depends on INITRAMFS_SOURCE!=""
-	default "0"
-	help
-	  This setting is only meaningful if the INITRAMFS_SOURCE is
-	  contains a directory.  Setting this group ID (GID) to something
-	  other than "0" will cause all files owned by that GID to be
-	  owned by group root in the initial ramdisk image.
-
-	  If you are not sure, leave it set to "0".
  
 #XXX - it makes sense to enable this only for 32-bit subarch's, not for x86_64
 #for instance.
@@ -238,6 +238,8 @@
  
 	  Say N if unsure.
  
+source "usr/Kconfig"
+
 menuconfig EMBEDDED
 	bool "Configure standard kernel features (for small systems)"
 	help
+#
+# Configuration for initramfs
+#
+
+config INITRAMFS_SOURCE
+	string "Initramfs source file(s)"
+	default ""
+	help
+	  This can be either a single cpio archive with a .cpio suffix or a
+	  space-separated list of directories and files for building the
+	  initramfs image.  A cpio archive should contain a filesystem archive
+	  to be used as an initramfs image.  Directories should contain a
+	  filesystem layout to be included in the initramfs image.  Files
+	  should contain entries according to the format described by the
+	  "usr/gen_init_cpio" program in the kernel tree.
+
+	  When multiple directories and files are specified then the
+	  initramfs image will be the aggregate of all of them.
+
+	  See <file:Documentation/early-userspace/README for more details.
+
+	  If you are not sure, leave it blank.
+
+config INITRAMFS_ROOT_UID
+	int "User ID to map to 0 (user root)"
+	depends on INITRAMFS_SOURCE!=""
+	default "0"
+	help
+	  This setting is only meaningful if the INITRAMFS_SOURCE is
+	  contains a directory.  Setting this user ID (UID) to something
+	  other than "0" will cause all files owned by that UID to be
+	  owned by user root in the initial ramdisk image.
+
+	  If you are not sure, leave it set to "0".
+
+config INITRAMFS_ROOT_GID
+	int "Group ID to map to 0 (group root)"
+	depends on INITRAMFS_SOURCE!=""
+	default "0"
+	help
+	  This setting is only meaningful if the INITRAMFS_SOURCE is
+	  contains a directory.  Setting this group ID (GID) to something
+	  other than "0" will cause all files owned by that GID to be
+	  owned by group root in the initial ramdisk image.
+
+	  If you are not sure, leave it set to "0".
...	...	@@ -408,48 +408,6 @@
408	408	"real" root file system, etc. See <file:Documentation/initrd.txt>
409	409	for details.
410	410
411		-config INITRAMFS_SOURCE
412		- string "Initramfs source file(s)"
413		- default ""
414		- help
415		- This can be either a single cpio archive with a .cpio suffix or a
416		- space-separated list of directories and files for building the
417		- initramfs image. A cpio archive should contain a filesystem archive
418		- to be used as an initramfs image. Directories should contain a
419		- filesystem layout to be included in the initramfs image. Files
420		- should contain entries according to the format described by the
421		- "usr/gen_init_cpio" program in the kernel tree.
422		-
423		- When multiple directories and files are specified then the
424		- initramfs image will be the aggregate of all of them.
425		-
426		- See <file:Documentation/early-userspace/README for more details.
427		-
428		- If you are not sure, leave it blank.
429		-
430		-config INITRAMFS_ROOT_UID
431		- int "User ID to map to 0 (user root)"
432		- depends on INITRAMFS_SOURCE!=""
433		- default "0"
434		- help
435		- This setting is only meaningful if the INITRAMFS_SOURCE is
436		- contains a directory. Setting this user ID (UID) to something
437		- other than "0" will cause all files owned by that UID to be
438		- owned by user root in the initial ramdisk image.
439		-
440		- If you are not sure, leave it set to "0".
441		-
442		-config INITRAMFS_ROOT_GID
443		- int "Group ID to map to 0 (group root)"
444		- depends on INITRAMFS_SOURCE!=""
445		- default "0"
446		- help
447		- This setting is only meaningful if the INITRAMFS_SOURCE is
448		- contains a directory. Setting this group ID (GID) to something
449		- other than "0" will cause all files owned by that GID to be
450		- owned by group root in the initial ramdisk image.
451		-
452		- If you are not sure, leave it set to "0".
453	411
454	412	#XXX - it makes sense to enable this only for 32-bit subarch's, not for x86_64
455	413	#for instance.
...	...	@@ -238,6 +238,8 @@
238	238
239	239	Say N if unsure.
240	240
	241	+source "usr/Kconfig"
	242	+
241	243	menuconfig EMBEDDED
242	244	bool "Configure standard kernel features (for small systems)"
243	245	help
	1	+#
	2	+# Configuration for initramfs
	3	+#
	4	+
	5	+config INITRAMFS_SOURCE
	6	+ string "Initramfs source file(s)"
	7	+ default ""
	8	+ help
	9	+ This can be either a single cpio archive with a .cpio suffix or a
	10	+ space-separated list of directories and files for building the
	11	+ initramfs image. A cpio archive should contain a filesystem archive
	12	+ to be used as an initramfs image. Directories should contain a
	13	+ filesystem layout to be included in the initramfs image. Files
	14	+ should contain entries according to the format described by the
	15	+ "usr/gen_init_cpio" program in the kernel tree.
	16	+
	17	+ When multiple directories and files are specified then the
	18	+ initramfs image will be the aggregate of all of them.
	19	+
	20	+ See <file:Documentation/early-userspace/README for more details.
	21	+
	22	+ If you are not sure, leave it blank.
	23	+
	24	+config INITRAMFS_ROOT_UID
	25	+ int "User ID to map to 0 (user root)"
	26	+ depends on INITRAMFS_SOURCE!=""
	27	+ default "0"
	28	+ help
	29	+ This setting is only meaningful if the INITRAMFS_SOURCE is
	30	+ contains a directory. Setting this user ID (UID) to something
	31	+ other than "0" will cause all files owned by that UID to be
	32	+ owned by user root in the initial ramdisk image.
	33	+
	34	+ If you are not sure, leave it set to "0".
	35	+
	36	+config INITRAMFS_ROOT_GID
	37	+ int "Group ID to map to 0 (group root)"
	38	+ depends on INITRAMFS_SOURCE!=""
	39	+ default "0"
	40	+ help
	41	+ This setting is only meaningful if the INITRAMFS_SOURCE is
	42	+ contains a directory. Setting this group ID (GID) to something
	43	+ other than "0" will cause all files owned by that GID to be
	44	+ owned by group root in the initial ramdisk image.
	45	+
	46	+ If you are not sure, leave it set to "0".