diff options
| author |   Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com> | 2016-06-21 12:19:58 +0900 |
|---|---|---|
| committer | Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com> | 2016-06-21 12:21:44 +0900 |
| commit | b20896675dca7a5c3a6da6486f4ea708a23b3b12 (patch) | |
| tree | 59bd37feda3c605601758bccfc55a16c9b52d62c /meta-rcar-gen2/conf/machine/include | |
| parent | 25217cd6b38c20a0b1acee46a9ad12c3ff0b445e (diff) | |
| parent | a29b1deff4f828987ab22562e6c0cd60a95be1ab (diff) | |
[AGL] Merge 'genivi-7.0-bsp-1.8.0' into 'agl-1.0-bsp-1.8.0'
* genivi-7.0-bsp-1.8.0:
gstreamer: Fix a long list of build dependency QA warnings
gstreamer: Fix runtime CMA error
gdp: Fix missing gst faad plugin build error when s/w mmp is used.
multimedia: Set PREFERRED_VERSION for gstreamer1.0-* to 1.2.% for all Gen 2 boards
gdp: Add gfx and multimedia packages to GDP image when enabled
Change-Id: I68459885ebdfbe7b3ad22efcea3ec9b82c8d5aa9
Signed-off-by: Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com>
Diffstat (limited to 'meta-rcar-gen2/conf/machine/include')
| -rw-r--r-- | meta-rcar-gen2/conf/machine/include/r8a7791.inc | 10 | ||||
| -rw-r--r-- | meta-rcar-gen2/conf/machine/include/rcar-gen2-providers.inc | 11 |
2 files changed, 11 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 )}' diff --git a/meta-rcar-gen2/conf/machine/include/rcar-gen2-providers.inc b/meta-rcar-gen2/conf/machine/include/rcar-gen2-providers.inc index 6ce0204..89eba92 100644 --- a/meta-rcar-gen2/conf/machine/include/rcar-gen2-providers.inc +++ b/meta-rcar-gen2/conf/machine/include/rcar-gen2-providers.inc @@ -1,3 +1,14 @@ # From Intrepid the Genivi Yocto baseline meta-ivi adopted 3.14 as the default kernel for QEMU. # Override that to avoid a long list of build messages stating it is switching from 3.14 to 3.10. PREFERRED_VERSION_linux-yocto ?= "3.10%" + +# multimedia acceleration uses Gst version 1.2.x, otherwise meta-ivi currently uses 1.4.x +require ../../../include/multimedia-control.inc + +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 )}' |