diff options
| -rw-r--r-- | board/qemu/x86/linux-3.4.config (renamed from board/qemu/x86/linux-3.3.config) | 0 | ||||
| -rw-r--r-- | board/qemu/x86/readme.txt | 2 | ||||
| -rw-r--r-- | configs/qemu_x86_defconfig | 8 |
3 files changed, 6 insertions, 4 deletions
diff --git a/board/qemu/x86/linux-3.3.config b/board/qemu/x86/linux-3.4.config index 5bf6944e3..5bf6944e3 100644 --- a/board/qemu/x86/linux-3.3.config +++ b/board/qemu/x86/linux-3.4.config diff --git a/board/qemu/x86/readme.txt b/board/qemu/x86/readme.txt index 4ba6607f3..f6f5437a7 100644 --- a/board/qemu/x86/readme.txt +++ b/board/qemu/x86/readme.txt @@ -3,3 +3,5 @@ Run the emulation with: 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. + +Tested with QEMU 1.1.1 diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig index 118cd7fa7..1851cecdb 100644 --- a/configs/qemu_x86_defconfig +++ b/configs/qemu_x86_defconfig @@ -10,12 +10,12 @@ BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Lock to 3.3 headers to avoid breaking with newer kernels -BR2_KERNEL_HEADERS_3_3=y +# Lock to 3.4 headers to avoid breaking with newer kernels +BR2_KERNEL_HEADERS_3_4=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.4.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.3.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.4.config" |