diff options
Diffstat (limited to 'meta-fri2')
-rw-r--r-- | meta-fri2/README | 15 | ||||
-rw-r--r-- | meta-fri2/conf/machine/fri2.conf | 3 |
2 files changed, 17 insertions, 1 deletions
diff --git a/meta-fri2/README b/meta-fri2/README index 2208392f..a8661744 100644 --- a/meta-fri2/README +++ b/meta-fri2/README | |||
@@ -113,6 +113,21 @@ At the end of a successful build, you should have a live image that | |||
113 | you can boot from a USB flash drive (see instructions on how to do | 113 | you can boot from a USB flash drive (see instructions on how to do |
114 | that below, in the section 'Booting the images from /binary'). | 114 | that below, in the section 'Booting the images from /binary'). |
115 | 115 | ||
116 | NOTE: The 'fri2' machine will include support for hardware video | ||
117 | acceleration via gstreamer if and only if the "commercial" string is | ||
118 | added to the the LICENSE_FLAGS_WHITELIST variable in your local.conf. | ||
119 | |||
120 | For example: | ||
121 | |||
122 | LICENSE_FLAGS_WHITELIST = "license_emgd-driver-bin_1.10 commercial" | ||
123 | |||
124 | The reason this is needed is to prevent the image from including | ||
125 | anything that might violate the license terms of the packages used to | ||
126 | implement the the video acceleration feature, such as gst-ffmpeg and | ||
127 | ffmpeg. As always, please consult the licenses included in the | ||
128 | specific packages for details if you use packages that require | ||
129 | particular LICENSE_FLAGS. | ||
130 | |||
116 | As an alternative to downloading the BSP tarball, you can also work | 131 | As an alternative to downloading the BSP tarball, you can also work |
117 | directly from the meta-intel git repository. For each BSP in the | 132 | directly from the meta-intel git repository. For each BSP in the |
118 | 'meta-intel' repository, there are multiple branches, one | 133 | 'meta-intel' repository, there are multiple branches, one |
diff --git a/meta-fri2/conf/machine/fri2.conf b/meta-fri2/conf/machine/fri2.conf index 56408f7e..bf7754fc 100644 --- a/meta-fri2/conf/machine/fri2.conf +++ b/meta-fri2/conf/machine/fri2.conf | |||
@@ -8,7 +8,8 @@ require conf/machine/include/tune-atom.inc | |||
8 | require conf/machine/include/ia32-base.inc | 8 | require conf/machine/include/ia32-base.inc |
9 | require conf/machine/include/meta-intel.inc | 9 | require conf/machine/include/meta-intel.inc |
10 | 10 | ||
11 | VA_FEATURES ?= "gst-va-intel va-intel" | 11 | VA_FEATURES = "${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", \ |
12 | "commercial", "gst-va-intel va-intel", "va-intel", d)}" | ||
12 | 13 | ||
13 | MACHINE_FEATURES += "wifi 3g pcbios efi va-impl-mixvideo" | 14 | MACHINE_FEATURES += "wifi 3g pcbios efi va-impl-mixvideo" |
14 | MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5 ${VA_FEATURES}" | 15 | MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5 ${VA_FEATURES}" |