summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/include/poky-default-revisions.inc2
-rw-r--r--meta/recipes-kernel/linux/linux-wrs/x86-wrs.cfg2
-rw-r--r--meta/recipes-kernel/linux/linux-wrs_git.bb2
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
92SRCREV_machine_pn-linux-wrs_routerstationpro ?= "0431115c9d720fee5bb105f6a7411efb4f851d26" 92SRCREV_machine_pn-linux-wrs_routerstationpro ?= "0431115c9d720fee5bb105f6a7411efb4f851d26"
93SRCREV_machine_pn-linux-wrs_mpc8315e-rdb ?= "0431115c9d720fee5bb105f6a7411efb4f851d26" 93SRCREV_machine_pn-linux-wrs_mpc8315e-rdb ?= "0431115c9d720fee5bb105f6a7411efb4f851d26"
94SRCREV_machine_pn-linux-wrs_beagleboard ?= "0431115c9d720fee5bb105f6a7411efb4f851d26" 94SRCREV_machine_pn-linux-wrs_beagleboard ?= "0431115c9d720fee5bb105f6a7411efb4f851d26"
95SRCREV_meta_pn-linux-wrs ?= "134a33e3a43579114ca5263e34c18a5d6854d085" 95SRCREV_meta_pn-linux-wrs ?= "9d46ade6a1c073f63d918ad6ceb1f5c268e2a91d"
96SRCREV_pn-linux-libc-headers-wrs ??= "09a39c638dd65dc27c549c119abe1af2631b2ae0" 96SRCREV_pn-linux-libc-headers-wrs ??= "09a39c638dd65dc27c549c119abe1af2631b2ae0"
97SRCREV_pn-matchbox-config-gtk ??= "2081" 97SRCREV_pn-matchbox-config-gtk ??= "2081"
98SRCREV_pn-matchbox-desktop-sato ??= "76" 98SRCREV_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 @@
1CONFIG_FB_UVESA=m
2CONFIG_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
16SRC_URI_append_atom-pc = "\ 16SRC_URI_append_atom-pc = "\
17 file://i915.cfg \ 17 file://i915.cfg \
18 file://8250.cfg" 18 file://8250.cfg"
19SRC_URI_append_qemux86 = " file://x86-wrs.cfg"
20SRC_URI_append_qemux86-64 = " file://x86-wrs.cfg"
21 19
22WRMACHINE = "${MACHINE}" 20WRMACHINE = "${MACHINE}"
23WRMACHINE_qemux86 = "common_pc" 21WRMACHINE_qemux86 = "common_pc"