[linux-yocto] [PATCH] meta: features/drm-gma500: merge in GMA600, add GMA3600

[Bruce Ashfield]

On 13-08-22 05:22 AM, Ross Burton wrote:
> Enable GMA3600 (as used in the Cedar Trail platform), and merge in the GMA600
> fragment.

Looks good to me. I've queued it here for 3.8 and 3.10.

Bruce

>
> Signed-off-by: Ross Burton <ross.burton at intel.com>
> ---
>   meta/cfg/kernel-cache/features/drm-gma500/drm-gma500.cfg |    4 +++-
>   meta/cfg/kernel-cache/features/drm-gma500/drm-gma600.cfg |    1 -
>   meta/cfg/kernel-cache/features/drm-gma500/drm-gma600.scc |    3 ---
>   3 files changed, 3 insertions(+), 5 deletions(-)
>   delete mode 100644 meta/cfg/kernel-cache/features/drm-gma500/drm-gma600.cfg
>   delete mode 100644 meta/cfg/kernel-cache/features/drm-gma500/drm-gma600.scc
>
> diff --git a/meta/cfg/kernel-cache/features/drm-gma500/drm-gma500.cfg b/meta/cfg/kernel-cache/features/drm-gma500/drm-gma500.cfg
> index 7c8a071..e41c993 100644
> --- a/meta/cfg/kernel-cache/features/drm-gma500/drm-gma500.cfg
> +++ b/meta/cfg/kernel-cache/features/drm-gma500/drm-gma500.cfg
> @@ -1,3 +1,5 @@
>   CONFIG_DRM=y
> -CONFIG_DRM_GMA500=y
>   CONFIG_DRM_KMS_HELPER=y
> +CONFIG_DRM_GMA500=y
> +CONFIG_DRM_GMA600=y
> +CONFIG_DRM_GMA3600=y
> diff --git a/meta/cfg/kernel-cache/features/drm-gma500/drm-gma600.cfg b/meta/cfg/kernel-cache/features/drm-gma500/drm-gma600.cfg
> deleted file mode 100644
> index cd0fa4e..0000000
> --- a/meta/cfg/kernel-cache/features/drm-gma500/drm-gma600.cfg
> +++ /dev/null
> @@ -1 +0,0 @@
> -CONFIG_DRM_GMA600=y
> diff --git a/meta/cfg/kernel-cache/features/drm-gma500/drm-gma600.scc b/meta/cfg/kernel-cache/features/drm-gma500/drm-gma600.scc
> deleted file mode 100644
> index a3388bc..0000000
> --- a/meta/cfg/kernel-cache/features/drm-gma500/drm-gma600.scc
> +++ /dev/null
> @@ -1,3 +0,0 @@
> -kconf hardware drm-gma600.cfg
> -
> -include features/drm-gma500/drm-gma500.scc
>