X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=blobdiff_plain;f=target%2Flinux%2Fx86%2Fimage%2FConfig.in;h=08880e5803351b21e13b59e93a39c325fb0e1489;hp=19f0cb342df8c05c76d3ee8d280b61746fae69a2;hb=e2b0f224fbb795628a78b165103cf575c150fbc4;hpb=a752384ffad9c43da132a79c8c4179d0888606c1

diff --git a/target/linux/x86/image/Config.in b/target/linux/x86/image/Config.in
index 19f0cb342d..08880e5803 100644
--- a/target/linux/x86/image/Config.in
+++ b/target/linux/x86/image/Config.in
@@ -1,27 +1,48 @@
+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_EXT4FS || TARGET_ROOTFS_ISO || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS
-	select PACKAGE_grub
+	select PACKAGE_grub if !X86_USE_GRUB2
 	default y
 
+config X86_USE_GRUB2
+	bool "Use grub2"
+	depends X86_GRUB_IMAGES
+	select PACKAGE_grub2
+
 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 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 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)
+	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 19200 if TARGET_x86_generic_Soekris45xx || TARGET_x86_generic_Soekris48xx || TARGET_x86_net5501
-	default 115200 if TARGET_x86_geos
+	default 38400 if TARGET_x86_alix2
+	default 115200 if TARGET_x86_geos || TARGET_x86_kvm_guest
 	default 38400
 
 config X86_GRUB_BOOTOPTS
@@ -31,17 +52,24 @@ config X86_GRUB_BOOTOPTS
 	help
 	  If you don't know, just leave it blank.
 
+config X86_GRUB_TIMEOUT
+	string "Seconds to wait before booting the default entry"
+	depends 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)"
 	depends X86_GRUB_IMAGES
-	depends TARGET_x86_generic
+	depends TARGET_x86
 	depends TARGET_ROOTFS_EXT4FS
 	select PACKAGE_kmod-pcnet32
 
 config X86_VMDK_IMAGES
 	bool "Build VMware image files (VMDK)"
 	depends X86_GRUB_IMAGES
-	depends TARGET_x86_generic
+	depends TARGET_x86
 	depends TARGET_ROOTFS_EXT4FS
 	select PACKAGE_kmod-e1000
 
@@ -50,11 +78,16 @@ 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
+	default TARGET_x86_olpc
 
 
 config TARGET_IMAGES_PAD
 	bool "Pad images to filesystem size (for JFFS2)"
 	depends OLPC_BOOTSCRIPT_IMAGES || X86_GRUB_IMAGES
+
+config TARGET_IMAGES_GZIP
+	bool "GZip images"
+	depends TARGET_IMAGES_PAD || TARGET_ROOTFS_EXT4FS
 	default y
 
 config TARGET_KERNEL_PARTSIZE