diff options
author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2014-01-16 14:05:52 -0800 |
---|---|---|
committer | Tom Zanussi <tom.zanussi@intel.com> | 2014-01-20 09:15:28 -0600 |
commit | d8c1d14f9e0a87a0b4357b8764a0df40cc22f789 (patch) | |
tree | b191d3c23efc6e7c9d252ba85e6f061876d8b00d /meta-emenlow/recipes-kernel | |
parent | 381f53495e662454873ff858e4d40a64e3b20a55 (diff) | |
download | meta-intel-d8c1d14f9e0a87a0b4357b8764a0df40cc22f789.tar.gz |
meta-emenlow: Fix gma500 kernel feature name for v3.8 & dev kernels1.6_M2
The gma600 feature has been merged into the gma500 feature in the
linux-yocto kernel repository. The kernel recipes need to use the
gma500 feature instead of the removed gma600 feature.
Fixes bug:
[YOCTO #5699]
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Diffstat (limited to 'meta-emenlow/recipes-kernel')
-rw-r--r-- | meta-emenlow/recipes-kernel/linux/linux-yocto-dev.bbappend | 2 | ||||
-rw-r--r-- | meta-emenlow/recipes-kernel/linux/linux-yocto_3.8.bbappend | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta-emenlow/recipes-kernel/linux/linux-yocto-dev.bbappend b/meta-emenlow/recipes-kernel/linux/linux-yocto-dev.bbappend index 00ab0fd7..e540b2fc 100644 --- a/meta-emenlow/recipes-kernel/linux/linux-yocto-dev.bbappend +++ b/meta-emenlow/recipes-kernel/linux/linux-yocto-dev.bbappend | |||
@@ -8,7 +8,7 @@ KERNEL_FEATURES_append_emenlow = " features/drm-emgd/drm-emgd-1.16 cfg/vesafb" | |||
8 | COMPATIBLE_MACHINE_emenlow-noemgd = "emenlow-noemgd" | 8 | COMPATIBLE_MACHINE_emenlow-noemgd = "emenlow-noemgd" |
9 | KMACHINE_emenlow-noemgd = "emenlow" | 9 | KMACHINE_emenlow-noemgd = "emenlow" |
10 | KBRANCH_emenlow-noemgd = "standard/emenlow" | 10 | KBRANCH_emenlow-noemgd = "standard/emenlow" |
11 | KERNEL_FEATURES_append_emenlow-noemgd = " features/drm-gma500/drm-gma600" | 11 | KERNEL_FEATURES_append_emenlow-noemgd = " features/drm-gma500/drm-gma500" |
12 | 12 | ||
13 | SRCREV_machine_emenlow = "60536206ad300ccf5b2be2c2d449f4ab27170238" | 13 | SRCREV_machine_emenlow = "60536206ad300ccf5b2be2c2d449f4ab27170238" |
14 | SRCREV_meta_emenlow = "fe20c99783387dab779472ff50a88666da1c6391" | 14 | SRCREV_meta_emenlow = "fe20c99783387dab779472ff50a88666da1c6391" |
diff --git a/meta-emenlow/recipes-kernel/linux/linux-yocto_3.8.bbappend b/meta-emenlow/recipes-kernel/linux/linux-yocto_3.8.bbappend index ad2bc649..14a2bb08 100644 --- a/meta-emenlow/recipes-kernel/linux/linux-yocto_3.8.bbappend +++ b/meta-emenlow/recipes-kernel/linux/linux-yocto_3.8.bbappend | |||
@@ -8,7 +8,7 @@ KERNEL_FEATURES_append_emenlow = " features/drm-emgd/drm-emgd-1.18 cfg/vesafb" | |||
8 | COMPATIBLE_MACHINE_emenlow-noemgd = "emenlow-noemgd" | 8 | COMPATIBLE_MACHINE_emenlow-noemgd = "emenlow-noemgd" |
9 | KMACHINE_emenlow-noemgd = "emenlow" | 9 | KMACHINE_emenlow-noemgd = "emenlow" |
10 | KBRANCH_emenlow-noemgd = "standard/emenlow" | 10 | KBRANCH_emenlow-noemgd = "standard/emenlow" |
11 | KERNEL_FEATURES_append_emenlow-noemgd = " features/drm-gma500/drm-gma600" | 11 | KERNEL_FEATURES_append_emenlow-noemgd = " features/drm-gma500/drm-gma500" |
12 | 12 | ||
13 | LINUX_VERSION = "3.8.13" | 13 | LINUX_VERSION = "3.8.13" |
14 | 14 | ||