ar71xx: sync kernel configs

[openwrt.git] / target / linux / x86 / image / Config.in

diff --git a/target/linux/x86/image/Config.in b/target/linux/x86/image/Config.in
index af4f9a3..3883f89 100644 (file)
--- a/target/linux/x86/image/Config.in
+++ b/target/linux/x86/image/Config.in
@@ -1,6 +1,6 @@
 config X86_GRUB_IMAGES
     bool "Build GRUB images (Linux x86 or x86_64 host only)"
-    depends TARGET_x86
+    depends TARGET_x86 && !TARGET_x86_olpc
     depends TARGET_ROOTFS_EXT2FS || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS || TARGET_ROOTFS_ISO
        select PACKAGE_grub
     default y
@@ -22,7 +22,8 @@ config X86_GRUB_KERNELPART
 config X86_GRUB_ROOTPART
     string
     prompt "Root partition on target device" if X86_GRUB_IMAGES
-    default "/dev/hda2"
+    default "/dev/hda2" if LINUX_2_6_28
+    default "/dev/sda2"
     help
         The root partition on the final device.  If you don't know,
         you probably want the default (/dev/hda2).
@@ -36,10 +37,39 @@ config X86_GRUB_BOOTOPTS
 
 
 config X86_VDI_IMAGES
-    bool "Build VirtuBox image files (VDI). Requires vditool"
-    depends TARGET_x86
+    bool "Build VirtualBox image files (VDI). Requires VBoxManage"
+    depends TARGET_x86_generic
     depends TARGET_ROOTFS_EXT2FS
     depends X86_GRUB_IMAGES
     select PACKAGE_kmod-pcnet32
 
+config X86_VMDK_IMAGES
+    bool "Build VMware image files (VMDK). Requires qemu-img"
+    depends TARGET_x86_generic
+    depends TARGET_ROOTFS_EXT2FS
+    depends X86_GRUB_IMAGES
+    select PACKAGE_kmod-e1000
+
+config OLPC_BOOTSCRIPT_IMAGES
+    bool "Build images with bootscript"
+    depends TARGET_x86_olpc
+    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 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).