summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavo@zacarias.com.ar>2011-11-11 19:55:11 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2011-11-11 20:35:27 (GMT)
commit309e91930e33ec137be55d6e67241d30b95bd48c (patch)
tree747241d891b0502e4258aeb4ca8b1b0dd2f77598
parent1f52b2ae1d2bbc5784c10dda397493236fb1ed5a (diff)
downloadbuildroot-309e91930e33ec137be55d6e67241d30b95bd48c.tar.gz
buildroot-309e91930e33ec137be55d6e67241d30b95bd48c.tar.bz2
qemu_x86: update to kernel 3.1 and add readme
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--board/qemu/x86/linux-3.1.config (renamed from board/qemu/x86/linux-3.0.config)0
-rw-r--r--board/qemu/x86/readme.txt5
-rw-r--r--configs/qemu_x86_defconfig5
3 files changed, 8 insertions, 2 deletions
diff --git a/board/qemu/x86/linux-3.0.config b/board/qemu/x86/linux-3.1.config
index 5bf6944..5bf6944 100644
--- a/board/qemu/x86/linux-3.0.config
+++ b/board/qemu/x86/linux-3.1.config
diff --git a/board/qemu/x86/readme.txt b/board/qemu/x86/readme.txt
new file mode 100644
index 0000000..c06d24f
--- /dev/null
+++ b/board/qemu/x86/readme.txt
@@ -0,0 +1,5 @@
+Run the emulation with:
+
+ qemu-system-x86_64 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=ide -append root=/dev/sda
+
+The login prompt will appear in the graphical window.
diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig
index d60b38d..8efe9ae 100644
--- a/configs/qemu_x86_defconfig
+++ b/configs/qemu_x86_defconfig
@@ -4,6 +4,7 @@ BR2_x86_pentiumpro=y
# system
BR2_TARGET_GENERIC_GETTY=y
+BR2_TARGET_GENERIC_GETTY_PORT="tty1"
# filesystem
BR2_TARGET_ROOTFS_EXT2=y
@@ -12,6 +13,6 @@ BR2_TARGET_ROOTFS_EXT2=y
# Kernel
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.0.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.1"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.0.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.1.config"