From 53a4941b2ae41fff0c3c2503756baedf6dd892d3 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 15 Nov 2012 10:25:43 +0000 Subject: [PATCH] qemu/mips{el}-malta: update to use kernel 3.6.6 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- .../mips-malta/{linux-3.5.config => linux-3.6.config} | 0 board/qemu/mips-malta/readme.txt | 2 +- .../mipsel-malta/{linux-3.5.config => linux-3.6.config} | 0 board/qemu/mipsel-malta/readme.txt | 2 +- configs/qemu_mips_malta_defconfig | 8 ++++---- configs/qemu_mipsel_malta_defconfig | 8 ++++---- 6 files changed, 10 insertions(+), 10 deletions(-) rename board/qemu/mips-malta/{linux-3.5.config => linux-3.6.config} (100%) rename board/qemu/mipsel-malta/{linux-3.5.config => linux-3.6.config} (100%) diff --git a/board/qemu/mips-malta/linux-3.5.config b/board/qemu/mips-malta/linux-3.6.config similarity index 100% rename from board/qemu/mips-malta/linux-3.5.config rename to board/qemu/mips-malta/linux-3.6.config diff --git a/board/qemu/mips-malta/readme.txt b/board/qemu/mips-malta/readme.txt index 0288df508..104c42782 100644 --- a/board/qemu/mips-malta/readme.txt +++ b/board/qemu/mips-malta/readme.txt @@ -6,4 +6,4 @@ 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 +Tested with QEMU 1.2.0 diff --git a/board/qemu/mipsel-malta/linux-3.5.config b/board/qemu/mipsel-malta/linux-3.6.config similarity index 100% rename from board/qemu/mipsel-malta/linux-3.5.config rename to board/qemu/mipsel-malta/linux-3.6.config diff --git a/board/qemu/mipsel-malta/readme.txt b/board/qemu/mipsel-malta/readme.txt index 09ad500e6..d8a584774 100644 --- a/board/qemu/mipsel-malta/readme.txt +++ b/board/qemu/mipsel-malta/readme.txt @@ -6,4 +6,4 @@ 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 +Tested with QEMU 1.2.0 diff --git a/configs/qemu_mips_malta_defconfig b/configs/qemu_mips_malta_defconfig index 3bb2a72b4..435b02d90 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.5 headers to avoid breaking with newer kernels -BR2_KERNEL_HEADERS_3_5=y +# Lock to 3.6 headers to avoid breaking with newer kernels +BR2_KERNEL_HEADERS_3_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.5.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.6.6" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips-malta/linux-3.5.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips-malta/linux-3.6.config" BR2_LINUX_KERNEL_VMLINUX=y # Serial port config diff --git a/configs/qemu_mipsel_malta_defconfig b/configs/qemu_mipsel_malta_defconfig index 8208379c7..42992d7e6 100644 --- a/configs/qemu_mipsel_malta_defconfig +++ b/configs/qemu_mipsel_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.5 headers to avoid breaking with newer kernels -BR2_KERNEL_HEADERS_3_5=y +# Lock to 3.6 headers to avoid breaking with newer kernels +BR2_KERNEL_HEADERS_3_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.5.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.6.6" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mipsel-malta/linux-3.5.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mipsel-malta/linux-3.6.config" BR2_LINUX_KERNEL_VMLINUX=y # Serial port config