diff options
| author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2010-10-11 22:41:07 -0400 |
|---|---|---|
| committer | Saul Wold <Saul.Wold@intel.com> | 2010-10-13 21:38:51 -0700 |
| commit | 48755c4bc6a71b206b054fc6fa349f0c97baef61 (patch) | |
| tree | 4d907c2897279ad32b39620e0f3742d352b2489a /meta | |
| parent | 5e558a17f297eb7f1973659e9e936ec980c34133 (diff) | |
| download | poky-48755c4bc6a71b206b054fc6fa349f0c97baef61.tar.gz | |
emenlow/linux-wrs: merge emenlow configuration
Complete the merge of the emenlow BSP, by removing the external
configurations from the emelnow layer and merging them into
the wrs_meta branch of the kernel tree. This also allows the
emenlow to drop the tools config fragement and use the common
definitions shared by BSPs maintained in the kernel.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/conf/distro/include/poky-default-revisions.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc index 3a20747884..01fbe7ec02 100644 --- a/meta/conf/distro/include/poky-default-revisions.inc +++ b/meta/conf/distro/include/poky-default-revisions.inc | |||
| @@ -92,7 +92,7 @@ SRCREV_machine_pn-linux-wrs_atom-pc ?= "0431115c9d720fee5bb105f6a7411efb4f851d26 | |||
| 92 | SRCREV_machine_pn-linux-wrs_routerstationpro ?= "0431115c9d720fee5bb105f6a7411efb4f851d26" | 92 | SRCREV_machine_pn-linux-wrs_routerstationpro ?= "0431115c9d720fee5bb105f6a7411efb4f851d26" |
| 93 | SRCREV_machine_pn-linux-wrs_mpc8315e-rdb ?= "0431115c9d720fee5bb105f6a7411efb4f851d26" | 93 | SRCREV_machine_pn-linux-wrs_mpc8315e-rdb ?= "0431115c9d720fee5bb105f6a7411efb4f851d26" |
| 94 | SRCREV_machine_pn-linux-wrs_beagleboard ?= "0431115c9d720fee5bb105f6a7411efb4f851d26" | 94 | SRCREV_machine_pn-linux-wrs_beagleboard ?= "0431115c9d720fee5bb105f6a7411efb4f851d26" |
| 95 | SRCREV_meta_pn-linux-wrs ?= "9d46ade6a1c073f63d918ad6ceb1f5c268e2a91d" | 95 | SRCREV_meta_pn-linux-wrs ?= "3eb1d750fe31c36a53364d3e39952511b1c6c817" |
| 96 | SRCREV_pn-linux-libc-headers-wrs ??= "09a39c638dd65dc27c549c119abe1af2631b2ae0" | 96 | SRCREV_pn-linux-libc-headers-wrs ??= "09a39c638dd65dc27c549c119abe1af2631b2ae0" |
| 97 | SRCREV_pn-matchbox-config-gtk ??= "2081" | 97 | SRCREV_pn-matchbox-config-gtk ??= "2081" |
| 98 | SRCREV_pn-matchbox-desktop-sato ??= "76" | 98 | SRCREV_pn-matchbox-desktop-sato ??= "76" |