From 1775ca03a09c96613c7740c9954d33c420231031 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 20 Mar 2012 23:45:13 -0300 Subject: [PATCH] qemu/x86: update to use kernel 3.3 Also switch documentation to use qemu-system-i386 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- board/qemu/x86/{linux-3.2.config => linux-3.3.config} | 0 board/qemu/x86/readme.txt | 2 +- configs/qemu_x86_defconfig | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) rename board/qemu/x86/{linux-3.2.config => linux-3.3.config} (100%) diff --git a/board/qemu/x86/linux-3.2.config b/board/qemu/x86/linux-3.3.config similarity index 100% rename from board/qemu/x86/linux-3.2.config rename to board/qemu/x86/linux-3.3.config diff --git a/board/qemu/x86/readme.txt b/board/qemu/x86/readme.txt index c06d24faae..4ba6607f31 100644 --- a/board/qemu/x86/readme.txt +++ b/board/qemu/x86/readme.txt @@ -1,5 +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 + qemu-system-i386 -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 d20850a7f3..5d0e23b996 100644 --- a/configs/qemu_x86_defconfig +++ b/configs/qemu_x86_defconfig @@ -13,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.2.6" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.2.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.3.config"