X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/818a5943dcc3648dc438194a3e16efddee9d4827..164cf26c5bd5950fa5f903862eaeca8be8db3d9c:/target/linux/x86/image/Config.in

diff --git a/target/linux/x86/image/Config.in b/target/linux/x86/image/Config.in
index ef7d0cd85..3557e63c2 100644
--- a/target/linux/x86/image/Config.in
+++ b/target/linux/x86/image/Config.in
@@ -1,50 +1,72 @@
 config X86_GRUB_IMAGES
-    bool "Build GRUB images (Linux x86 or x86_64 host only)"
-    depends TARGET_x86
-    depends TARGET_ROOTFS_EXT2FS || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS || TARGET_ROOTFS_ISO
+	bool "Build GRUB images (Linux x86 or x86_64 host only)"
+	depends TARGET_x86 && !TARGET_x86_olpc
+	depends TARGET_ROOTFS_EXT4FS || TARGET_ROOTFS_ISO || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS
 	select PACKAGE_grub
-    default y
+	default y
 
-config X86_GRUB_IMAGES_PAD
-	bool "Pad GRUB images to filesystem size (for JFFS2)"
+config X86_GRUB_CONSOLE
+	bool "Use Console Terminal (in addition to Serial)"
 	depends X86_GRUB_IMAGES
+	default n if (TARGET_x86_generic_Soekris45xx || TARGET_x86_generic_Soekris48xx || TARGET_x86_net5501 || TARGET_x86_geos)
+	default y
+
+config X86_GRUB_SERIAL
+	string "Serial port device"
+	depends X86_GRUB_IMAGES
+	default "hvc0" if (TARGET_x86_kvm_guest || TARGET_x86_xen_domu)
+	default "ttyS0" if ! (TARGET_x86_kvm_guest || TARGET_x86_xen_domu)
 
 config X86_GRUB_BAUDRATE
-    int "Serial port baud rate"
-    depends X86_GRUB_IMAGES
-    default 38400
-
-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/hda2"
-    help
-        The root partition on the final device.  If you don't know,
-        you probably want the default (/dev/hda2).
+	int "Serial port baud rate"
+	depends X86_GRUB_IMAGES
+	default 19200 if TARGET_x86_generic_Soekris45xx || TARGET_x86_generic_Soekris48xx || TARGET_x86_net5501
+	default 38400
+	default 115200 if TARGET_x86_geos
 
 config X86_GRUB_BOOTOPTS
-    string
-    prompt "Extra kernel boot options" if X86_GRUB_IMAGES
-    default ""
-    help
-        If you don't know, just leave it blank.
-
+	string "Extra kernel boot options"
+	depends X86_GRUB_IMAGES
+	default "xencons=hvc" if TARGET_x86_xen_domu
+	help
+	  If you don't know, just leave it blank.
 
 config X86_VDI_IMAGES
-    bool "Build VirtualBox image files (VDI). Requires VBoxManage"
-    depends TARGET_x86
-    depends TARGET_ROOTFS_EXT2FS
-    depends X86_GRUB_IMAGES
-    select PACKAGE_kmod-pcnet32
+	bool "Build VirtualBox image files (VDI)"
+	depends X86_GRUB_IMAGES
+	depends TARGET_x86_generic
+	depends TARGET_ROOTFS_EXT4FS
+	select PACKAGE_kmod-pcnet32
 
 config X86_VMDK_IMAGES
-    bool "Build VMware image files (VMDK). Requires qemu-img"
-    depends TARGET_x86
-    depends TARGET_ROOTFS_EXT2FS
-    depends X86_GRUB_IMAGES
-    select PACKAGE_kmod-e1000
+	bool "Build VMware image files (VMDK)"
+	depends X86_GRUB_IMAGES
+	depends TARGET_x86_generic
+	depends TARGET_ROOTFS_EXT4FS
+	select PACKAGE_kmod-e1000
+
+
+config OLPC_BOOTSCRIPT_IMAGES
+	bool "Build images with bootscript"
+	depends TARGET_x86_olpc
+	depends TARGET_ROOTFS_EXT4FS || TARGET_ROOTFS_ISO || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS
+
+
+config TARGET_IMAGES_PAD
+	bool "Pad images to filesystem size (for JFFS2)"
+	depends OLPC_BOOTSCRIPT_IMAGES || X86_GRUB_IMAGES
+
+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/vda2" if TARGET_x86_kvm_guest
+	default "/dev/xvda2" if TARGET_x86_xen_domu
+	default "/dev/sda2" if ! (TARGET_x86_kvm_guest || TARGET_x86_xen_domu)
+	help
+	  The root partition on the final device.  If you don't know,
+	  you probably want the default (/dev/sda2).