summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavo@zacarias.com.ar>2012-11-15 10:25:44 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2012-11-15 21:49:45 (GMT)
commit08e182523b1b9a073cda184dd040c1980ac54548 (patch)
tree88a8199c04ed833320e9a7bbd5422f5df37794e5
parent53a4941b2ae41fff0c3c2503756baedf6dd892d3 (diff)
downloadbuildroot-08e182523b1b9a073cda184dd040c1980ac54548.tar.gz
buildroot-08e182523b1b9a073cda184dd040c1980ac54548.tar.bz2
qemu/mips64-malta: update to use kernel 3.6.6
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--board/qemu/mips64-malta/linux-3.6.config (renamed from board/qemu/mips64-malta/linux-3.5.config)0
-rw-r--r--board/qemu/mips64-malta/readme.txt4
-rw-r--r--configs/qemu_mips64_malta_defconfig7
3 files changed, 9 insertions, 2 deletions
diff --git a/board/qemu/mips64-malta/linux-3.5.config b/board/qemu/mips64-malta/linux-3.6.config
index 6e7f7ee..6e7f7ee 100644
--- a/board/qemu/mips64-malta/linux-3.5.config
+++ b/board/qemu/mips64-malta/linux-3.6.config
diff --git a/board/qemu/mips64-malta/readme.txt b/board/qemu/mips64-malta/readme.txt
index 5087b01..ad24b6e 100644
--- a/board/qemu/mips64-malta/readme.txt
+++ b/board/qemu/mips64-malta/readme.txt
@@ -5,3 +5,7 @@ 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.
+
+This configuration is known to be flaky.
+
+Tested with QEMU 1.2.0
diff --git a/configs/qemu_mips64_malta_defconfig b/configs/qemu_mips64_malta_defconfig
index c7e977a..2c1192a 100644
--- a/configs/qemu_mips64_malta_defconfig
+++ b/configs/qemu_mips64_malta_defconfig
@@ -10,12 +10,15 @@ BR2_PREFER_STATIC_LIB=y
BR2_TARGET_ROOTFS_EXT2=y
# BR2_TARGET_ROOTFS_TAR is not set
+# 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/mips64-malta/linux-3.5.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux-3.6.config"
BR2_LINUX_KERNEL_VMLINUX=y
# Serial port config