diff options
| author |   Stephen Lawrence <stephen.lawrence@renesas.com> | 2016-01-20 16:52:54 +0000 |
|---|---|---|
| committer | Stephen Lawrence <stephen.lawrence@renesas.com> | 2016-01-20 16:52:54 +0000 |
| commit | e533bf0221e7e377172de8676d04c908c6151b93 (patch) | |
| tree | 0a4d868bb6162a8480bcc3172e54889bbce90330 /meta-rcar-gen2/conf/machine/include/r8a7791.inc | |
| parent | 632f4b7e7c05dbe7bbcad0474ebe65b84446aad8 (diff) | |
multimedia: Set PREFERRED_VERSION for gstreamer1.0-* to 1.2.% for all Gen 2 boards
Currently for boards using the R-Car M2 SoC such as M2 Porter and M2 Koelsch the
PREFERRED_VERSION for gstreamer1.0-* is set to 1.2.% when multimedia h/w acceleration
is enabled. Move those statements into the include for R-Car Gen 2 default providers
so they apply to all Gen 2 boards.
Diffstat (limited to 'meta-rcar-gen2/conf/machine/include/r8a7791.inc')
| -rw-r--r-- | meta-rcar-gen2/conf/machine/include/r8a7791.inc | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/meta-rcar-gen2/conf/machine/include/r8a7791.inc b/meta-rcar-gen2/conf/machine/include/r8a7791.inc index f77c74a..d831024 100644 --- a/meta-rcar-gen2/conf/machine/include/r8a7791.inc +++ b/meta-rcar-gen2/conf/machine/include/r8a7791.inc @@ -2,7 +2,6 @@ SOC_FAMILY = "rcar-gen2:r8a7791" require conf/machine/include/soc-family.inc DEFAULTTUNE ?= "cortexa15hf-neon" require conf/machine/include/tune-cortexa15.inc -require ../../../include/multimedia-control.inc PREFERRED_PROVIDER_virtual/kernel ?= "linux-renesas" PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers" @@ -11,12 +10,3 @@ PREFERRED_PROVIDER_u-boot ?= "u-boot" KERNEL_IMAGETYPE ?= "uImage" EXTRA_IMAGEDEPENDS += "u-boot" - -# multimedia acceleration uses Gst version 1.2.x, otherwise meta-ivi currently uses 1.4.x -PREFERRED_VERSION_gstreamer1.0 = "${@base_conditional("USE_MULTIMEDIA", "1", "1.2.%", "1.4.%", d )}" -PREFERRED_VERSION_gstreamer1.0-omx = "${@base_conditional("USE_MULTIMEDIA", "1", "1.0.%", "1.2.%", d )}" -PREFERRED_VERSION_gstreamer1.0-plugins-bad = '${@base_conditional("USE_MULTIMEDIA", "1", "1.2.%", "1.4.%", d )}' -PREFERRED_VERSION_gstreamer1.0-plugins-base = '${@base_conditional("USE_MULTIMEDIA", "1", "1.2.%", "1.4.%", d )}' -PREFERRED_VERSION_gstreamer1.0-plugins-good = '${@base_conditional("USE_MULTIMEDIA", "1", "1.2.%", "1.4.%", d )}' -PREFERRED_VERSION_gstreamer1.0-plugins-ugly = '${@base_conditional("USE_MULTIMEDIA", "1", "1.2.%", "1.4.%", d )}' -PREFERRED_VERSION_gstreamer1.0-libav = '${@base_conditional("USE_MULTIMEDIA", "1", "1.2.%", "1.4.%", d )}' |