diff options
| author |   Bruce Ashfield <bruce.ashfield@windriver.com> | 2010-10-11 22:20:01 -0400 |
|---|---|---|
| committer |   Saul Wold <Saul.Wold@intel.com> | 2010-10-13 21:38:51 -0700 |
| commit | 5e558a17f297eb7f1973659e9e936ec980c34133 (patch) | |
| tree | 2cd3418db2693644657c9e9844960e48b2ccf224 | |
| parent | d3fbeb98339bfa2bb916c00d8fb7b41ec1537370 (diff) | |
| download | openembedded-core-contrib-5e558a17f297eb7f1973659e9e936ec980c34133.tar.gz | |
linux-wrs: remove external x86 config fragment
[BUGID #363]
Integrate the x86 gfx options into the existing x86 graphics
options for the common_pc and common_pc_64 boards.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
| -rw-r--r-- | meta/conf/distro/include/poky-default-revisions.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-wrs/x86-wrs.cfg | 2 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-wrs_git.bb | 2 |
3 files changed, 1 insertions, 5 deletions
diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc index af5b2d376e..3a20747884 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 SRCREV_machine_pn-linux-wrs_routerstationpro ?= "0431115c9d720fee5bb105f6a7411efb4f851d26" SRCREV_machine_pn-linux-wrs_mpc8315e-rdb ?= "0431115c9d720fee5bb105f6a7411efb4f851d26" SRCREV_machine_pn-linux-wrs_beagleboard ?= "0431115c9d720fee5bb105f6a7411efb4f851d26" -SRCREV_meta_pn-linux-wrs ?= "134a33e3a43579114ca5263e34c18a5d6854d085" +SRCREV_meta_pn-linux-wrs ?= "9d46ade6a1c073f63d918ad6ceb1f5c268e2a91d" SRCREV_pn-linux-libc-headers-wrs ??= "09a39c638dd65dc27c549c119abe1af2631b2ae0" SRCREV_pn-matchbox-config-gtk ??= "2081" SRCREV_pn-matchbox-desktop-sato ??= "76" diff --git a/meta/recipes-kernel/linux/linux-wrs/x86-wrs.cfg b/meta/recipes-kernel/linux/linux-wrs/x86-wrs.cfg deleted file mode 100644 index da4f00ae10..0000000000 --- a/meta/recipes-kernel/linux/linux-wrs/x86-wrs.cfg +++ /dev/null @@ -1,2 +0,0 @@ -CONFIG_FB_UVESA=m -CONFIG_FRAMEBUFFER_CONSOLE=y diff --git a/meta/recipes-kernel/linux/linux-wrs_git.bb b/meta/recipes-kernel/linux/linux-wrs_git.bb index ddc8d3bdce..4178f4b171 100644 --- a/meta/recipes-kernel/linux/linux-wrs_git.bb +++ b/meta/recipes-kernel/linux/linux-wrs_git.bb @@ -16,8 +16,6 @@ SRC_URI = "git://git.pokylinux.org/linux-2.6-windriver.git;protocol=git;fullclon SRC_URI_append_atom-pc = "\ file://i915.cfg \ file://8250.cfg" -SRC_URI_append_qemux86 = " file://x86-wrs.cfg" -SRC_URI_append_qemux86-64 = " file://x86-wrs.cfg" WRMACHINE = "${MACHINE}" WRMACHINE_qemux86 = "common_pc" |