From 332687c8fdf9720dd7ccfe188a38a353def88c0b Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Sun, 7 Jul 2013 19:34:07 -0300 Subject: [PATCH] configs/qemu: bump relevant config versions While at it add the missing network interfaces to configurations that support it. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- board/qemu/arm-nuri/readme.txt | 2 +- .../{linux-3.9.config => linux-3.10.config} | 0 board/qemu/arm-versatile/readme.txt | 2 +- board/qemu/arm-vexpress/readme.txt | 2 +- .../{linux-3.9.config => linux-3.10.config} | 0 board/qemu/microblazebe-mmu/readme.txt | 2 +- .../{linux-3.9.config => linux-3.10.config} | 0 board/qemu/microblazeel-mmu/readme.txt | 2 +- .../mips-malta/{linux-3.9.config => linux-3.10.config} | 0 board/qemu/mips-malta/readme.txt | 4 ++-- .../mips64-malta/{linux-3.9.config => linux-3.10.config} | 0 board/qemu/mips64-malta/readme.txt | 2 +- .../mipsel-malta/{linux-3.9.config => linux-3.10.config} | 0 board/qemu/mipsel-malta/readme.txt | 4 ++-- .../{linux-3.8.config => linux-3.10.config} | 0 board/qemu/powerpc-g3beige/readme.txt | 4 ++-- board/qemu/powerpc-mpc8544ds/readme.txt | 4 ++-- board/qemu/powerpc-virtex-ml507/readme.txt | 2 +- board/qemu/sh4-r2d/readme.txt | 4 ++-- board/qemu/sparc-ss10/readme.txt | 4 ++-- board/qemu/x86/{linux-3.9.config => linux-3.10.config} | 0 board/qemu/x86/readme.txt | 4 ++-- .../qemu/x86_64/{linux-3.9.config => linux-3.10.config} | 0 board/qemu/x86_64/readme.txt | 4 ++-- configs/qemu_arm_nuri_defconfig | 7 ++++--- configs/qemu_arm_versatile_defconfig | 9 +++++---- configs/qemu_arm_vexpress_defconfig | 7 ++++--- configs/qemu_microblazebe_mmu_defconfig | 4 ++-- configs/qemu_microblazeel_mmu_defconfig | 4 ++-- configs/qemu_mips64_malta_defconfig | 9 +++++---- configs/qemu_mips_malta_defconfig | 9 +++++---- configs/qemu_mipsel_malta_defconfig | 9 +++++---- configs/qemu_ppc_g3beige_defconfig | 9 +++++---- configs/qemu_ppc_mpc8544ds_defconfig | 7 ++++--- configs/qemu_ppc_virtex_ml507_defconfig | 7 ++++--- configs/qemu_sh4_r2d_defconfig | 7 ++++--- configs/qemu_sparc_ss10_defconfig | 5 +++-- configs/qemu_x86_64_defconfig | 9 +++++---- configs/qemu_x86_defconfig | 9 +++++---- 39 files changed, 85 insertions(+), 72 deletions(-) rename board/qemu/arm-versatile/{linux-3.9.config => linux-3.10.config} (100%) rename board/qemu/microblazebe-mmu/{linux-3.9.config => linux-3.10.config} (100%) rename board/qemu/microblazeel-mmu/{linux-3.9.config => linux-3.10.config} (100%) rename board/qemu/mips-malta/{linux-3.9.config => linux-3.10.config} (100%) rename board/qemu/mips64-malta/{linux-3.9.config => linux-3.10.config} (100%) rename board/qemu/mipsel-malta/{linux-3.9.config => linux-3.10.config} (100%) rename board/qemu/powerpc-g3beige/{linux-3.8.config => linux-3.10.config} (100%) rename board/qemu/x86/{linux-3.9.config => linux-3.10.config} (100%) rename board/qemu/x86_64/{linux-3.9.config => linux-3.10.config} (100%) diff --git a/board/qemu/arm-nuri/readme.txt b/board/qemu/arm-nuri/readme.txt index dc97c20436..6d7685164f 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.4.0 +Tested with QEMU 1.4.2 diff --git a/board/qemu/arm-versatile/linux-3.9.config b/board/qemu/arm-versatile/linux-3.10.config similarity index 100% rename from board/qemu/arm-versatile/linux-3.9.config rename to board/qemu/arm-versatile/linux-3.10.config diff --git a/board/qemu/arm-versatile/readme.txt b/board/qemu/arm-versatile/readme.txt index 3801f4870f..31972fa7f3 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.4.0 +Tested with QEMU 1.4.2 diff --git a/board/qemu/arm-vexpress/readme.txt b/board/qemu/arm-vexpress/readme.txt index 26657a53f2..82898e12b8 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.4.0 +Tested with QEMU 1.4.2 diff --git a/board/qemu/microblazebe-mmu/linux-3.9.config b/board/qemu/microblazebe-mmu/linux-3.10.config similarity index 100% rename from board/qemu/microblazebe-mmu/linux-3.9.config rename to board/qemu/microblazebe-mmu/linux-3.10.config diff --git a/board/qemu/microblazebe-mmu/readme.txt b/board/qemu/microblazebe-mmu/readme.txt index 36adbd3dd6..20f1b70101 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.4.0 +Tested with QEMU 1.4.2 diff --git a/board/qemu/microblazeel-mmu/linux-3.9.config b/board/qemu/microblazeel-mmu/linux-3.10.config similarity index 100% rename from board/qemu/microblazeel-mmu/linux-3.9.config rename to board/qemu/microblazeel-mmu/linux-3.10.config diff --git a/board/qemu/microblazeel-mmu/readme.txt b/board/qemu/microblazeel-mmu/readme.txt index 585c35d6b7..c8532452b1 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.4.0 +Tested with QEMU 1.4.2 diff --git a/board/qemu/mips-malta/linux-3.9.config b/board/qemu/mips-malta/linux-3.10.config similarity index 100% rename from board/qemu/mips-malta/linux-3.9.config rename to board/qemu/mips-malta/linux-3.10.config diff --git a/board/qemu/mips-malta/readme.txt b/board/qemu/mips-malta/readme.txt index 21d44e7328..a7709a8f78 100644 --- a/board/qemu/mips-malta/readme.txt +++ b/board/qemu/mips-malta/readme.txt @@ -1,9 +1,9 @@ Run the emulation with: - qemu-system-mips -M malta -kernel output/images/vmlinux -serial stdio -hda output/images/rootfs.ext2 -append "root=/dev/hda" + qemu-system-mips -M malta -kernel output/images/vmlinux -serial stdio -hda output/images/rootfs.ext2 -append "root=/dev/hda" -net nic,model=pcnet -net user 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.4.0 +Tested with QEMU 1.4.2 diff --git a/board/qemu/mips64-malta/linux-3.9.config b/board/qemu/mips64-malta/linux-3.10.config similarity index 100% rename from board/qemu/mips64-malta/linux-3.9.config rename to board/qemu/mips64-malta/linux-3.10.config diff --git a/board/qemu/mips64-malta/readme.txt b/board/qemu/mips64-malta/readme.txt index 332b09e283..923ead53dc 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.4.0 +Tested with QEMU 1.4.2 diff --git a/board/qemu/mipsel-malta/linux-3.9.config b/board/qemu/mipsel-malta/linux-3.10.config similarity index 100% rename from board/qemu/mipsel-malta/linux-3.9.config rename to board/qemu/mipsel-malta/linux-3.10.config diff --git a/board/qemu/mipsel-malta/readme.txt b/board/qemu/mipsel-malta/readme.txt index 54a2c58c0a..fd2c1a4b8a 100644 --- a/board/qemu/mipsel-malta/readme.txt +++ b/board/qemu/mipsel-malta/readme.txt @@ -1,9 +1,9 @@ Run the emulation with: - qemu-system-mipsel -M malta -kernel output/images/vmlinux -serial stdio -hda output/images/rootfs.ext2 -append "root=/dev/hda" + qemu-system-mipsel -M malta -kernel output/images/vmlinux -serial stdio -hda output/images/rootfs.ext2 -append "root=/dev/hda" -net nic,model=pcnet -net user 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.4.0 +Tested with QEMU 1.4.2 diff --git a/board/qemu/powerpc-g3beige/linux-3.8.config b/board/qemu/powerpc-g3beige/linux-3.10.config similarity index 100% rename from board/qemu/powerpc-g3beige/linux-3.8.config rename to board/qemu/powerpc-g3beige/linux-3.10.config diff --git a/board/qemu/powerpc-g3beige/readme.txt b/board/qemu/powerpc-g3beige/readme.txt index 1efbdf08d7..ae7b5e3956 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 + 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 The login prompt will appear in the terminal that started Qemu. The graphical window is the framebuffer. -Tested with QEMU 1.4.0 +Tested with QEMU 1.4.2 diff --git a/board/qemu/powerpc-mpc8544ds/readme.txt b/board/qemu/powerpc-mpc8544ds/readme.txt index 00603fe97b..3ee7bc5ce5 100644 --- a/board/qemu/powerpc-mpc8544ds/readme.txt +++ b/board/qemu/powerpc-mpc8544ds/readme.txt @@ -1,7 +1,7 @@ Run the emulation with: - qemu-system-ppc -M mpc8544ds -kernel output/images/vmlinux -serial stdio + qemu-system-ppc -M mpc8544ds -kernel output/images/vmlinux -serial stdio -net nic,model=e1000 -net user The login prompt will appear in the terminal that started Qemu. -Tested with QEMU 1.4.0 +Tested with QEMU 1.4.2 diff --git a/board/qemu/powerpc-virtex-ml507/readme.txt b/board/qemu/powerpc-virtex-ml507/readme.txt index f59f9c1172..cbee8ae411 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.4.0 +Tested with QEMU 1.4.2 diff --git a/board/qemu/sh4-r2d/readme.txt b/board/qemu/sh4-r2d/readme.txt index 5760f78f83..4a95d042c6 100644 --- a/board/qemu/sh4-r2d/readme.txt +++ b/board/qemu/sh4-r2d/readme.txt @@ -1,8 +1,8 @@ Run the emulation with: - qemu-system-sh4 -M r2d -kernel output/images/zImage -drive file=output/images/rootfs.ext2,if=ide -append "root=/dev/sda console=ttySC1,115200 noiotrap" -serial null -serial stdio + qemu-system-sh4 -M r2d -kernel output/images/zImage -drive file=output/images/rootfs.ext2,if=ide -append "root=/dev/sda console=ttySC1,115200 noiotrap" -serial null -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.4.0 +Tested with QEMU 1.4.2 diff --git a/board/qemu/sparc-ss10/readme.txt b/board/qemu/sparc-ss10/readme.txt index 3f70a0364d..b177c44595 100644 --- a/board/qemu/sparc-ss10/readme.txt +++ b/board/qemu/sparc-ss10/readme.txt @@ -1,8 +1,8 @@ Run the emulation with: - qemu-system-sparc -M SS-10 -kernel output/images/zImage -drive file=output/images/rootfs.ext2 -append "root=/dev/sda console=ttyS0,115200" -serial stdio + qemu-system-sparc -M SS-10 -kernel output/images/zImage -drive file=output/images/rootfs.ext2 -append "root=/dev/sda console=ttyS0,115200" -serial stdio -net nic,model=lance -net user The login prompt will appear in the terminal that started Qemu. The graphical window is the framebuffer. -Tested with QEMU 1.4.0 +Tested with QEMU 1.4.2 diff --git a/board/qemu/x86/linux-3.9.config b/board/qemu/x86/linux-3.10.config similarity index 100% rename from board/qemu/x86/linux-3.9.config rename to board/qemu/x86/linux-3.10.config diff --git a/board/qemu/x86/readme.txt b/board/qemu/x86/readme.txt index 7ada1be04b..b228b412bb 100644 --- a/board/qemu/x86/readme.txt +++ b/board/qemu/x86/readme.txt @@ -1,7 +1,7 @@ Run the emulation with: - qemu-system-i386 -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 -net nic,model=rtl8139 -net user The login prompt will appear in the graphical window. -Tested with QEMU 1.4.0 +Tested with QEMU 1.4.2 diff --git a/board/qemu/x86_64/linux-3.9.config b/board/qemu/x86_64/linux-3.10.config similarity index 100% rename from board/qemu/x86_64/linux-3.9.config rename to board/qemu/x86_64/linux-3.10.config diff --git a/board/qemu/x86_64/readme.txt b/board/qemu/x86_64/readme.txt index 6c81853218..f5a3a127b8 100644 --- a/board/qemu/x86_64/readme.txt +++ b/board/qemu/x86_64/readme.txt @@ -1,7 +1,7 @@ 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-x86_64 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=ide -append root=/dev/sda -net nic,model=rtl8139 -net user The login prompt will appear in the graphical window. -Tested with QEMU 1.4.0 +Tested with QEMU 1.4.2 diff --git a/configs/qemu_arm_nuri_defconfig b/configs/qemu_arm_nuri_defconfig index 27dac27173..26eb81555e 100644 --- a/configs/qemu_arm_nuri_defconfig +++ b/configs/qemu_arm_nuri_defconfig @@ -14,12 +14,13 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttySAC1" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ROOTFS_INITRAMFS=y -# Lock to 3.9 headers to avoid breaking with newer kernels -BR2_KERNEL_HEADERS_3_9=y +# Lock to 3.10 headers to avoid breaking with newer kernels +BR2_KERNEL_HEADERS_VERSION=y +BR2_DEFAULT_KERNEL_VERSION="3.10" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.2" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10" BR2_LINUX_KERNEL_DEFCONFIG="exynos4" BR2_LINUX_KERNEL_ZIMAGE=y diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig index d0f59a2beb..9d5d6fb2ce 100644 --- a/configs/qemu_arm_versatile_defconfig +++ b/configs/qemu_arm_versatile_defconfig @@ -10,13 +10,14 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Lock to 3.9 headers to avoid breaking with newer kernels -BR2_KERNEL_HEADERS_3_9=y +# Lock to 3.10 headers to avoid breaking with newer kernels +BR2_KERNEL_HEADERS_VERSION=y +BR2_DEFAULT_KERNEL_VERSION="3.10" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.2" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-3.9.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-3.10.config" BR2_LINUX_KERNEL_ZIMAGE=y diff --git a/configs/qemu_arm_vexpress_defconfig b/configs/qemu_arm_vexpress_defconfig index 07b629e345..12d1d0b475 100644 --- a/configs/qemu_arm_vexpress_defconfig +++ b/configs/qemu_arm_vexpress_defconfig @@ -14,12 +14,13 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Lock to 3.9 headers to avoid breaking with newer kernels -BR2_KERNEL_HEADERS_3_9=y +# Lock to 3.10 headers to avoid breaking with newer kernels +BR2_KERNEL_HEADERS_VERSION=y +BR2_DEFAULT_KERNEL_VERSION="3.10" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.2" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10" BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_ZIMAGE=y diff --git a/configs/qemu_microblazebe_mmu_defconfig b/configs/qemu_microblazebe_mmu_defconfig index 6bc4d0b610..d3bbdc6210 100644 --- a/configs/qemu_microblazebe_mmu_defconfig +++ b/configs/qemu_microblazebe_mmu_defconfig @@ -19,9 +19,9 @@ BR2_TARGET_ROOTFS_INITRAMFS=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.2" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux-3.9.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux-3.10.config" BR2_LINUX_KERNEL_LINUX_BIN=y BR2_LINUX_KERNEL_USE_CUSTOM_DTS=y BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/qemu/microblazebe-mmu/system.dts" diff --git a/configs/qemu_microblazeel_mmu_defconfig b/configs/qemu_microblazeel_mmu_defconfig index e82b3028a3..05c91e82e1 100644 --- a/configs/qemu_microblazeel_mmu_defconfig +++ b/configs/qemu_microblazeel_mmu_defconfig @@ -19,9 +19,9 @@ BR2_TARGET_ROOTFS_INITRAMFS=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.2" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux-3.9.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux-3.10.config" BR2_LINUX_KERNEL_LINUX_BIN=y BR2_LINUX_KERNEL_USE_CUSTOM_DTS=y BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/qemu/microblazeel-mmu/system.dts" diff --git a/configs/qemu_mips64_malta_defconfig b/configs/qemu_mips64_malta_defconfig index 72c36cc62c..314d968c92 100644 --- a/configs/qemu_mips64_malta_defconfig +++ b/configs/qemu_mips64_malta_defconfig @@ -10,15 +10,16 @@ BR2_PREFER_STATIC_LIB=y BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Lock to 3.9 headers to avoid breaking with newer kernels -BR2_KERNEL_HEADERS_3_9=y +# Lock to 3.10 headers to avoid breaking with newer kernels +BR2_KERNEL_HEADERS_VERSION=y +BR2_DEFAULT_KERNEL_VERSION="3.10" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.2" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux-3.9.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux-3.10.config" BR2_LINUX_KERNEL_VMLINUX=y # Serial port config diff --git a/configs/qemu_mips_malta_defconfig b/configs/qemu_mips_malta_defconfig index 245e36f09d..c98473a981 100644 --- a/configs/qemu_mips_malta_defconfig +++ b/configs/qemu_mips_malta_defconfig @@ -6,15 +6,16 @@ BR2_mips_32r2=y BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Lock to 3.9 headers to avoid breaking with newer kernels -BR2_KERNEL_HEADERS_3_9=y +# Lock to 3.10 headers to avoid breaking with newer kernels +BR2_KERNEL_HEADERS_VERSION=y +BR2_DEFAULT_KERNEL_VERSION="3.10" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.2" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips-malta/linux-3.9.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips-malta/linux-3.10.config" BR2_LINUX_KERNEL_VMLINUX=y # Serial port config diff --git a/configs/qemu_mipsel_malta_defconfig b/configs/qemu_mipsel_malta_defconfig index 80d1ecb494..88377b3721 100644 --- a/configs/qemu_mipsel_malta_defconfig +++ b/configs/qemu_mipsel_malta_defconfig @@ -6,15 +6,16 @@ BR2_mips_32r2=y BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Lock to 3.9 headers to avoid breaking with newer kernels -BR2_KERNEL_HEADERS_3_9=y +# Lock to 3.10 headers to avoid breaking with newer kernels +BR2_KERNEL_HEADERS_VERSION=y +BR2_DEFAULT_KERNEL_VERSION="3.10" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.2" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mipsel-malta/linux-3.9.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mipsel-malta/linux-3.10.config" BR2_LINUX_KERNEL_VMLINUX=y # Serial port config diff --git a/configs/qemu_ppc_g3beige_defconfig b/configs/qemu_ppc_g3beige_defconfig index 4184bea1c4..cf77eed1fc 100644 --- a/configs/qemu_ppc_g3beige_defconfig +++ b/configs/qemu_ppc_g3beige_defconfig @@ -6,15 +6,16 @@ BR2_powerpc_750=y BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Lock to 3.8 headers to avoid breaking with newer kernels -BR2_KERNEL_HEADERS_3_8=y +# Lock to 3.10 headers to avoid breaking with newer kernels +BR2_KERNEL_HEADERS_VERSION=y +BR2_DEFAULT_KERNEL_VERSION="3.10" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.8.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/powerpc-g3beige/linux-3.8.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/powerpc-g3beige/linux-3.10.config" BR2_LINUX_KERNEL_VMLINUX=y # Serial port config diff --git a/configs/qemu_ppc_mpc8544ds_defconfig b/configs/qemu_ppc_mpc8544ds_defconfig index bbb246bd71..b6a2d0d45f 100644 --- a/configs/qemu_ppc_mpc8544ds_defconfig +++ b/configs/qemu_ppc_mpc8544ds_defconfig @@ -6,13 +6,14 @@ BR2_powerpc_8548=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ROOTFS_INITRAMFS=y -# Lock to 3.9 headers to avoid breaking with newer kernels -BR2_KERNEL_HEADERS_3_9=y +# Lock to 3.10 headers to avoid breaking with newer kernels +BR2_KERNEL_HEADERS_VERSION=y +BR2_DEFAULT_KERNEL_VERSION="3.10" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.2" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10" BR2_LINUX_KERNEL_DEFCONFIG="mpc85xx" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_virtex_ml507_defconfig b/configs/qemu_ppc_virtex_ml507_defconfig index 8bd067ebff..f5d50baa26 100644 --- a/configs/qemu_ppc_virtex_ml507_defconfig +++ b/configs/qemu_ppc_virtex_ml507_defconfig @@ -6,8 +6,9 @@ BR2_powerpc_440=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ROOTFS_INITRAMFS=y -# Lock to 3.9 headers to avoid breaking with newer kernels -BR2_KERNEL_HEADERS_3_9=y +# Lock to 3.10 headers to avoid breaking with newer kernels +BR2_KERNEL_HEADERS_VERSION=y +BR2_DEFAULT_KERNEL_VERSION="3.10" # Use soft float BR2_SOFT_FLOAT=y @@ -15,7 +16,7 @@ BR2_SOFT_FLOAT=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.2" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10" BR2_LINUX_KERNEL_DEFCONFIG="44x/virtex5" BR2_LINUX_KERNEL_VMLINUX=y BR2_LINUX_KERNEL_DTS_SUPPORT=y diff --git a/configs/qemu_sh4_r2d_defconfig b/configs/qemu_sh4_r2d_defconfig index 469ab28aaf..7fc649b217 100644 --- a/configs/qemu_sh4_r2d_defconfig +++ b/configs/qemu_sh4_r2d_defconfig @@ -10,8 +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 +# Lock to 3.2 headers to avoid breaking with newer kernels +BR2_KERNEL_HEADERS_VERSION=y +BR2_DEFAULT_KERNEL_VERSION="3.2.47" # The kernel wants to use the -m4-nofpu option to make sure that it # doesn't use floating point operations. @@ -20,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.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.47" 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 diff --git a/configs/qemu_sparc_ss10_defconfig b/configs/qemu_sparc_ss10_defconfig index 7e58a0f456..33f0b213b1 100644 --- a/configs/qemu_sparc_ss10_defconfig +++ b/configs/qemu_sparc_ss10_defconfig @@ -6,8 +6,9 @@ BR2_sparc_v8=y BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Lock to 3.4 headers to avoid breaking with newer kernels -BR2_KERNEL_HEADERS_3_4=y +# Lock to 3.7 headers to avoid breaking with newer kernels +BR2_KERNEL_HEADERS_VERSION=y +BR2_DEFAULT_KERNEL_VERSION="3.7.10" # Linux kernel BR2_LINUX_KERNEL=y diff --git a/configs/qemu_x86_64_defconfig b/configs/qemu_x86_64_defconfig index 1768eeea05..c2d56ab847 100644 --- a/configs/qemu_x86_64_defconfig +++ b/configs/qemu_x86_64_defconfig @@ -9,12 +9,13 @@ BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Lock to 3.9 headers to avoid breaking with newer kernels -BR2_KERNEL_HEADERS_3_9=y +# Lock to 3.10 headers to avoid breaking with newer kernels +BR2_KERNEL_HEADERS_VERSION=y +BR2_DEFAULT_KERNEL_VERSION="3.10" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.2" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-3.9.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-3.10.config" diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig index 244bd8ab1d..d7731c697b 100644 --- a/configs/qemu_x86_defconfig +++ b/configs/qemu_x86_defconfig @@ -10,12 +10,13 @@ BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Lock to 3.9 headers to avoid breaking with newer kernels -BR2_KERNEL_HEADERS_3_9=y +# Lock to 3.10 headers to avoid breaking with newer kernels +BR2_KERNEL_HEADERS_VERSION=y +BR2_DEFAULT_KERNEL_VERSION="3.10" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.2" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.9.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.10.config" -- 2.30.2