[kernel/2.6.38] refresh patches

[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 df183aa..fba5da7 100644 (file)
--- a/target/linux/x86/image/Config.in
+++ b/target/linux/x86/image/Config.in
@@ -1,7 +1,22 @@
+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_ISO || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS
+       depends TARGET_ROOTFS_EXT4FS || TARGET_ROOTFS_ISO || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS
        select PACKAGE_grub
        default y
 
@@ -20,7 +35,9 @@ config X86_GRUB_SERIAL
 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 || TARGET_x86_geos
+       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
@@ -30,31 +47,43 @@ 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_ROOTFS_EXT2FS
+       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_ROOTFS_EXT2FS
+       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_ISO || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS
+       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_IMAGES_GZIP
+       bool "GZip images"
+       depends TARGET_IMAGES_PAD || TARGET_ROOTFS_EXT4FS
+       default y
+
 config TARGET_KERNEL_PARTSIZE
        int "Kernel partition size (in MB)"
        depends OLPC_BOOTSCRIPT_IMAGES || X86_GRUB_IMAGES