aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/x86/image/Config.in
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2010-05-05 02:07:38 +0000
committerNicolas Thill <nico@openwrt.org>2010-05-05 02:07:38 +0000
commit482ee200cb3fc08aeb41e191fd4259f183bc4610 (patch)
treebcbb68d64e5880418ee254b5b6def7bd967be004 /target/linux/x86/image/Config.in
parent898a6bc93dca0dccf22e896ff05ccf961bb560ab (diff)
downloadupstream-482ee200cb3fc08aeb41e191fd4259f183bc4610.tar.gz
upstream-482ee200cb3fc08aeb41e191fd4259f183bc4610.tar.bz2
upstream-482ee200cb3fc08aeb41e191fd4259f183bc4610.zip
target/x86: use common config items for options shared between generic and olpc targets
SVN-Revision: 21364
Diffstat (limited to 'target/linux/x86/image/Config.in')
-rw-r--r--target/linux/x86/image/Config.in47
1 files changed, 15 insertions, 32 deletions
diff --git a/target/linux/x86/image/Config.in b/target/linux/x86/image/Config.in
index 7eb0c8a1f2..6f4e0bdb14 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).