diff options
| author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2011-09-26 11:55:56 -0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-09-28 14:58:49 +0100 |
| commit | 4833772c5fed1905404b50a832303f579c316d21 (patch) | |
| tree | 8f069721afea7ef850142ab13bef956edf17a5d8 /meta/recipes-kernel/linux | |
| parent | 324cb49e198bcf56cd182cc56ad809dddc29a0ee (diff) | |
| download | poky-4833772c5fed1905404b50a832303f579c316d21.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: da496bb570d05d0906a7310697bdd636c254540c)
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/recipes-kernel/linux')
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_3.0.bb | 2 |
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 | ||
| 17 | SRCREV_machine ?= "0936e13cc65d816f1759e2322c5e3fc82a5037f3" | 17 | SRCREV_machine ?= "0936e13cc65d816f1759e2322c5e3fc82a5037f3" |
| 18 | SRCREV_machine_qemuppc ?= "0936e13cc65d816f1759e2322c5e3fc82a5037f3" | 18 | SRCREV_machine_qemuppc ?= "0936e13cc65d816f1759e2322c5e3fc82a5037f3" |
| 19 | SRCREV_meta ?= "0dcdf7bb40a8e1fb18fd27d442fa5ace8cff4941" | 19 | SRCREV_meta ?= "67a46a608f47c19f16995be7de7b272025864b1b" |
| 20 | 20 | ||
| 21 | PR = "r1" | 21 | PR = "r1" |
| 22 | PV = "${LINUX_VERSION}+git${SRCPV}" | 22 | PV = "${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" | |||
| 18 | SRCREV_machine_qemux86 ?= "72671808fdbe69a9fe03fd8f094e7c59da04a28c" | 18 | SRCREV_machine_qemux86 ?= "72671808fdbe69a9fe03fd8f094e7c59da04a28c" |
| 19 | SRCREV_machine_qemux86-64 ?= "2b2d0954a6fd12b4bb7f02f019bc62633c8060a1" | 19 | SRCREV_machine_qemux86-64 ?= "2b2d0954a6fd12b4bb7f02f019bc62633c8060a1" |
| 20 | SRCREV_machine ?= "6b2c7d65b844e686eae7d5cccb9b638887afe28e" | 20 | SRCREV_machine ?= "6b2c7d65b844e686eae7d5cccb9b638887afe28e" |
| 21 | SRCREV_meta ?= "0dcdf7bb40a8e1fb18fd27d442fa5ace8cff4941" | 21 | SRCREV_meta ?= "67a46a608f47c19f16995be7de7b272025864b1b" |
| 22 | 22 | ||
| 23 | PR = "r2" | 23 | PR = "r2" |
| 24 | PV = "${LINUX_VERSION}+git${SRCPV}" | 24 | PV = "${LINUX_VERSION}+git${SRCPV}" |