From 332687c8fdf9720dd7ccfe188a38a353def88c0b Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Sun, 7 Jul 2013 19:34:07 -0300 Subject: 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 --- 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 +++++---- 15 files changed, 62 insertions(+), 49 deletions(-) (limited to 'configs') diff --git a/configs/qemu_arm_nuri_defconfig b/configs/qemu_arm_nuri_defconfig index 27dac2717..26eb81555 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 d0f59a2be..9d5d6fb2c 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 07b629e34..12d1d0b47 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 6bc4d0b61..d3bbdc621 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 e82b3028a..05c91e82e 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 72c36cc62..314d968c9 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 245e36f09..c98473a98 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 80d1ecb49..88377b372 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 4184bea1c..cf77eed1f 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 bbb246bd7..b6a2d0d45 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 8bd067ebf..f5d50baa2 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 469ab28aa..7fc649b21 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 7e58a0f45..33f0b213b 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 1768eeea0..c2d56ab84 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 244bd8ab1..d7731c697 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" -- cgit v1.2.3