X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/85af4b9c191550aca178298e71af8f698fd0f1e5..c6f1eddcdf4596e94ebf9e2d01f0a14e5da3cfc4:/target/linux/x86/image/Config.in

diff --git a/target/linux/x86/image/Config.in b/target/linux/x86/image/Config.in
index 6f4e0bdb1..a9412cdd6 100644
--- a/target/linux/x86/image/Config.in
+++ b/target/linux/x86/image/Config.in
@@ -1,63 +1,77 @@
+config X86_ETHERBOOT_IMAGES
+	bool "Build Etherboot image"
+	depends TARGET_x86 && 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 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 && !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 TARGET_x86 && !TARGET_x86_olpc
+	depends TARGET_ROOTFS_EXT4FS || TARGET_ROOTFS_ISO || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS
+	select PACKAGE_grub
+	default y
 
 config X86_GRUB_CONSOLE
-    bool
-    depends X86_GRUB_IMAGES
-    prompt "Use Console Terminal (in addition to Serial)"
-    default n if TARGET_x86_generic_Soekris48xx || TARGET_x86_generic_Soekris45xx || TARGET_x86_net5501
-    default y if ! (TARGET_x86_generic_Soekris48xx || TARGET_x86_generic_Soekris45xx || TARGET_x86_net5501)
+	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
-    prompt "Serial port device"
-    depends X86_GRUB_IMAGES
-    default "hvc0" if TARGET_x86_xen_domu
-    default "ttyS0" if ! TARGET_x86_xen_domu
+	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 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)
+	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 if TARGET_x86_alix2
+	default 115200 if TARGET_x86_geos
+	default 38400
 
 config X86_GRUB_BOOTOPTS
-    string
-    prompt "Extra kernel boot options" if X86_GRUB_IMAGES
-    default "xencons=hvc" if TARGET_x86_xen_domu
-    default "" if ! TARGET_x86_xen_domu
-    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_generic
-    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
+	depends 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 X86_GRUB_IMAGES
+	depends TARGET_x86
+	depends 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
+	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
+	default y
 
 config TARGET_KERNEL_PARTSIZE
 	int "Kernel partition size (in MB)"
@@ -67,8 +81,9 @@ config TARGET_KERNEL_PARTSIZE
 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"
+	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).