浏览代码

configs/qemu: bump relevant config versions

arm_nuri needs some DT fixups to switch to the 3.11.x series since it's
now default for that kernel defconfig.

[Peter: adjust comment in sparc defconfig to match]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Gustavo Zacarias 12 年之前
父节点
当前提交
2c859079cd

+ 1 - 1
board/qemu/arm-nuri/readme.txt

@@ -7,4 +7,4 @@ graphical window is the framebuffer.
 
 Startup time is slow because of the SMP CPU emulation so be patient.
 
-Tested with QEMU 1.5.2
+Tested with QEMU 1.6.0

+ 0 - 0
board/qemu/arm-versatile/linux-3.10.config → board/qemu/arm-versatile/linux-3.11.config


+ 1 - 1
board/qemu/arm-versatile/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.5.2
+Tested with QEMU 1.6.0

+ 1 - 1
board/qemu/arm-vexpress/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.5.2
+Tested with QEMU 1.6.0

+ 0 - 0
board/qemu/microblazebe-mmu/linux-3.10.config → board/qemu/microblazebe-mmu/linux-3.11.config


+ 1 - 1
board/qemu/microblazebe-mmu/readme.txt

@@ -4,4 +4,4 @@ Run the emulation with:
 
 The login prompt will appear in the terminal that started Qemu.
 
-Tested with QEMU 1.5.2
+Tested with QEMU 1.6.0

+ 0 - 0
board/qemu/microblazeel-mmu/linux-3.10.config → board/qemu/microblazeel-mmu/linux-3.11.config


+ 1 - 1
board/qemu/microblazeel-mmu/readme.txt

@@ -4,4 +4,4 @@ Run the emulation with:
 
 The login prompt will appear in the terminal that started Qemu.
 
-Tested with QEMU 1.5.2
+Tested with QEMU 1.6.0

+ 0 - 0
board/qemu/mips-malta/linux-3.10.config → board/qemu/mips-malta/linux-3.11.config


+ 1 - 1
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.5.2
+Tested with QEMU 1.6.0

+ 0 - 0
board/qemu/mips64-malta/linux-3.10.config → board/qemu/mips64-malta/linux-3.11.config


+ 1 - 1
board/qemu/mips64-malta/readme.txt

@@ -8,4 +8,4 @@ enabled.
 
 This configuration is known to be flaky.
 
-Tested with QEMU 1.5.2
+Tested with QEMU 1.6.0

+ 0 - 0
board/qemu/mipsel-malta/linux-3.10.config → board/qemu/mipsel-malta/linux-3.11.config


+ 1 - 1
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.5.2
+Tested with QEMU 1.6.0

+ 0 - 0
board/qemu/powerpc-g3beige/linux-3.10.config → board/qemu/powerpc-g3beige/linux-3.11.config


+ 2 - 2
board/qemu/powerpc-g3beige/readme.txt

@@ -1,8 +1,8 @@
 Run the emulation with:
 
-  qemu-system-ppc -M g3beige -kernel output/images/vmlinux -hda output/images/rootfs.ext2 -append "console=ttyS0 root=/dev/hdc" -serial stdio -net nic,model=rtl8139 -net user
+  qemu-system-ppc -M g3beige -kernel output/images/vmlinux -hda output/images/rootfs.ext2 -append "console=ttyS0 root=/dev/hda" -serial stdio -net nic,model=rtl8139 -net user
 
 The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer.
 
-Tested with QEMU 1.5.2
+Tested with QEMU 1.6.0

+ 1 - 1
board/qemu/powerpc-mpc8544ds/readme.txt

@@ -4,4 +4,4 @@ Run the emulation with:
 
 The login prompt will appear in the terminal that started Qemu.
 
-Tested with QEMU 1.5.2
+Tested with QEMU 1.6.0

+ 1 - 1
board/qemu/powerpc-virtex-ml507/readme.txt

@@ -5,4 +5,4 @@ Run the emulation with:
 
 The login prompt will appear in the terminal that started Qemu.
 
-Tested with QEMU 1.5.2
+Tested with QEMU 1.6.0

+ 1 - 1
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.5.2
+Tested with QEMU 1.6.0

+ 1 - 1
board/qemu/sparc-ss10/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.5.2
+Tested with QEMU 1.6.0

+ 0 - 0
board/qemu/x86/linux-3.10.config → board/qemu/x86/linux-3.11.config


+ 1 - 1
board/qemu/x86/readme.txt

@@ -4,4 +4,4 @@ Run the emulation with:
 
 The login prompt will appear in the graphical window.
 
-Tested with QEMU 1.5.2
+Tested with QEMU 1.6.0

+ 0 - 0
board/qemu/x86_64/linux-3.10.config → board/qemu/x86_64/linux-3.11.config


+ 1 - 1
board/qemu/x86_64/readme.txt

@@ -4,4 +4,4 @@ Run the emulation with:
 
 The login prompt will appear in the graphical window.
 
-Tested with QEMU 1.5.2
+Tested with QEMU 1.6.0

+ 4 - 4
configs/qemu_mips64_malta_defconfig

@@ -10,16 +10,16 @@ BR2_PREFER_STATIC_LIB=y
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.10 headers to avoid breaking with newer kernels
+# Lock to 3.11 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.10.7"
+BR2_DEFAULT_KERNEL_VERSION="3.11.3"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.7"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.11.3"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux-3.10.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux-3.11.config"
 BR2_LINUX_KERNEL_VMLINUX=y
 
 # Serial port config

+ 3 - 3
configs/qemu_sparc_ss10_defconfig

@@ -6,13 +6,13 @@ BR2_sparc_v8=y
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.7 headers to avoid breaking with newer kernels
+# Lock to 3.11 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.7.10"
+BR2_DEFAULT_KERNEL_VERSION="3.11.3"
 
 # Linux kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.10"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.11.3"
 BR2_LINUX_KERNEL_DEFCONFIG="sparc32"
 BR2_LINUX_KERNEL_ZIMAGE=y