diff options
| author | Gustavo Zacarias <gustavo@zacarias.com.ar> | 2012-03-20 23:45:13 -0300 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2012-03-21 23:05:59 +0100 |
| commit | 1775ca03a09c96613c7740c9954d33c420231031 (patch) | |
| tree | 0fe01a8d2db4791419f5ed3574e3c87af67c69fe | |
| parent | 7815993d8a9745695d638e34509c97a708a84d5d (diff) | |
qemu/x86: update to use kernel 3.3
Also switch documentation to use qemu-system-i386
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.3.config (renamed from board/qemu/x86/linux-3.2.config) | 0 | ||||
| -rw-r--r-- | board/qemu/x86/readme.txt | 2 | ||||
| -rw-r--r-- | configs/qemu_x86_defconfig | 4 |
3 files changed, 3 insertions, 3 deletions
diff --git a/board/qemu/x86/linux-3.2.config b/board/qemu/x86/linux-3.3.config index 5bf6944e3..5bf6944e3 100644 --- a/board/qemu/x86/linux-3.2.config +++ b/board/qemu/x86/linux-3.3.config diff --git a/board/qemu/x86/readme.txt b/board/qemu/x86/readme.txt index c06d24faa..4ba6607f3 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 d20850a7f..5d0e23b99 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" |