Skip to contentSkip to conversation

configs/qemu: bump relevant config versions

PATCH New Gustavo Zacarias 2 participants 4 messages Oct 4, 2013 – Oct 5, 2013 Arm/versatile express platform

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 board/qemu/arm-nuri/readme.txt                                    | 2 +-
 board/qemu/arm-versatile/{linux-3.10.config => linux-3.11.config} | 0
 board/qemu/arm-versatile/readme.txt                               | 2 +-
 board/qemu/arm-vexpress/readme.txt                                | 2 +-
 .../microblazebe-mmu/{linux-3.10.config => linux-3.11.config}     | 0
 board/qemu/microblazebe-mmu/readme.txt                            | 2 +-
 .../microblazeel-mmu/{linux-3.10.config => linux-3.11.config}     | 0
 board/qemu/microblazeel-mmu/readme.txt                            | 2 +-
 board/qemu/mips-malta/{linux-3.10.config => linux-3.11.config}    | 0
 board/qemu/mips-malta/readme.txt                                  | 2 +-
 board/qemu/mips64-malta/{linux-3.10.config => linux-3.11.config}  | 0
 board/qemu/mips64-malta/readme.txt                                | 2 +-
 board/qemu/mipsel-malta/{linux-3.10.config => linux-3.11.config}  | 0
 board/qemu/mipsel-malta/readme.txt                                | 2 +-
 .../qemu/powerpc-g3beige/{linux-3.10.config => linux-3.11.config} | 0
 board/qemu/powerpc-g3beige/readme.txt                             | 4 ++--
 board/qemu/powerpc-mpc8544ds/readme.txt                           | 2 +-
 board/qemu/powerpc-virtex-ml507/readme.txt                        | 2 +-
 board/qemu/sh4-r2d/readme.txt                                     | 2 +-
 board/qemu/sparc-ss10/readme.txt                                  | 2 +-
 board/qemu/x86/{linux-3.10.config => linux-3.11.config}           | 0
 board/qemu/x86/readme.txt                                         | 2 +-
 board/qemu/x86_64/{linux-3.10.config => linux-3.11.config}        | 0
 board/qemu/x86_64/readme.txt                                      | 2 +-
 configs/qemu_mips64_malta_defconfig                               | 8 ++++----
 configs/qemu_sparc_ss10_defconfig                                 | 4 ++--
 26 files changed, 22 insertions(+), 22 deletions(-)
 rename board/qemu/arm-versatile/{linux-3.10.config => linux-3.11.config} (100%)
 rename board/qemu/microblazebe-mmu/{linux-3.10.config => linux-3.11.config} (100%)
 rename board/qemu/microblazeel-mmu/{linux-3.10.config => linux-3.11.config} (100%)
 rename board/qemu/mips-malta/{linux-3.10.config => linux-3.11.config} (100%)
 rename board/qemu/mips64-malta/{linux-3.10.config => linux-3.11.config} (100%)
 rename board/qemu/mipsel-malta/{linux-3.10.config => linux-3.11.config} (100%)
 rename board/qemu/powerpc-g3beige/{linux-3.10.config => linux-3.11.config} (100%)
 rename board/qemu/x86/{linux-3.10.config => linux-3.11.config} (100%)
 rename board/qemu/x86_64/{linux-3.10.config => linux-3.11.config} (100%)
board/qemu/arm-nuri/readme.txt +1 -1
index 0c64492..0fed2f7 100644
@@ -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
board/qemu/arm-versatile/linux-3.11.config renamed from board/qemu/arm-versatile/linux-3.10.config +0 -0
similarity index 100%
rename from board/qemu/arm-versatile/linux-3.10.config
rename to board/qemu/arm-versatile/linux-3.11.config
board/qemu/arm-versatile/readme.txt +1 -1
index e734d56..4902c54 100644
@@ -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
board/qemu/arm-vexpress/readme.txt +1 -1
index bde90ef..65d1996 100644
@@ -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
board/qemu/microblazebe-mmu/linux-3.11.config renamed from board/qemu/microblazebe-mmu/linux-3.10.config +0 -0
similarity index 100%
rename from board/qemu/microblazebe-mmu/linux-3.10.config
rename to board/qemu/microblazebe-mmu/linux-3.11.config
board/qemu/microblazebe-mmu/readme.txt +1 -1
index 7d172d1..473a934 100644
@@ -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
board/qemu/microblazeel-mmu/linux-3.11.config renamed from board/qemu/microblazeel-mmu/linux-3.10.config +0 -0
similarity index 100%
rename from board/qemu/microblazeel-mmu/linux-3.10.config
rename to board/qemu/microblazeel-mmu/linux-3.11.config
board/qemu/microblazeel-mmu/readme.txt +1 -1
index 9728a45..baddc7a 100644
@@ -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
board/qemu/mips-malta/linux-3.11.config renamed from board/qemu/mips-malta/linux-3.10.config +0 -0
similarity index 100%
rename from board/qemu/mips-malta/linux-3.10.config
rename to board/qemu/mips-malta/linux-3.11.config
board/qemu/mips-malta/readme.txt +1 -1
index ccdcc84..33764ea 100644
@@ -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
board/qemu/mips64-malta/linux-3.11.config renamed from board/qemu/mips64-malta/linux-3.10.config +0 -0
similarity index 100%
rename from board/qemu/mips64-malta/linux-3.10.config
rename to board/qemu/mips64-malta/linux-3.11.config
board/qemu/mips64-malta/readme.txt +1 -1
index 7361722..23b85ab 100644
@@ -8,4 +8,4 @@ enabled.
 
 This configuration is known to be flaky.
 
-Tested with QEMU 1.5.2
+Tested with QEMU 1.6.0
board/qemu/mipsel-malta/linux-3.11.config renamed from board/qemu/mipsel-malta/linux-3.10.config +0 -0
similarity index 100%
rename from board/qemu/mipsel-malta/linux-3.10.config
rename to board/qemu/mipsel-malta/linux-3.11.config
board/qemu/mipsel-malta/readme.txt +1 -1
index 52d424d..1e17828 100644
@@ -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
board/qemu/powerpc-g3beige/linux-3.11.config renamed from board/qemu/powerpc-g3beige/linux-3.10.config +0 -0
similarity index 100%
rename from board/qemu/powerpc-g3beige/linux-3.10.config
rename to board/qemu/powerpc-g3beige/linux-3.11.config
board/qemu/powerpc-g3beige/readme.txt +2 -2
index b5c73a4..4c0bf8a 100644
@@ -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
board/qemu/powerpc-mpc8544ds/readme.txt +1 -1
index dfe1ac2..8c57ead 100644
@@ -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
board/qemu/powerpc-virtex-ml507/readme.txt +1 -1
index f4bc5d5..e958d49 100644
@@ -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
board/qemu/sh4-r2d/readme.txt +1 -1
index 34f4857..45fca86 100644
@@ -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
board/qemu/sparc-ss10/readme.txt +1 -1
index 8f4b5be..dab4028 100644
@@ -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
board/qemu/x86/linux-3.11.config renamed from board/qemu/x86/linux-3.10.config +0 -0
similarity index 100%
rename from board/qemu/x86/linux-3.10.config
rename to board/qemu/x86/linux-3.11.config
board/qemu/x86/readme.txt +1 -1
index 7bc3a1c..5f3af40 100644
@@ -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
board/qemu/x86_64/linux-3.11.config renamed from board/qemu/x86_64/linux-3.10.config +0 -0
similarity index 100%
rename from board/qemu/x86_64/linux-3.10.config
rename to board/qemu/x86_64/linux-3.11.config
board/qemu/x86_64/readme.txt +1 -1
index b6f4659..d9eaf56 100644
@@ -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
configs/qemu_mips64_malta_defconfig +4 -4
index 61abdcf..035cfa1 100644
@@ -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
configs/qemu_sparc_ss10_defconfig +2 -2
index 33f0b21..ca2ed02 100644
@@ -8,11 +8,11 @@ BR2_TARGET_ROOTFS_EXT2=y
 
 # Lock to 3.7 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
Signature · 1 line
1.8.1.5
#1 lore raw

PATCH 1/1 configs/qemu: bump relevant config versions

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

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

Gustavo> +++ b/configs/qemu_sparc_ss10_defconfig Gustavo> @@ -8,11 +8,11 @@ BR2_TARGET_ROOTFS_EXT2=y

Gustavo> # Lock to 3.7 headers to avoid breaking with newer kernels Gustavo> BR2_KERNEL_HEADERS_VERSION=y
Gustavo> -BR2_DEFAULT_KERNEL_VERSION="3.7.10"
Gustavo> +BR2_DEFAULT_KERNEL_VERSION="3.11.3"

Committed with the comment updated, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#2 lore raw

PATCH 1/1 configs/qemu: bump relevant config versions

In reply to Gustavo Zacarias
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

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

Gustavo> Signed-off-by: Gustavo Zacarias <[email protected]> Gustavo> ---

 Gustavo>  board/qemu/arm-nuri/readme.txt                                    | 2 +-
 Gustavo>  board/qemu/arm-versatile/{linux-3.10.config => linux-3.11.config} | 0
 Gustavo>  board/qemu/arm-versatile/readme.txt                               | 2 +-
 Gustavo>  board/qemu/arm-vexpress/readme.txt                                | 2 +-
 Gustavo>  .../microblazebe-mmu/{linux-3.10.config => linux-3.11.config}     | 0
 Gustavo>  board/qemu/microblazebe-mmu/readme.txt                            | 2 +-
 Gustavo>  .../microblazeel-mmu/{linux-3.10.config => linux-3.11.config}     | 0
 Gustavo>  board/qemu/microblazeel-mmu/readme.txt                            | 2 +-
 Gustavo>  board/qemu/mips-malta/{linux-3.10.config => linux-3.11.config}    | 0
 Gustavo>  board/qemu/mips-malta/readme.txt                                  | 2 +-
 Gustavo>  board/qemu/mips64-malta/{linux-3.10.config => linux-3.11.config}  | 0
 Gustavo>  board/qemu/mips64-malta/readme.txt                                | 2 +-
 Gustavo>  board/qemu/mipsel-malta/{linux-3.10.config => linux-3.11.config}  | 0
 Gustavo>  board/qemu/mipsel-malta/readme.txt                                | 2 +-
 Gustavo>  .../qemu/powerpc-g3beige/{linux-3.10.config => linux-3.11.config} | 0
 Gustavo>  board/qemu/powerpc-g3beige/readme.txt                             | 4 ++--
 Gustavo>  board/qemu/powerpc-mpc8544ds/readme.txt                           | 2 +-
 Gustavo>  board/qemu/powerpc-virtex-ml507/readme.txt                        | 2 +-
 Gustavo>  board/qemu/sh4-r2d/readme.txt                                     | 2 +-
 Gustavo>  board/qemu/sparc-ss10/readme.txt                                  | 2 +-
 Gustavo>  board/qemu/x86/{linux-3.10.config => linux-3.11.config}           | 0
 Gustavo>  board/qemu/x86/readme.txt                                         | 2 +-
 Gustavo>  board/qemu/x86_64/{linux-3.10.config => linux-3.11.config}        | 0
 Gustavo>  board/qemu/x86_64/readme.txt                                      | 2 +-
 Gustavo>  configs/qemu_mips64_malta_defconfig                               | 8 ++++----
 Gustavo>  configs/qemu_sparc_ss10_defconfig                                 | 4 ++--

I'm not sure what went wrong here. You renamed a bunch of Linux configuration files, but you didn't update the defconfigs to match.

I tested arm versatile with 3.11 and it didn't boot for me, so I've changed the Linux configuration file names back to 3.10 rather than adjusting the defconfigs.

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH 1/1 configs/qemu: bump relevant config versions

Quoted 6 lines · Peter Korsgaard

I'm not sure what went wrong here. You renamed a bunch of Linux configuration files, but you didn't update the defconfigs to match.

I tested arm versatile with 3.11 and it didn't boot for me, so I've changed the Linux configuration file names back to 3.10 rather than adjusting the defconfigs.

I've probably made some mistake when moving things around before doing the commit.
That said it's working fine with 3.11.3 + qemu 1.6.0 for me, i do extensive tests before sending this series.
I've placed some of my generated images at
https://www.zacarias.com.ar/buildroot-qemu/ if you want to give those a try (or someone else to see if there's a pattern with qemu version or distribution).
Maybe it's time we do a host-qemu for these to make it more predictable/concise. There's always some breakage when there's a new qemu version or kernel series and since we can't control which version each distribution has it's problematic IMHO.
Regards.