diff options
author | Darren Hart <dvhart@linux.intel.com> | 2012-04-30 14:12:21 -0700 |
---|---|---|
committer | Darren Hart <dvhart@linux.intel.com> | 2012-05-07 12:39:19 -0700 |
commit | 9b5fbf608629d5c906101e47cf999c831a514903 (patch) | |
tree | b434261cb486461454fb2bc2fbca027c7ed40dfc /meta-sys940x/conf | |
parent | 0a73be8fb1ea8761784ba5f2fac787c9015e10b1 (diff) | |
download | meta-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')
-rw-r--r-- | meta-sys940x/conf/machine/sys940x-noemgd.conf | 2 | ||||
-rw-r--r-- | meta-sys940x/conf/machine/sys940x.conf | 2 |
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 537e4196..23ec0bce 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 |
11 | MACHINE_FEATURES += "efi pcbios" | 11 | MACHINE_FEATURES += "efi pcbios" |
12 | 12 | ||
13 | PREFERRED_VERSION_linux-yocto ?= "3.2%" | ||
14 | |||
13 | XSERVER ?= "${XSERVER_IA32_BASE} \ | 15 | XSERVER ?= "${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 71236534..4b9b91d9 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 |
11 | MACHINE_FEATURES += "efi pcbios" | 11 | MACHINE_FEATURES += "efi pcbios" |
12 | 12 | ||
13 | PREFERRED_VERSION_linux-yocto ?= "3.2%" | ||
14 | |||
13 | XSERVER ?= "${XSERVER_IA32_BASE} \ | 15 | XSERVER ?= "${XSERVER_IA32_BASE} \ |
14 | ${XSERVER_IA32_EXT} \ | 16 | ${XSERVER_IA32_EXT} \ |
15 | ${XSERVER_IA32_EMGD} \ | 17 | ${XSERVER_IA32_EMGD} \ |