From 7accc51ebf44ed1f3c0d2c3afcafc1a0641dcca7 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 31 Jul 2012 18:13:12 -0300 Subject: [PATCH] qemu/mips-malta: update to use kernel 3.4.7 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- .../mips-malta/{linux-3.3.config => linux-3.4.config} | 0 board/qemu/mips-malta/readme.txt | 2 ++ configs/qemu_mips_malta_defconfig | 8 ++++---- 3 files changed, 6 insertions(+), 4 deletions(-) rename board/qemu/mips-malta/{linux-3.3.config => linux-3.4.config} (100%) diff --git a/board/qemu/mips-malta/linux-3.3.config b/board/qemu/mips-malta/linux-3.4.config similarity index 100% rename from board/qemu/mips-malta/linux-3.3.config rename to board/qemu/mips-malta/linux-3.4.config diff --git a/board/qemu/mips-malta/readme.txt b/board/qemu/mips-malta/readme.txt index 0e21a3c9b8..0288df5086 100644 --- a/board/qemu/mips-malta/readme.txt +++ b/board/qemu/mips-malta/readme.txt @@ -5,3 +5,5 @@ Run the emulation with: The login prompt will appear in the terminal that started Qemu. The graphical window is the framebuffer. No keyboard support has been enabled. + +Tested with QEMU 1.1.1 diff --git a/configs/qemu_mips_malta_defconfig b/configs/qemu_mips_malta_defconfig index 57f3ae141a..f9ec326fb8 100644 --- a/configs/qemu_mips_malta_defconfig +++ b/configs/qemu_mips_malta_defconfig @@ -6,15 +6,15 @@ BR2_mips_32r2=y 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/mips-malta/linux-3.3.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips-malta/linux-3.4.config" BR2_LINUX_KERNEL_VMLINUX=y # Serial port config -- 2.30.2