summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Hart <dvhart@linux.intel.com>2012-04-27 16:24:17 (GMT)
committerDarren Hart <dvhart@linux.intel.com>2012-05-07 19:39:19 (GMT)
commitc718da7863215a65d6a1a4ba94b068280ddbbf77 (patch)
tree29382052d911a24edbe513fd326edede47e2b62d
parent3dc4d1cc00248ce12f2c332be0a59b720cc200f3 (diff)
downloadmeta-intel-c718da7863215a65d6a1a4ba94b068280ddbbf77.tar.gz
fri2: Prefer linux-yocto 3.2
Update the Fish River Island II BSPs to build using linux-yocto_3.2 by default. Signed-off-by: Darren Hart <dvhart@linux.intel.com>
-rw-r--r--meta-fri2/conf/machine/fri2-noemgd.conf3
-rw-r--r--meta-fri2/conf/machine/fri2.conf3
2 files changed, 6 insertions, 0 deletions
diff --git a/meta-fri2/conf/machine/fri2-noemgd.conf b/meta-fri2/conf/machine/fri2-noemgd.conf
index 9ba5753..31c890a 100644
--- a/meta-fri2/conf/machine/fri2-noemgd.conf
+++ b/meta-fri2/conf/machine/fri2-noemgd.conf
@@ -10,6 +10,9 @@ require conf/machine/include/ia32-base.inc
10MACHINE_FEATURES += "wifi 3g pcbios efi" 10MACHINE_FEATURES += "wifi 3g pcbios efi"
11MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5" 11MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5"
12 12
13PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
14PREFERRED_VERSION_linux-yocto = "3.2%"
15
13XSERVER ?= "${XSERVER_IA32_BASE} \ 16XSERVER ?= "${XSERVER_IA32_BASE} \
14 ${XSERVER_IA32_EXT} \ 17 ${XSERVER_IA32_EXT} \
15 ${XSERVER_IA32_VESA} \ 18 ${XSERVER_IA32_VESA} \
diff --git a/meta-fri2/conf/machine/fri2.conf b/meta-fri2/conf/machine/fri2.conf
index 1cd6a3e..4924ca2 100644
--- a/meta-fri2/conf/machine/fri2.conf
+++ b/meta-fri2/conf/machine/fri2.conf
@@ -10,6 +10,9 @@ require conf/machine/include/ia32-base.inc
10MACHINE_FEATURES += "wifi 3g pcbios efi" 10MACHINE_FEATURES += "wifi 3g pcbios efi"
11MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5" 11MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5"
12 12
13PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
14PREFERRED_VERSION_linux-yocto = "3.2%"
15
13XSERVER ?= "${XSERVER_IA32_BASE} \ 16XSERVER ?= "${XSERVER_IA32_BASE} \
14 ${XSERVER_IA32_EXT} \ 17 ${XSERVER_IA32_EXT} \
15 ${XSERVER_IA32_EMGD} \ 18 ${XSERVER_IA32_EMGD} \