summaryrefslogtreecommitdiffstats
path: root/scripts/lib/bsp/substrate
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@intel.com>2012-08-29 16:33:32 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-02 05:52:15 -0700
commit9c94bfc29efc73502190842301d9c36afcfdbf1c (patch)
treeaebe3e7c8fe49cc651427e888c794f8d318f3ebf /scripts/lib/bsp/substrate
parent30eabff86e67da5b48726577583697eaf9e6b070 (diff)
downloadpoky-9c94bfc29efc73502190842301d9c36afcfdbf1c.tar.gz
yocto-bsp: include meta-intel.inc if emgd selected
With move of ia32-base to oe-core, the intel-specific variables were split off into meta-intel.inc, which needs to be included when using components present only in meta-intel. In the case of i386, that's currently just emgd, so conditionally include emgd if emgd is selected as the xserver choice. (From meta-yocto rev: b9cc7ce3407d3bc3909e7cc57c8a1290cb84a58b) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/bsp/substrate')
-rw-r--r--scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf2
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf b/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf
index 2a07889a5f..1da230629a 100644
--- a/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf
+++ b/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf
@@ -20,6 +20,8 @@ require conf/machine/include/tune-atom.inc
20require conf/machine/include/tune-core2.inc 20require conf/machine/include/tune-core2.inc
21 21
22require conf/machine/include/ia32-base.inc 22require conf/machine/include/ia32-base.inc
23{{ if xserver == "y" and xserver_choice == "xserver_emgd": }}
24require conf/machine/include/meta-intel.inc
23 25
24{{ input type:"boolean" name:"xserver" prio:"50" msg:"Do you need support for X? (y/n)" default:"y" }} 26{{ input type:"boolean" name:"xserver" prio:"50" msg:"Do you need support for X? (y/n)" default:"y" }}
25 27