diff options
| author | California Sullivan <california.l.sullivan@intel.com> | 2017-02-28 16:03:55 -0800 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2017-03-07 12:23:50 -0800 |
| commit | 8ce207d4d7c329b93c0be2f6733ddc47172dca18 (patch) | |
| tree | 0dc59b4b5d0ffcfccf1a6f593077b81347e2df38 /common | |
| parent | ce81e55f62f22f662e3466593c9434a46142f3c5 (diff) | |
| download | meta-intel-8ce207d4d7c329b93c0be2f6733ddc47172dca18.tar.gz | |
linux-yocto/4.1: Leafhill config changes and yaffs2 fixes
>From linux-yocto-4.1:
eb11ab9 Merge branch 'standard/base' into standard/intel/base
34753ac fs/yaffs2: adjust to the change of inode_change_ok()
3c7cacb Merge branch 'standard/base' into standard/intel/base
aadda25 integrity: define '.evm' as a builtin 'trusted' keyring
>From yocto-kernel-cache:
46b3153 bsp/leafhill: fix warning on kernel config
9e5339a bsp/leafhill: disable dual role and enable gadget role for USB
1ebecac bsp/leafhill: enable ISH client for debugging and calibration
8f9c57f action-s500:Update kernel configuration fragment
Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'common')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-rt_4.1.bbappend | 4 | ||||
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend | 4 | ||||
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto_4.1.bbappend | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-rt_4.1.bbappend b/common/recipes-kernel/linux/linux-yocto-rt_4.1.bbappend index 11bc0f1d..2ce8c65f 100644 --- a/common/recipes-kernel/linux/linux-yocto-rt_4.1.bbappend +++ b/common/recipes-kernel/linux/linux-yocto-rt_4.1.bbappend | |||
| @@ -1,8 +1,8 @@ | |||
| 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
| 2 | 2 | ||
| 3 | LINUX_VERSION_INTEL_COMMON = "4.1.37" | 3 | LINUX_VERSION_INTEL_COMMON = "4.1.37" |
| 4 | SRCREV_META_INTEL_COMMON ?= "4de9b8f96c8dca0c55a496792a2ad4d2776e6657" | 4 | SRCREV_META_INTEL_COMMON ?= "46b3153a39950b3542a99486bd964ab2ed65aeb4" |
| 5 | SRCREV_MACHINE_INTEL_COMMON ?= "890acfa0df319ea3ff1472bd6abe5b7d91fbd2d6" | 5 | SRCREV_MACHINE_INTEL_COMMON ?= "abbb5bc512f7798a6676c49e66bb9c795f69ae07" |
| 6 | 6 | ||
| 7 | KBRANCH_INTEL_COMMON = "standard/preempt-rt/intel/base" | 7 | KBRANCH_INTEL_COMMON = "standard/preempt-rt/intel/base" |
| 8 | 8 | ||
diff --git a/common/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend b/common/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend index 13ab2b5d..60eb586c 100644 --- a/common/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend +++ b/common/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend | |||
| @@ -1,8 +1,8 @@ | |||
| 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
| 2 | 2 | ||
| 3 | LINUX_VERSION_i586-nlp-32-intel-common = "4.1.37" | 3 | LINUX_VERSION_i586-nlp-32-intel-common = "4.1.37" |
| 4 | SRCREV_meta_i586-nlp-32-intel-common = "4de9b8f96c8dca0c55a496792a2ad4d2776e6657" | 4 | SRCREV_meta_i586-nlp-32-intel-common = "46b3153a39950b3542a99486bd964ab2ed65aeb4" |
| 5 | SRCREV_machine_i586-nlp-32-intel-common = "ea1c55e4260e8303839791de0ccadff26349d657" | 5 | SRCREV_machine_i586-nlp-32-intel-common = "86a10ee9f4562882a0f74c1aacd195f46e9f2f53" |
| 6 | 6 | ||
| 7 | COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}" | 7 | COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}" |
| 8 | KBRANCH_i586-nlp-32-intel-common = "standard/tiny/intel/base" | 8 | KBRANCH_i586-nlp-32-intel-common = "standard/tiny/intel/base" |
diff --git a/common/recipes-kernel/linux/linux-yocto_4.1.bbappend b/common/recipes-kernel/linux/linux-yocto_4.1.bbappend index 3cd364e7..7844de6c 100644 --- a/common/recipes-kernel/linux/linux-yocto_4.1.bbappend +++ b/common/recipes-kernel/linux/linux-yocto_4.1.bbappend | |||
| @@ -1,8 +1,8 @@ | |||
| 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
| 2 | 2 | ||
| 3 | LINUX_VERSION_INTEL_COMMON = "4.1.37" | 3 | LINUX_VERSION_INTEL_COMMON = "4.1.37" |
| 4 | SRCREV_META_INTEL_COMMON = "4de9b8f96c8dca0c55a496792a2ad4d2776e6657" | 4 | SRCREV_META_INTEL_COMMON = "46b3153a39950b3542a99486bd964ab2ed65aeb4" |
| 5 | SRCREV_MACHINE_INTEL_COMMON = "b145b65147602680fd7edab35a089ed4565b32b8" | 5 | SRCREV_MACHINE_INTEL_COMMON = "eb11ab906651e42e22e0a23f57b3b858cf9fd66c" |
| 6 | 6 | ||
| 7 | KBRANCH_INTEL_COMMON = "standard/intel/base" | 7 | KBRANCH_INTEL_COMMON = "standard/intel/base" |
| 8 | 8 | ||