[brcm63xx] fix bcm6358 spi base register address (#7234)

[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 4a36f63..7eb0c8a 100644 (file)
--- a/target/linux/x86/image/Config.in
+++ b/target/linux/x86/image/Config.in
@@ -1,17 +1,33 @@
 config X86_GRUB_IMAGES
     bool "Build GRUB images (Linux x86 or x86_64 host only)"
-    depends TARGET_x86
+    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_IMAGES_PAD
-       bool "Pad GRUB images to filesystem size (for JFFS2)"
-       depends X86_GRUB_IMAGES
+    bool "Pad GRUB images to filesystem size (for JFFS2)"
+    depends X86_GRUB_IMAGES
+
+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 38400
+    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_KERNELPART
     int "Kernel partition size (in MB)"
@@ -21,14 +37,55 @@ config X86_GRUB_KERNELPART
 config X86_GRUB_ROOTPART
     string
     prompt "Root partition on target device" if X86_GRUB_IMAGES
-    default "/dev/hda2"
+    default "/dev/xvda2" if TARGET_x86_xen_domu
+    default "/dev/sda2" if ! TARGET_x86_xen_domu
     help
         The root partition on the final device.  If you don't know,
-        you probably want the default (/dev/hda2).
+        you probably want the default (/dev/sda2).
 
 config X86_GRUB_BOOTOPTS
     string
     prompt "Extra kernel boot options" if X86_GRUB_IMAGES
-    default ""
+    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_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 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).
+