summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavo@zacarias.com.ar>2013-10-04 12:49:38 (GMT)
committer Peter Korsgaard <peter@korsgaard.com>2013-10-04 13:06:08 (GMT)
commit2c859079cd60c3a6b57f87960c5b4823797ce95d (patch)
tree71245e954d8897687c32947062d140b90af7fed4
parente92d9d4f22015324bb73a0988f4c04e13d65e081 (diff)
downloadbuildroot-2c859079cd60c3a6b57f87960c5b4823797ce95d.tar.gz
buildroot-2c859079cd60c3a6b57f87960c5b4823797ce95d.tar.bz2
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>
-rw-r--r--board/qemu/arm-nuri/readme.txt2
-rw-r--r--board/qemu/arm-versatile/linux-3.11.config (renamed from board/qemu/arm-versatile/linux-3.10.config)0
-rw-r--r--board/qemu/arm-versatile/readme.txt2
-rw-r--r--board/qemu/arm-vexpress/readme.txt2
-rw-r--r--board/qemu/microblazebe-mmu/linux-3.11.config (renamed from board/qemu/microblazebe-mmu/linux-3.10.config)0
-rw-r--r--board/qemu/microblazebe-mmu/readme.txt2
-rw-r--r--board/qemu/microblazeel-mmu/linux-3.11.config (renamed from board/qemu/microblazeel-mmu/linux-3.10.config)0
-rw-r--r--board/qemu/microblazeel-mmu/readme.txt2
-rw-r--r--board/qemu/mips-malta/linux-3.11.config (renamed from board/qemu/mips-malta/linux-3.10.config)0
-rw-r--r--board/qemu/mips-malta/readme.txt2
-rw-r--r--board/qemu/mips64-malta/linux-3.11.config (renamed from board/qemu/mips64-malta/linux-3.10.config)0
-rw-r--r--board/qemu/mips64-malta/readme.txt2
-rw-r--r--board/qemu/mipsel-malta/linux-3.11.config (renamed from board/qemu/mipsel-malta/linux-3.10.config)0
-rw-r--r--board/qemu/mipsel-malta/readme.txt2
-rw-r--r--board/qemu/powerpc-g3beige/linux-3.11.config (renamed from board/qemu/powerpc-g3beige/linux-3.10.config)0
-rw-r--r--board/qemu/powerpc-g3beige/readme.txt4
-rw-r--r--board/qemu/powerpc-mpc8544ds/readme.txt2
-rw-r--r--board/qemu/powerpc-virtex-ml507/readme.txt2
-rw-r--r--board/qemu/sh4-r2d/readme.txt2
-rw-r--r--board/qemu/sparc-ss10/readme.txt2
-rw-r--r--board/qemu/x86/linux-3.11.config (renamed from board/qemu/x86/linux-3.10.config)0
-rw-r--r--board/qemu/x86/readme.txt2
-rw-r--r--board/qemu/x86_64/linux-3.11.config (renamed from board/qemu/x86_64/linux-3.10.config)0
-rw-r--r--board/qemu/x86_64/readme.txt2
-rw-r--r--configs/qemu_mips64_malta_defconfig8
-rw-r--r--configs/qemu_sparc_ss10_defconfig6
26 files changed, 23 insertions, 23 deletions
diff --git a/board/qemu/arm-nuri/readme.txt b/board/qemu/arm-nuri/readme.txt
index 0c64492..0fed2f7 100644
--- a/board/qemu/arm-nuri/readme.txt
+++ b/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
diff --git a/board/qemu/arm-versatile/linux-3.10.config b/board/qemu/arm-versatile/linux-3.11.config
index da73575..da73575 100644
--- a/board/qemu/arm-versatile/linux-3.10.config
+++ b/board/qemu/arm-versatile/linux-3.11.config
diff --git a/board/qemu/arm-versatile/readme.txt b/board/qemu/arm-versatile/readme.txt
index e734d56..4902c54 100644
--- a/board/qemu/arm-versatile/readme.txt
+++ b/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
diff --git a/board/qemu/arm-vexpress/readme.txt b/board/qemu/arm-vexpress/readme.txt
index bde90ef..65d1996 100644
--- a/board/qemu/arm-vexpress/readme.txt
+++ b/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
diff --git a/board/qemu/microblazebe-mmu/linux-3.10.config b/board/qemu/microblazebe-mmu/linux-3.11.config
index 7083cf5..7083cf5 100644
--- a/board/qemu/microblazebe-mmu/linux-3.10.config
+++ b/board/qemu/microblazebe-mmu/linux-3.11.config
diff --git a/board/qemu/microblazebe-mmu/readme.txt b/board/qemu/microblazebe-mmu/readme.txt
index 7d172d1..473a934 100644
--- a/board/qemu/microblazebe-mmu/readme.txt
+++ b/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
diff --git a/board/qemu/microblazeel-mmu/linux-3.10.config b/board/qemu/microblazeel-mmu/linux-3.11.config
index cdeb324..cdeb324 100644
--- a/board/qemu/microblazeel-mmu/linux-3.10.config
+++ b/board/qemu/microblazeel-mmu/linux-3.11.config
diff --git a/board/qemu/microblazeel-mmu/readme.txt b/board/qemu/microblazeel-mmu/readme.txt
index 9728a45..baddc7a 100644
--- a/board/qemu/microblazeel-mmu/readme.txt
+++ b/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
diff --git a/board/qemu/mips-malta/linux-3.10.config b/board/qemu/mips-malta/linux-3.11.config
index 7549ccc..7549ccc 100644
--- a/board/qemu/mips-malta/linux-3.10.config
+++ b/board/qemu/mips-malta/linux-3.11.config
diff --git a/board/qemu/mips-malta/readme.txt b/board/qemu/mips-malta/readme.txt
index ccdcc84..33764ea 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.5.2
+Tested with QEMU 1.6.0
diff --git a/board/qemu/mips64-malta/linux-3.10.config b/board/qemu/mips64-malta/linux-3.11.config
index 6e7f7ee..6e7f7ee 100644
--- a/board/qemu/mips64-malta/linux-3.10.config
+++ b/board/qemu/mips64-malta/linux-3.11.config
diff --git a/board/qemu/mips64-malta/readme.txt b/board/qemu/mips64-malta/readme.txt
index 7361722..23b85ab 100644
--- a/board/qemu/mips64-malta/readme.txt
+++ b/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
diff --git a/board/qemu/mipsel-malta/linux-3.10.config b/board/qemu/mipsel-malta/linux-3.11.config
index b51de4b..b51de4b 100644
--- a/board/qemu/mipsel-malta/linux-3.10.config
+++ b/board/qemu/mipsel-malta/linux-3.11.config
diff --git a/board/qemu/mipsel-malta/readme.txt b/board/qemu/mipsel-malta/readme.txt
index 52d424d..1e17828 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.5.2
+Tested with QEMU 1.6.0
diff --git a/board/qemu/powerpc-g3beige/linux-3.10.config b/board/qemu/powerpc-g3beige/linux-3.11.config
index 098dae3..098dae3 100644
--- a/board/qemu/powerpc-g3beige/linux-3.10.config
+++ b/board/qemu/powerpc-g3beige/linux-3.11.config
diff --git a/board/qemu/powerpc-g3beige/readme.txt b/board/qemu/powerpc-g3beige/readme.txt
index b5c73a4..4c0bf8a 100644
--- a/board/qemu/powerpc-g3beige/readme.txt
+++ b/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
diff --git a/board/qemu/powerpc-mpc8544ds/readme.txt b/board/qemu/powerpc-mpc8544ds/readme.txt
index dfe1ac2..8c57ead 100644
--- a/board/qemu/powerpc-mpc8544ds/readme.txt
+++ b/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
diff --git a/board/qemu/powerpc-virtex-ml507/readme.txt b/board/qemu/powerpc-virtex-ml507/readme.txt
index f4bc5d5..e958d49 100644
--- a/board/qemu/powerpc-virtex-ml507/readme.txt
+++ b/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
diff --git a/board/qemu/sh4-r2d/readme.txt b/board/qemu/sh4-r2d/readme.txt
index 34f4857..45fca86 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.5.2
+Tested with QEMU 1.6.0
diff --git a/board/qemu/sparc-ss10/readme.txt b/board/qemu/sparc-ss10/readme.txt
index 8f4b5be..dab4028 100644
--- a/board/qemu/sparc-ss10/readme.txt
+++ b/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
diff --git a/board/qemu/x86/linux-3.10.config b/board/qemu/x86/linux-3.11.config
index 5bf6944..5bf6944 100644
--- a/board/qemu/x86/linux-3.10.config
+++ b/board/qemu/x86/linux-3.11.config
diff --git a/board/qemu/x86/readme.txt b/board/qemu/x86/readme.txt
index 7bc3a1c..5f3af40 100644
--- a/board/qemu/x86/readme.txt
+++ b/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
diff --git a/board/qemu/x86_64/linux-3.10.config b/board/qemu/x86_64/linux-3.11.config
index 5bf6944..5bf6944 100644
--- a/board/qemu/x86_64/linux-3.10.config
+++ b/board/qemu/x86_64/linux-3.11.config
diff --git a/board/qemu/x86_64/readme.txt b/board/qemu/x86_64/readme.txt
index b6f4659..d9eaf56 100644
--- a/board/qemu/x86_64/readme.txt
+++ b/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
diff --git a/configs/qemu_mips64_malta_defconfig b/configs/qemu_mips64_malta_defconfig
index 61abdcf..035cfa1 100644
--- a/configs/qemu_mips64_malta_defconfig
+++ b/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
diff --git a/configs/qemu_sparc_ss10_defconfig b/configs/qemu_sparc_ss10_defconfig
index 33f0b21..ad1b136 100644
--- a/configs/qemu_sparc_ss10_defconfig
+++ b/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