[ep93xx] set the mac address using the chip-unique serial number

[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 308f85c..8467f48 100644 (file)
--- a/target/linux/x86/image/Config.in
+++ b/target/linux/x86/image/Config.in
@@ -8,20 +8,21 @@ config X86_GRUB_IMAGES
 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)
+       default n if (TARGET_x86_generic_Soekris45xx || TARGET_x86_generic_Soekris48xx || TARGET_x86_net5501 || TARGET_x86_geos)
        default y
 
 config X86_GRUB_SERIAL
        string "Serial port device"
        depends X86_GRUB_IMAGES
-       default "hvc0" if TARGET_x86_xen_domu
-       default "ttyS0"
+       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_Soekris45xx || TARGET_x86_generic_Soekris48xx || TARGET_x86_net5501
        default 38400
+       default 115200 if TARGET_x86_geos
 
 config X86_GRUB_BOOTOPTS
        string "Extra kernel boot options"
@@ -63,8 +64,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).