X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;ds=sidebyside;f=target%2Flinux%2Fx86%2Fimage%2FConfig.in;h=869d6a0fa71f6e06b30e7ff2dcb27751bae72e68;hb=e7727229bb8db759a8fc912ace40b75096d98ba5;hp=8768e7cbe6479e7ac29c74b8cd7c740bedb2ebe5;hpb=c8db7ca4fa2b438f2878feef8c98fcfbbce4d45a;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/target/linux/x86/image/Config.in b/target/linux/x86/image/Config.in
index 8768e7cbe6..869d6a0fa7 100644
--- a/target/linux/x86/image/Config.in
+++ b/target/linux/x86/image/Config.in
@@ -1,75 +1,99 @@
+config X86_ETHERBOOT_IMAGES
+	bool "Build Etherboot image"
+	depends on TARGET_x86_thincan_DBE61
+	default y
+	help
+	  Builds network bootable image for ThinCan DBE61 (Etherboot BIOS)
+
+config X86_ETHERBOOT_BOOTOPTS
+	string "Extra kernel boot options"
+	depends on X86_ETHERBOOT_IMAGES
+	default "ip=dhcp nbdport=2000 " if TARGET_ROOTFS_SQUASHFS
+	default "ip=dhcp root=/dev/nfs nfsroot=192.168.0.1:/srv/dbe61"
+	help
+	  Kernel arguments to pass to the kernel eg. NFS root location etc.
+
 config X86_GRUB_IMAGES
-    bool "Build GRUB images (Linux x86 or x86_64 host only)"
-    depends !TARGET_x86_olpc
-    depends TARGET_ROOTFS_EXT2FS || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS || TARGET_ROOTFS_ISO
-	select PACKAGE_grub
-    default y
+	bool "Build GRUB images (Linux x86 or x86_64 host only)"
+	depends on TARGET_x86 && !(TARGET_x86_olpc || TARGET_x86_rdc)
+	depends on TARGET_ROOTFS_EXT4FS || TARGET_ROOTFS_ISO || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS
+	select PACKAGE_grub2
+	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 "Use Console Terminal (in addition to Serial)"
+	depends on X86_GRUB_IMAGES
+	default n if (TARGET_x86_generic_Soekris45xx || TARGET_x86_generic_Soekris48xx || TARGET_x86_net5501 || TARGET_x86_geos || TARGET_x86_alix2)
+	default y
+
+config X86_GRUB_SERIAL
+	string "Serial port device"
+	depends on X86_GRUB_IMAGES
+	default "hvc0" if TARGET_x86_xen_domu
+	default "ttyS0" if ! 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" 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).
+	int "Serial port baud rate"
+	depends on X86_GRUB_IMAGES
+	default 19200 if TARGET_x86_generic_Soekris45xx || TARGET_x86_generic_Soekris48xx || TARGET_x86_net5501
+	default 38400 if TARGET_x86_alix2
+	default 115200 if TARGET_x86_geos || TARGET_x86_kvm_guest
+	default 38400
 
 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 on X86_GRUB_IMAGES
+	default "xencons=hvc" if TARGET_x86_xen_domu
+	help
+	  If you don't know, just leave it blank.
 
+config X86_GRUB_TIMEOUT
+	string "Seconds to wait before booting the default entry"
+	depends on X86_GRUB_IMAGES
+	default "5"
+	help
+	  If you don't know, 5 seconds is a reasonable default.
 
 config X86_VDI_IMAGES
-    bool "Build VirtualBox image files (VDI). Requires VBoxManage"
-    depends TARGET_x86_generic
-    depends TARGET_ROOTFS_EXT2FS
-    depends X86_GRUB_IMAGES
-    select PACKAGE_kmod-pcnet32
+	bool "Build VirtualBox image files (VDI)"
+	depends on X86_GRUB_IMAGES
+	depends on TARGET_ROOTFS_EXT4FS
+	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
+	bool "Build VMware image files (VMDK)"
+	depends on X86_GRUB_IMAGES
+	depends on TARGET_ROOTFS_EXT4FS
+	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).
+	bool "Build images with bootscript"
+	depends on TARGET_x86_olpc
+	depends on TARGET_ROOTFS_EXT4FS || TARGET_ROOTFS_ISO || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS
+	default TARGET_x86_olpc
+
+
+config TARGET_IMAGES_PAD
+	bool "Pad images to filesystem size (for JFFS2)"
+	depends on OLPC_BOOTSCRIPT_IMAGES || X86_GRUB_IMAGES
+
+config TARGET_IMAGES_GZIP
+	bool "GZip images"
+	depends on TARGET_IMAGES_PAD || TARGET_ROOTFS_EXT4FS
+	default y
+
+config TARGET_KERNEL_PARTSIZE
+	int "Kernel partition size (in MB)"
+	depends on OLPC_BOOTSCRIPT_IMAGES || X86_GRUB_IMAGES
+	default 4
 
+config TARGET_ROOTFS_PARTNAME
+	string "Root partition on target device"
+	depends on 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).