diff options
| author | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-05-05 02:07:38 +0000 |
|---|---|---|
| committer | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-05-05 02:07:38 +0000 |
| commit | 85af4b9c191550aca178298e71af8f698fd0f1e5 (patch) | |
| tree | 34c1ebc7eb70cef7c71801471ce8c8a32dfa562c /target/linux/x86/image/Config.in | |
| parent | c835235d87d5d6b44dc9e10c117e0313b0e3e709 (diff) | |
target/x86: use common config items for options shared between generic and olpc targets
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21364 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/x86/image/Config.in')
| -rw-r--r-- | target/linux/x86/image/Config.in | 47 |
1 files changed, 15 insertions, 32 deletions
diff --git a/target/linux/x86/image/Config.in b/target/linux/x86/image/Config.in index 7eb0c8a1f..6f4e0bdb1 100644 --- a/target/linux/x86/image/Config.in +++ b/target/linux/x86/image/Config.in @@ -5,10 +5,6 @@ config X86_GRUB_IMAGES select PACKAGE_grub default y -config X86_GRUB_IMAGES_PAD - bool "Pad GRUB images to filesystem size (for JFFS2)" - depends X86_GRUB_IMAGES - config X86_GRUB_CONSOLE bool depends X86_GRUB_IMAGES @@ -29,20 +25,6 @@ config X86_GRUB_BAUDRATE default 19200 if TARGET_x86_generic_Soekris48xx || TARGET_x86_generic_Soekris45xx || TARGET_x86_net5501 default 38400 if ! (TARGET_x86_generic_Soekris48xx || TARGET_x86_generic_Soekris45xx || TARGET_x86_net5501) -config X86_GRUB_KERNELPART - int "Kernel partition size (in MB)" - depends X86_GRUB_IMAGES - default 4 - -config X86_GRUB_ROOTPART - string - prompt "Root partition on target device" if X86_GRUB_IMAGES - default "/dev/xvda2" if TARGET_x86_xen_domu - default "/dev/sda2" if ! TARGET_x86_xen_domu - help - The root partition on the final device. If you don't know, - you probably want the default (/dev/sda2). - config X86_GRUB_BOOTOPTS string prompt "Extra kernel boot options" if X86_GRUB_IMAGES @@ -72,20 +54,21 @@ config OLPC_BOOTSCRIPT_IMAGES depends TARGET_ROOTFS_EXT2FS || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS || TARGET_ROOTFS_ISO default y -config OLPC_BOOTSCRIPT_IMAGES_PAD - bool "Pad bootscript images to filesystem size (for JFFS2)" - depends OLPC_BOOTSCRIPT_IMAGES -config OLPC_BOOTSCRIPT_KERNELPART - int "Kernel partition size (in MB)" - depends OLPC_BOOTSCRIPT_IMAGES - default 4 +config TARGET_IMAGES_PAD + bool "Pad images to filesystem size (for JFFS2)" + depends OLPC_BOOTSCRIPT_IMAGES || X86_GRUB_IMAGES -config OLPC_BOOTSCRIPT_ROOTPART - string - prompt "Root partition on target device" if OLPC_BOOTSCRIPT_IMAGES - default "/dev/sda2" - help - The root partition on the final device. If you don't know, - you probably want the default (/dev/sda2). +config TARGET_KERNEL_PARTSIZE + int "Kernel partition size (in MB)" + depends OLPC_BOOTSCRIPT_IMAGES || X86_GRUB_IMAGES + default 4 +config TARGET_ROOTFS_PARTNAME + string "Root partition on target device" + depends OLPC_BOOTSCRIPT_IMAGES || X86_GRUB_IMAGES + default "/dev/xvda2" if TARGET_x86_xen_domu + default "/dev/sda2" + help + The root partition on the final device. If you don't know, + you probably want the default (/dev/sda2). |