diff options
| author | Tom Zanussi <tom.zanussi@intel.com> | 2012-08-24 03:54:13 (GMT) |
|---|---|---|
| committer | Tom Zanussi <tom.zanussi@intel.com> | 2012-08-29 15:29:18 (GMT) |
| commit | d98714abb2218691d96ca6931b96cbb7d8f1ef32 (patch) | |
| tree | 1248e93dfb7bf747fa759f3bd538edf64aaf7c5c | |
| parent | 037ab0181ddd204ce7cf09f651ac481e1edd95b4 (diff) | |
| download | meta-intel-d98714abb2218691d96ca6931b96cbb7d8f1ef32.tar.gz | |
meta-intel.inc: have appropriate BSPs use it
ia32-base.inc no longer contains everything these BSPs need - some of
what was in that file is now in meta-intel.inc, so we need to include
that too.
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
| -rw-r--r-- | meta-crownbay/conf/machine/crownbay.conf | 1 | ||||
| -rw-r--r-- | meta-fri2/conf/machine/fri2.conf | 1 | ||||
| -rw-r--r-- | meta-romley/conf/machine/romley.conf | 1 | ||||
| -rw-r--r-- | meta-sys940x/conf/machine/sys940x.conf | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/meta-crownbay/conf/machine/crownbay.conf b/meta-crownbay/conf/machine/crownbay.conf index 7d5e597..dba735a 100644 --- a/meta-crownbay/conf/machine/crownbay.conf +++ b/meta-crownbay/conf/machine/crownbay.conf | |||
| @@ -8,6 +8,7 @@ PREFERRED_VERSION_linux-yocto ?= "3.4%" | |||
| 8 | 8 | ||
| 9 | require conf/machine/include/tune-atom.inc | 9 | require conf/machine/include/tune-atom.inc |
| 10 | require conf/machine/include/ia32-base.inc | 10 | require conf/machine/include/ia32-base.inc |
| 11 | require conf/machine/include/meta-intel.inc | ||
| 11 | 12 | ||
| 12 | MACHINE_FEATURES += "gst-va-mixvideo" | 13 | MACHINE_FEATURES += "gst-va-mixvideo" |
| 13 | 14 | ||
diff --git a/meta-fri2/conf/machine/fri2.conf b/meta-fri2/conf/machine/fri2.conf index f90deb3..a928f0f 100644 --- a/meta-fri2/conf/machine/fri2.conf +++ b/meta-fri2/conf/machine/fri2.conf | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | 6 | ||
| 7 | require conf/machine/include/tune-atom.inc | 7 | 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 | 10 | ||
| 10 | VA_FEATURES ?= "gst-va-intel va-intel" | 11 | VA_FEATURES ?= "gst-va-intel va-intel" |
| 11 | 12 | ||
diff --git a/meta-romley/conf/machine/romley.conf b/meta-romley/conf/machine/romley.conf index f7cfa18..ab4d3c0 100644 --- a/meta-romley/conf/machine/romley.conf +++ b/meta-romley/conf/machine/romley.conf | |||
| @@ -9,6 +9,7 @@ PREFERRED_VERSION_linux-yocto ?= "3.2%" | |||
| 9 | 9 | ||
| 10 | require conf/machine/include/tune-x86_64.inc | 10 | require conf/machine/include/tune-x86_64.inc |
| 11 | require conf/machine/include/ia32-base.inc | 11 | require conf/machine/include/ia32-base.inc |
| 12 | require conf/machine/include/meta-intel.inc | ||
| 12 | 13 | ||
| 13 | XSERVER ?= "${XSERVER_IA32_BASE} \ | 14 | XSERVER ?= "${XSERVER_IA32_BASE} \ |
| 14 | ${XSERVER_IA32_EXT} \ | 15 | ${XSERVER_IA32_EXT} \ |
diff --git a/meta-sys940x/conf/machine/sys940x.conf b/meta-sys940x/conf/machine/sys940x.conf index 18f769d..9db2b2a 100644 --- a/meta-sys940x/conf/machine/sys940x.conf +++ b/meta-sys940x/conf/machine/sys940x.conf | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | 6 | ||
| 7 | require conf/machine/include/tune-atom.inc | 7 | 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 | 10 | ||
| 10 | # Add "pcbios" if you have a non-efi version of the firmware | 11 | # Add "pcbios" if you have a non-efi version of the firmware |
| 11 | MACHINE_FEATURES += "efi pcbios gst-va-mixvideo" | 12 | MACHINE_FEATURES += "efi pcbios gst-va-mixvideo" |