From f058b238870d3ebbd845b8b73b0bbfb96102f913 Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Wed, 12 Mar 2014 12:15:13 -0700 Subject: emenlow: Update linux-yocto 3.10 SRCREV (3.10.25) Update the commit of the machine branch standard/base to 3.10.25 commit. After 3.10.25 the LTSI changes are causing kernel panic at boot on emenlow. A fix for this boot issue is out, but not yet integrated in to the LTSI kernel. Once the LTSI kernel has the fix, the emenlow 3.10 kernel can be updated to the latest 3.10 LTSI kernel. This also works around an open issue with do_validate_branches where feature branches are reset the HEAD of the machine branch if they contain that commit. Signed-off-by: Nitin A Kamble Acked-by: Darren Hart --- meta-emenlow/recipes-kernel/linux/linux-yocto_3.10.bbappend | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/meta-emenlow/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-emenlow/recipes-kernel/linux/linux-yocto_3.10.bbappend index 60757838..3bf0182b 100644 --- a/meta-emenlow/recipes-kernel/linux/linux-yocto_3.10.bbappend +++ b/meta-emenlow/recipes-kernel/linux/linux-yocto_3.10.bbappend @@ -11,13 +11,13 @@ KMACHINE_emenlow-noemgd = "emenlow" KBRANCH_emenlow-noemgd = "standard/emenlow" KERNEL_FEATURES_append_emenlow-noemgd = " features/drm-gma500/drm-gma500" -LINUX_VERSION = "3.10.19" +LINUX_VERSION = "3.10.25" -SRCREV_meta_emenlow = "d9cd83c0292bd4e2a6754a96761027252e726a42" -SRCREV_machine_emenlow = "a9ec82e355130160f9094e670bd5be0022a84194" -SRCREV_emgd_emenlow = "39c44dd7838bfd228938219cdb21ca30c4d0cbbf" +SRCREV_meta_emenlow = "df3aa753c8826127fb5ad811d56d57168551d6e4" +SRCREV_machine_emenlow = "79af968f2f26378798aec7a6d729ff5a371aae5f" +SRCREV_emgd_emenlow = "42d5e4548e8e79e094fa8697949eed4cf6af00a3" -SRCREV_meta_emenlow-noemgd = "d9cd83c0292bd4e2a6754a96761027252e726a42" -SRCREV_machine_emenlow-noemgd = "a9ec82e355130160f9094e670bd5be0022a84194" +SRCREV_meta_emenlow-noemgd = "df3aa753c8826127fb5ad811d56d57168551d6e4" +SRCREV_machine_emenlow-noemgd = "79af968f2f26378798aec7a6d729ff5a371aae5f" SRC_URI_emenlow = "git://git.yoctoproject.org/linux-yocto-3.10.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA},emgd-1.18;name=machine,meta,emgd" -- cgit v1.2.3-54-g00ecf From c9c60927921d566933bd743545dd8fddcb6c839e Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Mon, 17 Mar 2014 09:33:25 -0700 Subject: crownbay: Update linux-yocto 3.10 SRCREV (3.10.34-LTSI) Update to the HEAD of standard/base (3.10.34-LTSI). This also works around an open issue with do_validate_branches where feature branches are reset the HEAD of the machine branch if they contain that commit. Signed-off-by: Nitin A Kamble Acked-by: Darren Hart --- meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend index 37cf96e5..1b7ff84c 100644 --- a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend +++ b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend @@ -11,13 +11,13 @@ KMACHINE_crownbay-noemgd = "crownbay" KBRANCH_crownbay-noemgd = "standard/crownbay" KERNEL_FEATURES_append_crownbay-noemgd = " cfg/vesafb" -LINUX_VERSION = "3.10.32" +LINUX_VERSION = "3.10.34" -SRCREV_meta_crownbay = "6e0e756d51372c8b176c5d1e6f786545bceed351" -SRCREV_machine_crownbay = "78afd3095c9b37efbbfbfdc25eb3833ef3c6a718" +SRCREV_meta_crownbay = "df3aa753c8826127fb5ad811d56d57168551d6e4" +SRCREV_machine_crownbay = "c7739be126930006e3bfbdb2fb070a967abc5e09" SRCREV_emgd_crownbay = "42d5e4548e8e79e094fa8697949eed4cf6af00a3" -SRCREV_meta_crownbay-noemgd = "6e0e756d51372c8b176c5d1e6f786545bceed351" -SRCREV_machine_crownbay-noemgd = "78afd3095c9b37efbbfbfdc25eb3833ef3c6a718" +SRCREV_meta_crownbay-noemgd = "df3aa753c8826127fb5ad811d56d57168551d6e4" +SRCREV_machine_crownbay-noemgd = "c7739be126930006e3bfbdb2fb070a967abc5e09" SRC_URI_crownbay = "git://git.yoctoproject.org/linux-yocto-3.10.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA},emgd-1.18;name=machine,meta,emgd" -- cgit v1.2.3-54-g00ecf From a1f18ba02f495d62918d9b460020998253fe3b58 Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Sun, 30 Mar 2014 19:21:33 -0700 Subject: fri2: Update linux-yocto 3.10 SRCREV (3.10.34-LTSI) Update to the HEAD of standard/base (3.10.34-LTSI). Signed-off-by: Nitin A Kamble Acked-by: Darren Hart --- meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend index 4b81b610..07eaa2a4 100644 --- a/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend +++ b/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend @@ -1,13 +1,13 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -LINUX_VERSION = "3.10.33" +LINUX_VERSION = "3.10.34" COMPATIBLE_MACHINE_fri2 = "fri2" KMACHINE_fri2 = "fri2" KBRANCH_fri2 = "standard/fri2" KERNEL_FEATURES_append_fri2 = " features/drm-emgd/drm-emgd-1.18 cfg/vesafb" -SRCREV_meta_fri2 = "99c503a92885060bebf2bba6747735e8e9346a40" -SRCREV_machine_fri2 = "21df0c8486e129a4087970a07b423c533ae05de7" +SRCREV_meta_fri2 = "df3aa753c8826127fb5ad811d56d57168551d6e4" +SRCREV_machine_fri2 = "c7739be126930006e3bfbdb2fb070a967abc5e09" SRCREV_emgd_fri2 = "42d5e4548e8e79e094fa8697949eed4cf6af00a3" SRC_URI_fri2 = "git://git.yoctoproject.org/linux-yocto-3.10.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA},emgd-1.18;name=machine,meta,emgd" @@ -15,8 +15,8 @@ COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd" KMACHINE_fri2-noemgd = "fri2" KBRANCH_fri2-noemgd = "standard/fri2" KERNEL_FEATURES_append_fri2-noemgd = " cfg/vesafb" -SRCREV_meta_fri2-noemgd = "99c503a92885060bebf2bba6747735e8e9346a40" -SRCREV_machine_fri2-noemgd = "21df0c8486e129a4087970a07b423c533ae05de7" +SRCREV_meta_fri2-noemgd = "df3aa753c8826127fb5ad811d56d57168551d6e4" +SRCREV_machine_fri2-noemgd = "c7739be126930006e3bfbdb2fb070a967abc5e09" module_autoload_iwlwifi = "iwlwifi" -- cgit v1.2.3-54-g00ecf From 192ba6dd4ceb7c1de86bddccb8b803ceaa54d513 Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Sun, 30 Mar 2014 19:16:11 -0700 Subject: common: Update linux-yocto 3.10 SRCREV (3.10.34-LTSI) Update to the HEAD of standard/base (3.10.34-LTSI). This also works around an open issue with do_validate_branches where feature branches are reset the HEAD of the machine branch if they contain that commit. Signed-off-by: Nitin A Kamble Reviewed-by: Darren Hart --- common/recipes-kernel/linux/linux-yocto_3.10.bbappend | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/common/recipes-kernel/linux/linux-yocto_3.10.bbappend b/common/recipes-kernel/linux/linux-yocto_3.10.bbappend index 650919f6..5a740b5b 100644 --- a/common/recipes-kernel/linux/linux-yocto_3.10.bbappend +++ b/common/recipes-kernel/linux/linux-yocto_3.10.bbappend @@ -1,19 +1,20 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +# For NUC KERNEL_FEATURES_INTEL_COMMON += "features/amt/mei/mei.scc" -LINUX_VERSION_core2-32-intel-common = "3.10.33" +LINUX_VERSION_core2-32-intel-common = "3.10.34" COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" -SRCREV_meta_core2-32-intel-common = "99c503a92885060bebf2bba6747735e8e9346a40" -SRCREV_machine_core2-32-intel-common = "21df0c8486e129a4087970a07b423c533ae05de7" +SRCREV_meta_core2-32-intel-common = "df3aa753c8826127fb5ad811d56d57168551d6e4" +SRCREV_machine_core2-32-intel-common = "c7739be126930006e3bfbdb2fb070a967abc5e09" KMACHINE_core2-32-intel-common = "intel-core2-32" KBRANCH_core2-32-intel-common = "standard/base" KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" -LINUX_VERSION_corei7-64-intel-common = "3.10.33" +LINUX_VERSION_corei7-64-intel-common = "3.10.34" COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" -SRCREV_meta_corei7-64-intel-common = "99c503a92885060bebf2bba6747735e8e9346a40" -SRCREV_machine_corei7-64-intel-common = "21df0c8486e129a4087970a07b423c533ae05de7" +SRCREV_meta_corei7-64-intel-common = "df3aa753c8826127fb5ad811d56d57168551d6e4" +SRCREV_machine_corei7-64-intel-common = "c7739be126930006e3bfbdb2fb070a967abc5e09" KMACHINE_intel-corei7-64-intel-common = "intel-corei7-64" KBRANCH_intel-corei7-64-intel-common = "standard/base" KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" @@ -21,5 +22,5 @@ KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON} # For Crystalforest and Romley module_autoload_uio = "uio" -# For FRI2 +# For FRI2, NUC module_autoload_iwlwifi = "iwlwifi" -- cgit v1.2.3-54-g00ecf From 185ac2bc78f4c23c2023b5ecad3a21e3f3fc34de Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Wed, 12 Mar 2014 12:17:57 -0700 Subject: nuc: Update linux-yocto 3.10 SRCREV (3.10.34-LTSI) Update to the HEAD of standard/base (3.10.34-LTSI). This also works around an open issue with do_validate_branches where feature branches are reset the HEAD of the machine branch if they contain that commit. The common linux-yocto_3.10 kernel is not able to find root device on the NUC platform. Hence the NUC BSP is not yet updated to use the common kernel. Signed-off-by: Nitin A Kamble Acked-by: Darren Hart --- meta-nuc/recipes-kernel/linux/linux-yocto_3.10.bbappend | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-nuc/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-nuc/recipes-kernel/linux/linux-yocto_3.10.bbappend index ec67460a..50f8561c 100644 --- a/meta-nuc/recipes-kernel/linux/linux-yocto_3.10.bbappend +++ b/meta-nuc/recipes-kernel/linux/linux-yocto_3.10.bbappend @@ -3,13 +3,13 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" COMPATIBLE_MACHINE_nuc = "nuc" KMACHINE_nuc = "chiefriver" -KBRANCH_nuc = "standard/common-pc-64/chiefriver" +KBRANCH_nuc = "standard/base" KERNEL_FEATURES_append_nuc = " features/amt/mei/mei.scc wifi" -LINUX_VERSION = "3.10.19" +LINUX_VERSION = "3.10.34" -SRCREV_meta_nuc = "d9cd83c0292bd4e2a6754a96761027252e726a42" -SRCREV_machine_nuc = "a9ec82e355130160f9094e670bd5be0022a84194" +SRCREV_meta_nuc = "df3aa753c8826127fb5ad811d56d57168551d6e4" +SRCREV_machine_nuc = "c7739be126930006e3bfbdb2fb070a967abc5e09" module_autoload_iwlwifi_nuc = "iwlwifi" -- cgit v1.2.3-54-g00ecf