summaryrefslogtreecommitdiffstats
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
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>
-rw-r--r--meta-sys940x/conf/machine/sys940x-noemgd.conf2
-rw-r--r--meta-sys940x/conf/machine/sys940x.conf2
-rw-r--r--meta-sys940x/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend12
-rw-r--r--meta-sys940x/recipes-kernel/linux/linux-yocto_3.2.bbappend14
4 files changed, 30 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} \
diff --git a/meta-sys940x/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend b/meta-sys940x/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend
new file mode 100644
index 0000000..da239fd
--- /dev/null
+++ b/meta-sys940x/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend
@@ -0,0 +1,12 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2
3COMPATIBLE_MACHINE_sys940x = "sys940x"
4KMACHINE_sys940x = "sys940x"
5
6COMPATIBLE_MACHINE_sys940x-noemgd = "sys940x-noemgd"
7KMACHINE_sys940x-noemgd = "sys940x"
8
9# Update the following to use a different BSP branch or meta SRCREV
10#KBRANCH_sys940x = "standard/preempt-rt/base"
11SRCREV_machine_pn-linux-yocto-rt_sys940x ?= "3ebf4d172cf4a41d2abf09e4036f0850e08064e7"
12SRCREV_meta_pn-linux-yocto-rt_sys940x ?= "6b3d4e09aa2531e9649f3f03827b7efbccfcec03"
diff --git a/meta-sys940x/recipes-kernel/linux/linux-yocto_3.2.bbappend b/meta-sys940x/recipes-kernel/linux/linux-yocto_3.2.bbappend
new file mode 100644
index 0000000..52dd3c5
--- /dev/null
+++ b/meta-sys940x/recipes-kernel/linux/linux-yocto_3.2.bbappend
@@ -0,0 +1,14 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2
3
4COMPATIBLE_MACHINE_sys940x = "sys940x"
5KMACHINE_sys940x = "sys940x"
6#KBRANCH_sys940x = "standard/default/base"
7SRCREV_machine_pn-linux-yocto_sys940x ?= "f4f8ba730e7783e09413872414d0a17c142c816d"
8SRCREV_meta_pn-linux-yocto_sys940x ?= "6b3d4e09aa2531e9649f3f03827b7efbccfcec03"
9
10COMPATIBLE_MACHINE_sys940x-noemgd = "sys940x-noemgd"
11KMACHINE_sys940x-noemgd = "sys940x"
12#KBRANCH_sys940x-noemgd = "standard/default/base"
13SRCREV_machine_pn-linux-yocto_sys940x-noemgd ?= "f4f8ba730e7783e09413872414d0a17c142c816d"
14SRCREV_meta_pn-linux-yocto_sys940x-noemgd ?= "6b3d4e09aa2531e9649f3f03827b7efbccfcec03"