[Buildroot] [PATCH 1/8] qemu/sh4-r2d: update to use kernel 3.2.12

[Buildroot] [PATCH 1/8] qemu/sh4-r2d: update to use kernel 3.2.12

[Gustavo Zacarias]

Unfortunately kernel 3.3 doesn't seem to work properly at the moment.
So lock down headers to version 3.2.x and kernel to 3.2.12.
Tested on qemu 1.0.1

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 configs/qemu_sh4_r2d_defconfig |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/configs/qemu_sh4_r2d_defconfig b/configs/qemu_sh4_r2d_defconfig
index 8794b18..e344e71 100644
--- a/configs/qemu_sh4_r2d_defconfig
+++ b/configs/qemu_sh4_r2d_defconfig
@@ -10,6 +10,9 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttySC1"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
+# Avoid 3.3+ headers
+BR2_KERNEL_HEADERS_3_2=y
+
 # The kernel wants to use the -m4-nofpu option to make sure that it
 # doesn't use floating point operations.
 BR2_GCC_VERSION_4_5_X=y
@@ -18,7 +21,7 @@ BR2_EXTRA_GCC_CONFIG_OPTIONS="--with-multilib-list=m4,m4-nofpu"
 # Linux kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.12"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux-3.2.config"
 BR2_LINUX_KERNEL_ZIMAGE=y
-- 
1.7.3.4

[Buildroot] [PATCH 2/8] qemu/arm-versatile: update to use kernel 3.3

[Gustavo Zacarias]

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 .../{linux-3.2.config => linux-3.3.config}         |    0
 configs/qemu_arm_versatile_defconfig               |    4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename board/qemu/arm-versatile/{linux-3.2.config => linux-3.3.config} (100%)

diff --git a/board/qemu/arm-versatile/linux-3.2.config b/board/qemu/arm-versatile/linux-3.3.config
similarity index 100%
rename from board/qemu/arm-versatile/linux-3.2.config
rename to board/qemu/arm-versatile/linux-3.3.config
diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig
index fdc2e72..f2c30b1 100644
--- a/configs/qemu_arm_versatile_defconfig
+++ b/configs/qemu_arm_versatile_defconfig
@@ -13,7 +13,7 @@ BR2_TARGET_ROOTFS_EXT2=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-3.2.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-3.3.config"
 BR2_LINUX_KERNEL_ZIMAGE=y
-- 
1.7.3.4

[Buildroot] [PATCH 3/8] qemu/mipsel-malta: update to use kernel 3.3

[Gustavo Zacarias]

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 .../{linux-3.2.config => linux-3.3.config}         |    0
 configs/qemu_mipsel_malta_defconfig                |    4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename board/qemu/mipsel-malta/{linux-3.2.config => linux-3.3.config} (100%)

diff --git a/board/qemu/mipsel-malta/linux-3.2.config b/board/qemu/mipsel-malta/linux-3.3.config
similarity index 100%
rename from board/qemu/mipsel-malta/linux-3.2.config
rename to board/qemu/mipsel-malta/linux-3.3.config
diff --git a/configs/qemu_mipsel_malta_defconfig b/configs/qemu_mipsel_malta_defconfig
index 0ccd4e6..99d9cba 100644
--- a/configs/qemu_mipsel_malta_defconfig
+++ b/configs/qemu_mipsel_malta_defconfig
@@ -9,9 +9,9 @@ BR2_TARGET_ROOTFS_EXT2=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mipsel-malta/linux-3.2.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mipsel-malta/linux-3.3.config"
 BR2_LINUX_KERNEL_VMLINUX=y
 
 # Serial port config
-- 
1.7.3.4

[Buildroot] [PATCH 4/8] qemu/mips-malta: update to use kernel 3.3

[Gustavo Zacarias]

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 .../{linux-3.2.config => linux-3.3.config}         |    0
 configs/qemu_mips_malta_defconfig                  |    4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename board/qemu/mips-malta/{linux-3.2.config => linux-3.3.config} (100%)

diff --git a/board/qemu/mips-malta/linux-3.2.config b/board/qemu/mips-malta/linux-3.3.config
similarity index 100%
rename from board/qemu/mips-malta/linux-3.2.config
rename to board/qemu/mips-malta/linux-3.3.config
diff --git a/configs/qemu_mips_malta_defconfig b/configs/qemu_mips_malta_defconfig
index db94790..2dc3f70 100644
--- a/configs/qemu_mips_malta_defconfig
+++ b/configs/qemu_mips_malta_defconfig
@@ -9,9 +9,9 @@ BR2_TARGET_ROOTFS_EXT2=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips-malta/linux-3.2.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips-malta/linux-3.3.config"
 BR2_LINUX_KERNEL_VMLINUX=y
 
 # Serial port config
-- 
1.7.3.4

[Buildroot] [PATCH 5/8] qemu/ppc-g3beige: update to use kernel 3.3

[Gustavo Zacarias]

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 .../{linux-3.2.config => linux-3.3.config}         |    0
 configs/qemu_ppc_g3beige_defconfig                 |    4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename board/qemu/powerpc-g3beige/{linux-3.2.config => linux-3.3.config} (100%)

diff --git a/board/qemu/powerpc-g3beige/linux-3.2.config b/board/qemu/powerpc-g3beige/linux-3.3.config
similarity index 100%
rename from board/qemu/powerpc-g3beige/linux-3.2.config
rename to board/qemu/powerpc-g3beige/linux-3.3.config
diff --git a/configs/qemu_ppc_g3beige_defconfig b/configs/qemu_ppc_g3beige_defconfig
index 432a746..a20d3e4 100644
--- a/configs/qemu_ppc_g3beige_defconfig
+++ b/configs/qemu_ppc_g3beige_defconfig
@@ -9,9 +9,9 @@ BR2_TARGET_ROOTFS_EXT2=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/powerpc-g3beige/linux-3.2.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/powerpc-g3beige/linux-3.3.config"
 BR2_LINUX_KERNEL_VMLINUX=y
 
 # Serial port config
-- 
1.7.3.4

[Buildroot] [PATCH 6/8] qemu/sparc-ss10: update to use kernel 3.3

[Gustavo Zacarias]

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 configs/qemu_sparc_ss10_defconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/configs/qemu_sparc_ss10_defconfig b/configs/qemu_sparc_ss10_defconfig
index 6d69379..77250f8 100644
--- a/configs/qemu_sparc_ss10_defconfig
+++ b/configs/qemu_sparc_ss10_defconfig
@@ -9,6 +9,6 @@ BR2_TARGET_ROOTFS_EXT2=y
 # Linux kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3"
 BR2_LINUX_KERNEL_DEFCONFIG="sparc32"
 BR2_LINUX_KERNEL_ZIMAGE=y
-- 
1.7.3.4

[Buildroot] [PATCH 7/8] qemu/x86_64: update to use kernel 3.3

[Gustavo Zacarias]

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 .../x86_64/{linux-3.2.config => linux-3.3.config}  |    0
 configs/qemu_x86_64_defconfig                      |    4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename board/qemu/x86_64/{linux-3.2.config => linux-3.3.config} (100%)

diff --git a/board/qemu/x86_64/linux-3.2.config b/board/qemu/x86_64/linux-3.3.config
similarity index 100%
rename from board/qemu/x86_64/linux-3.2.config
rename to board/qemu/x86_64/linux-3.3.config
diff --git a/configs/qemu_x86_64_defconfig b/configs/qemu_x86_64_defconfig
index 6da334c..3c72b36 100644
--- a/configs/qemu_x86_64_defconfig
+++ b/configs/qemu_x86_64_defconfig
@@ -12,6 +12,6 @@ BR2_TARGET_ROOTFS_EXT2=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-3.2.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-3.3.config"
-- 
1.7.3.4

[Buildroot] [PATCH 8/8] qemu/x86: update to use kernel 3.3

[Gustavo Zacarias]

Also switch documentation to use qemu-system-i386

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 .../x86/{linux-3.2.config => linux-3.3.config}     |    0
 board/qemu/x86/readme.txt                          |    2 +-
 configs/qemu_x86_defconfig                         |    4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename board/qemu/x86/{linux-3.2.config => linux-3.3.config} (100%)

diff --git a/board/qemu/x86/linux-3.2.config b/board/qemu/x86/linux-3.3.config
similarity index 100%
rename from board/qemu/x86/linux-3.2.config
rename to board/qemu/x86/linux-3.3.config
diff --git a/board/qemu/x86/readme.txt b/board/qemu/x86/readme.txt
index c06d24f..4ba6607 100644
--- a/board/qemu/x86/readme.txt
+++ b/board/qemu/x86/readme.txt
@@ -1,5 +1,5 @@
 Run the emulation with:
 
-  qemu-system-x86_64 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=ide -append root=/dev/sda
+  qemu-system-i386 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=ide -append root=/dev/sda
 
 The login prompt will appear in the graphical window.
diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig
index d20850a..5d0e23b 100644
--- a/configs/qemu_x86_defconfig
+++ b/configs/qemu_x86_defconfig
@@ -13,6 +13,6 @@ BR2_TARGET_ROOTFS_EXT2=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.2.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.3.config"
-- 
1.7.3.4

[Buildroot] [PATCH 1/8] qemu/sh4-r2d: update to use kernel 3.2.12

[Peter Korsgaard]

>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:

 Gustavo> Unfortunately kernel 3.3 doesn't seem to work properly at the moment.
 Gustavo> So lock down headers to version 3.2.x and kernel to 3.2.12.
 Gustavo> Tested on qemu 1.0.1

Committed all 8, thanks.

-- 
Bye, Peter Korsgaard