aboutsummaryrefslogtreecommitdiff
path: root/board/qemu/x86
diff options
context:
space:
mode:
Diffstat (limited to 'board/qemu/x86')
-rw-r--r--board/qemu/x86/linux-3.13.config (renamed from board/qemu/x86/linux-3.12.config)7
-rw-r--r--board/qemu/x86/readme.txt2
2 files changed, 1 insertions, 8 deletions
diff --git a/board/qemu/x86/linux-3.12.config b/board/qemu/x86/linux-3.13.config
index 5bf6944e3d..ad9517c19b 100644
--- a/board/qemu/x86/linux-3.12.config
+++ b/board/qemu/x86/linux-3.13.config
@@ -1,4 +1,3 @@
-CONFIG_EXPERIMENTAL=y
# CONFIG_LOCALVERSION_AUTO is not set
# CONFIG_SWAP is not set
# CONFIG_COMPAT_BRK is not set
@@ -29,12 +28,8 @@ CONFIG_BLK_DEV_SD=y
CONFIG_ATA=y
CONFIG_ATA_PIIX=y
CONFIG_NETDEVICES=y
-CONFIG_NET_ETHERNET=y
-CONFIG_NET_PCI=y
CONFIG_NE2K_PCI=y
CONFIG_8139CP=y
-# CONFIG_NETDEV_1000 is not set
-# CONFIG_NETDEV_10000 is not set
# CONFIG_WLAN is not set
# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
# CONFIG_INPUT_MOUSE is not set
@@ -45,11 +40,9 @@ CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
# CONFIG_HW_RANDOM is not set
# CONFIG_HWMON is not set
-# CONFIG_MFD_SUPPORT is not set
CONFIG_SOUND=y
CONFIG_SND=y
CONFIG_SND_HDA_INTEL=y
-# CONFIG_HID_SUPPORT is not set
# CONFIG_USB_SUPPORT is not set
# CONFIG_X86_PLATFORM_DEVICES is not set
# CONFIG_DMIID is not set
diff --git a/board/qemu/x86/readme.txt b/board/qemu/x86/readme.txt
index c07000c039..c821255a22 100644
--- a/board/qemu/x86/readme.txt
+++ b/board/qemu/x86/readme.txt
@@ -4,4 +4,4 @@ Run the emulation with:
The login prompt will appear in the graphical window.
-Tested with QEMU 1.6.1
+Tested with QEMU 1.7.0