diff options
author | California Sullivan <california.l.sullivan@intel.com> | 2017-06-26 13:28:51 -0700 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2017-06-26 14:03:11 -0700 |
commit | cebe15d153ab982f80f3f86fea38a0978dfc1f28 (patch) | |
tree | f959e7c77525ce24ffe117e10e9fa3e35caa308d /common | |
parent | a0ca03a32bbe5cbc8433330c28f2044d0ff30ae8 (diff) | |
download | meta-intel-cebe15d153ab982f80f3f86fea38a0978dfc1f28.tar.gz |
Revert "linux-yocto/4.9: Remove bbappends"
This reverts commit de9c533d739bf1584c73fe4e35ecb886fd5c1784.
Removing this completely makes it much more difficult to use layers that
depend on linux-yocto. Keep the default 4.9 kernel as linux-intel, but
have linux-yocto available as an option.
Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'common')
3 files changed, 65 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-rt_4.9.bbappend b/common/recipes-kernel/linux/linux-yocto-rt_4.9.bbappend new file mode 100644 index 00000000..9d2e3c0b --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-rt_4.9.bbappend | |||
@@ -0,0 +1,13 @@ | |||
1 | KERNEL_FEATURES_INTEL_COMMON = "" | ||
2 | |||
3 | COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" | ||
4 | KMACHINE_core2-32-intel-common = "intel-core2-32" | ||
5 | KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | ||
6 | |||
7 | COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" | ||
8 | KMACHINE_corei7-64-intel-common = "intel-corei7-64" | ||
9 | KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | ||
10 | |||
11 | COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}" | ||
12 | KMACHINE_i586-nlp-32-intel-common = "intel-quark" | ||
13 | KERNEL_FEATURES_append_i586-nlp-32-intel-common = "" | ||
diff --git a/common/recipes-kernel/linux/linux-yocto-tiny_4.9.bbappend b/common/recipes-kernel/linux/linux-yocto-tiny_4.9.bbappend new file mode 100644 index 00000000..602670e6 --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-tiny_4.9.bbappend | |||
@@ -0,0 +1,31 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
2 | |||
3 | EXTRA_OEMAKE = "LD=${STAGING_BINDIR_NATIVE}/${HOST_SYS}/${TARGET_PREFIX}ld AR=${STAGING_BINDIR_NATIVE}/${HOST_SYS}/${TARGET_PREFIX}gcc-ar" | ||
4 | |||
5 | LINUX_VERSION_i586-nlp-32-intel-common = "4.9.13" | ||
6 | LINUX_VERSION_core2-32-intel-common = "4.9.13" | ||
7 | LINUX_VERSION_corei7-64-intel-common = "4.9.13" | ||
8 | |||
9 | SRCREV_meta_i586-nlp-32-intel-common = "8f3bc608ae61c5333043167fa31bac33be93c3de" | ||
10 | SRCREV_meta_core2-32-intel-common = "8f3bc608ae61c5333043167fa31bac33be93c3de" | ||
11 | SRCREV_meta_corei7-64-intel-common = "8f3bc608ae61c5333043167fa31bac33be93c3de" | ||
12 | |||
13 | SRCREV_machine_i586-nlp-32-intel-common = "95c0a80ee83f1cf8e59d733f36e8a9dfd50a0098" | ||
14 | SRCREV_machine_core2-32-intel-common = "95c0a80ee83f1cf8e59d733f36e8a9dfd50a0098" | ||
15 | SRCREV_machine_corei7-64-intel-common = "95c0a80ee83f1cf8e59d733f36e8a9dfd50a0098" | ||
16 | |||
17 | COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}" | ||
18 | COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" | ||
19 | COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" | ||
20 | |||
21 | KBRANCH_i586-nlp-32-intel-common = "standard/tiny/base" | ||
22 | KBRANCH_core2-32-intel-common = "standard/tiny/base" | ||
23 | KBRANCH_corei7-64-intel-common = "standard/tiny/base" | ||
24 | |||
25 | KMACHINE_i586-nlp-32-intel-common = "intel-quark" | ||
26 | KMACHINE_core2-32-intel-common = "intel-core2-32" | ||
27 | KMACHINE_corei7-64-intel-common = "intel-corei7-64" | ||
28 | |||
29 | KERNEL_FEATURES_append_i586-nlp-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON} cfg/fs/ext4.scc" | ||
30 | KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON} cfg/fs/ext4.scc" | ||
31 | KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON} cfg/fs/ext4.scc" | ||
diff --git a/common/recipes-kernel/linux/linux-yocto_4.9.bbappend b/common/recipes-kernel/linux/linux-yocto_4.9.bbappend new file mode 100644 index 00000000..a09fe1a4 --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto_4.9.bbappend | |||
@@ -0,0 +1,21 @@ | |||
1 | KERNEL_FEATURES_INTEL_COMMON = "" | ||
2 | |||
3 | COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" | ||
4 | KMACHINE_core2-32-intel-common = "intel-core2-32" | ||
5 | KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | ||
6 | |||
7 | COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" | ||
8 | KMACHINE_corei7-64-intel-common = "intel-corei7-64" | ||
9 | KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | ||
10 | |||
11 | COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}" | ||
12 | KMACHINE_i586-nlp-32-intel-common = "intel-quark" | ||
13 | KERNEL_FEATURES_append_i586-nlp-32-intel-common = "" | ||
14 | |||
15 | # For Crystalforest and Romley | ||
16 | KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " uio" | ||
17 | KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " uio" | ||
18 | |||
19 | # For FRI2, NUC | ||
20 | KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " iwlwifi" | ||
21 | KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " iwlwifi" | ||