diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-07-11 09:40:21 +0200 |
---|---|---|
committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-07-15 23:17:28 +0200 |
commit | 12687de8ad45cb9af2fc58de94ea24c97370fee1 (patch) | |
tree | 62ceff6075d98e58fe91b81f41b33c4c28475446 | |
parent | 9ba15d96244656163198c3a215bd44a68b3cd62f (diff) |
qemu/sh4-r2d: update default configuration to Linux 3.15.x
Result tested with Qemu 2.0.0 without issues.
Old SCI problems are fixed in Qemu.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r-- | board/qemu/sh4-r2d/linux-3.15.config (renamed from board/qemu/sh4-r2d/linux-3.2.config) | 0 | ||||
-rw-r--r-- | board/qemu/sh4-r2d/readme.txt | 2 | ||||
-rw-r--r-- | configs/qemu_sh4_r2d_defconfig | 14 |
3 files changed, 8 insertions, 8 deletions
diff --git a/board/qemu/sh4-r2d/linux-3.2.config b/board/qemu/sh4-r2d/linux-3.15.config index 5fc878c76..5fc878c76 100644 --- a/board/qemu/sh4-r2d/linux-3.2.config +++ b/board/qemu/sh4-r2d/linux-3.15.config diff --git a/board/qemu/sh4-r2d/readme.txt b/board/qemu/sh4-r2d/readme.txt index 73dce143c..5d770b4a9 100644 --- a/board/qemu/sh4-r2d/readme.txt +++ b/board/qemu/sh4-r2d/readme.txt @@ -5,4 +5,4 @@ Run the emulation with: The login prompt will appear in the terminal that started Qemu. The graphical window is the framebuffer. -Tested with QEMU 1.7.0 +Tested with QEMU 2.0.0 diff --git a/configs/qemu_sh4_r2d_defconfig b/configs/qemu_sh4_r2d_defconfig index b27d9ec60..f77741709 100644 --- a/configs/qemu_sh4_r2d_defconfig +++ b/configs/qemu_sh4_r2d_defconfig @@ -10,19 +10,19 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttySC1" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Lock to 3.2 headers to avoid breaking with newer kernels -BR2_KERNEL_HEADERS_VERSION=y -BR2_DEFAULT_KERNEL_VERSION="3.2.55" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_2=y - # The kernel wants to use the -m4-nofpu option to make sure that it # doesn't use floating point operations. BR2_EXTRA_GCC_CONFIG_OPTIONS="--with-multilib-list=m4,m4-nofpu" +# Lock to 3.15 headers to avoid breaking with newer kernels +BR2_KERNEL_HEADERS_VERSION=y +BR2_DEFAULT_KERNEL_VERSION="3.15.5" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_15=y + # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.55" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.15.5" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux-3.2.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux-3.15.config" BR2_LINUX_KERNEL_ZIMAGE=y |