summaryrefslogtreecommitdiffstats
path: root/meta-sys940x/conf/machine
diff options
context:
space:
mode:
authorDarren Hart <dvhart@linux.intel.com>2012-04-30 21:12:21 (GMT)
committerDarren Hart <dvhart@linux.intel.com>2012-05-07 19:39:19 (GMT)
commit9b5fbf608629d5c906101e47cf999c831a514903 (patch)
treeb434261cb486461454fb2bc2fbca027c7ed40dfc /meta-sys940x/conf/machine
parent0a73be8fb1ea8761784ba5f2fac787c9015e10b1 (diff)
downloadmeta-intel-9b5fbf608629d5c906101e47cf999c831a514903.tar.gz
sys940x: Update to linux-yocto 3.2
Prefer the 3.2 version of linux-yocto. Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Diffstat (limited to 'meta-sys940x/conf/machine')
-rw-r--r--meta-sys940x/conf/machine/sys940x-noemgd.conf2
-rw-r--r--meta-sys940x/conf/machine/sys940x.conf2
2 files changed, 4 insertions, 0 deletions
diff --git a/meta-sys940x/conf/machine/sys940x-noemgd.conf b/meta-sys940x/conf/machine/sys940x-noemgd.conf
index 537e419..23ec0bc 100644
--- a/meta-sys940x/conf/machine/sys940x-noemgd.conf
+++ b/meta-sys940x/conf/machine/sys940x-noemgd.conf
@@ -10,6 +10,8 @@ require conf/machine/include/ia32-base.inc
10# Add "pcbios" if you have a non-efi version of the firmware 10# Add "pcbios" if you have a non-efi version of the firmware
11MACHINE_FEATURES += "efi pcbios" 11MACHINE_FEATURES += "efi pcbios"
12 12
13PREFERRED_VERSION_linux-yocto ?= "3.2%"
14
13XSERVER ?= "${XSERVER_IA32_BASE} \ 15XSERVER ?= "${XSERVER_IA32_BASE} \
14 ${XSERVER_IA32_EXT} \ 16 ${XSERVER_IA32_EXT} \
15 ${XSERVER_IA32_VESA} \ 17 ${XSERVER_IA32_VESA} \
diff --git a/meta-sys940x/conf/machine/sys940x.conf b/meta-sys940x/conf/machine/sys940x.conf
index 7123653..4b9b91d 100644
--- a/meta-sys940x/conf/machine/sys940x.conf
+++ b/meta-sys940x/conf/machine/sys940x.conf
@@ -10,6 +10,8 @@ require conf/machine/include/ia32-base.inc
10# Add "pcbios" if you have a non-efi version of the firmware 10# Add "pcbios" if you have a non-efi version of the firmware
11MACHINE_FEATURES += "efi pcbios" 11MACHINE_FEATURES += "efi pcbios"
12 12
13PREFERRED_VERSION_linux-yocto ?= "3.2%"
14
13XSERVER ?= "${XSERVER_IA32_BASE} \ 15XSERVER ?= "${XSERVER_IA32_BASE} \
14 ${XSERVER_IA32_EXT} \ 16 ${XSERVER_IA32_EXT} \
15 ${XSERVER_IA32_EMGD} \ 17 ${XSERVER_IA32_EMGD} \