summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2011-09-26 11:55:56 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-04 13:57:52 +0100
commit9886c510f98e17461832225ca016cac67af0e4ae (patch)
tree535d0eff3e386d22bb4565dc2419dfe66b6ec24e /meta
parent49de6096b1eac61fb8e0b2541964194180708a7b (diff)
downloadpoky-9886c510f98e17461832225ca016cac67af0e4ae.tar.gz
linux-yocto/meta: eg20t and live boot config changes
Merging the following configuration changes: 67a46a6 meta/common-pc-64: enable live booting for common-pc-64 1010905 meta/common-pc: enable live booting for common-pc b3c5fa7 meta/atom-pc: enable live booting for atom-pc 41c090e meta: update boot live config and move it to cfg/ d51b0e7 eg20t: update config options The first 4 make the live-boot configuration shared and then reuse them for the boards that currently are live bootable. The eg20t is a cleanup of obselete kernel options and is part of the cleanup of options for the 3.0 kernel. [YOCTO: #940] [YOCTO: #686] (From OE-Core rev: 4482970401a048433d5a862bfed4936259dcfcf5) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.0.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
index 2b7a4f9ecd..0c59a5b54f 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
@@ -16,7 +16,7 @@ LINUX_KERNEL_TYPE = "preempt-rt"
16 16
17SRCREV_machine ?= "0936e13cc65d816f1759e2322c5e3fc82a5037f3" 17SRCREV_machine ?= "0936e13cc65d816f1759e2322c5e3fc82a5037f3"
18SRCREV_machine_qemuppc ?= "0936e13cc65d816f1759e2322c5e3fc82a5037f3" 18SRCREV_machine_qemuppc ?= "0936e13cc65d816f1759e2322c5e3fc82a5037f3"
19SRCREV_meta ?= "0dcdf7bb40a8e1fb18fd27d442fa5ace8cff4941" 19SRCREV_meta ?= "67a46a608f47c19f16995be7de7b272025864b1b"
20 20
21PR = "r1" 21PR = "r1"
22PV = "${LINUX_VERSION}+git${SRCPV}" 22PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.0.bb b/meta/recipes-kernel/linux/linux-yocto_3.0.bb
index f11c0eaab4..9ece25c727 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.0.bb
@@ -18,7 +18,7 @@ SRCREV_machine_qemuppc ?= "eccd57eaa4c2b580b9adbbc39e19ecbff56779ae"
18SRCREV_machine_qemux86 ?= "72671808fdbe69a9fe03fd8f094e7c59da04a28c" 18SRCREV_machine_qemux86 ?= "72671808fdbe69a9fe03fd8f094e7c59da04a28c"
19SRCREV_machine_qemux86-64 ?= "2b2d0954a6fd12b4bb7f02f019bc62633c8060a1" 19SRCREV_machine_qemux86-64 ?= "2b2d0954a6fd12b4bb7f02f019bc62633c8060a1"
20SRCREV_machine ?= "6b2c7d65b844e686eae7d5cccb9b638887afe28e" 20SRCREV_machine ?= "6b2c7d65b844e686eae7d5cccb9b638887afe28e"
21SRCREV_meta ?= "0dcdf7bb40a8e1fb18fd27d442fa5ace8cff4941" 21SRCREV_meta ?= "67a46a608f47c19f16995be7de7b272025864b1b"
22 22
23PR = "r2" 23PR = "r2"
24PV = "${LINUX_VERSION}+git${SRCPV}" 24PV = "${LINUX_VERSION}+git${SRCPV}"