move most of the x86 image generation options to the main file

[openwrt/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 6f4e0bdb143aea4f27c3e1c3b741662c693aaf7c..d2ef9fb7faf42f92e7c7c53d0af04ff6d22e6c3a 100644 (file)
--- a/target/linux/x86/image/Config.in
+++ b/target/linux/x86/image/Config.in
@@ -1,74 +1,20 @@
-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
-
-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)
-
-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
-
-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)
-
-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.
-
-
-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
+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_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
+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 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 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/xvda2" if TARGET_x86_xen_domu
-       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