[meta-xilinx] [meta-xilinx 05/14] feature-microblaze-versions.inc: Update to v9.6

[Nathan Rossi]

On Tue, May 3, 2016 at 10:57 AM, Manjukumar Matha
<manjukumar.harthikote-matha at xilinx.com> wrote:
> Update the conflict list for v9.6
>
> Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha at xilinx.com>
> ---
>  conf/machine/include/microblaze/feature-microblaze-versions.inc | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/conf/machine/include/microblaze/feature-microblaze-versions.inc b/conf/machine/include/microblaze/feature-microblaze-versions.inc
> index 24181cc..c674ba2 100644
> --- a/conf/machine/include/microblaze/feature-microblaze-versions.inc
> +++ b/conf/machine/include/microblaze/feature-microblaze-versions.inc
> @@ -9,6 +9,7 @@ require conf/machine/include/microblaze/feature-microblaze-v7.inc
>
>  # Setup a 'feature set' conflict list which ensures only one version is selected
>  # when defining the TUNE_FEATURES_tune-<>  in local.conf file.
> +TUNECONFLICTS[v9.6]  += "v7.30 v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0"
>  TUNECONFLICTS[v9.0]  += "v7.30 v8.00 v8.10 v8.20 v8.30 v8.40 v8.50"
>  TUNECONFLICTS[v8.50] += "v7.30 v8.00 v8.10 v8.20 v8.30 v8.40 v9.0"
>  TUNECONFLICTS[v8.40] += "v7.30 v8.00 v8.10 v8.20 v8.30 v8.50 v9.0"

For completeness of the conflicts could you add v9.6 as a conflict on
the other versions. Also you can squish this and patch 04/14 into a
single patch as they are directly related.

Regards,
Nathan

> --
> 2.1.4
>
> --
> _______________________________________________
> meta-xilinx mailing list
> meta-xilinx at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-xilinx