summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2010-10-13 20:15:31 -0400
committerSaul Wold <Saul.Wold@intel.com>2010-10-13 21:38:51 -0700
commita2337a34358b017a3e4311a2647165da2d8b54d3 (patch)
tree25ededb46dda427d294ed06581c5218800ad20cc
parentcbeb72b90dbfba06d1477edc893f43e4343d8de0 (diff)
downloadpoky-a2337a34358b017a3e4311a2647165da2d8b54d3.tar.gz
linux-wrs: update SRCREVs
Fixes [BUGID #432, #438, #437, #422] [atom-pc: switch to the atom-pc branch The atom-pc has a dedicated branch and merged kernel commits. Swtich the kernel recipe to use the fully integrated BSP Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>] [atom-pc: add kernel config options needed for -live images Fixes [BUGID #432] Live images require VFAT filesystem and loop device support - this adds the required kernel config options for them. Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>] [atom-pc: Add netbook wireless networking support for NB305 and eee901 Add the atom-pc-wifi.cfg to enable wireless networking support for the netbooks mentioned in the atom-pc machine config file. Note: this adds a staging tree driver (rt2860sta) for the eee901 wifi. [BUGID #438] Signed-off-by: Darren Hart <dvhart@linux.intel.com> CC: Tom Zanussi <tom.zanussi@intel.com> CC: Richard Purdie <rpurdie@linux.intel.com> CC: Bruce Ashfield <bruce.ashfield@windriver.com>] [atom-pc: Add netbook wired networking support for NB305, Aspire One, and eee901 Add the atom-pc-eth.cfg to enable wired networking support for the three netbooks mentioned in the atom-pc machine config file. [BUGID #437] Signed-off-by: Darren Hart <dvhart@linux.intel.com> CC: Tom Zanussi <tom.zanussi@intel.com> CC: Richard Purdie <rpurdie@linux.intel.com> CC: Bruce Ashfield <bruce.ashfield@windriver.com>] [routerstationpro: add missing kernel patches [BUGID: #422] Add the kernel patches required for routerstaion pro boot Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>] [netbook: allow hardisk booting [BUGID: #445] Signed-off-by: Darren Hart <dvhart@linux.intel.com>] Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-rw-r--r--meta/conf/distro/include/poky-default-revisions.inc4
-rw-r--r--meta/recipes-kernel/linux/linux-wrs_git.bb2
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc
index 01fbe7ec02..31a2834e56 100644
--- a/meta/conf/distro/include/poky-default-revisions.inc
+++ b/meta/conf/distro/include/poky-default-revisions.inc
@@ -89,10 +89,10 @@ SRCREV_machine_pn-linux-wrs_qemux86 ?= "0431115c9d720fee5bb105f6a7411efb4f851d26
89SRCREV_machine_pn-linux-wrs_qemux86-64 ?= "0431115c9d720fee5bb105f6a7411efb4f851d26" 89SRCREV_machine_pn-linux-wrs_qemux86-64 ?= "0431115c9d720fee5bb105f6a7411efb4f851d26"
90SRCREV_machine_pn-linux-wrs_emenlow ?= "aae69fdf104b0a9d7b3710f808aac6ab303490f7" 90SRCREV_machine_pn-linux-wrs_emenlow ?= "aae69fdf104b0a9d7b3710f808aac6ab303490f7"
91SRCREV_machine_pn-linux-wrs_atom-pc ?= "0431115c9d720fee5bb105f6a7411efb4f851d26" 91SRCREV_machine_pn-linux-wrs_atom-pc ?= "0431115c9d720fee5bb105f6a7411efb4f851d26"
92SRCREV_machine_pn-linux-wrs_routerstationpro ?= "0431115c9d720fee5bb105f6a7411efb4f851d26" 92SRCREV_machine_pn-linux-wrs_routerstationpro ?= "2ec2edaf256dd8500ee3d4763fee6ca3ecd6da4b"
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 ?= "3eb1d750fe31c36a53364d3e39952511b1c6c817" 95SRCREV_meta_pn-linux-wrs ?= "5bdc73232e78e962595e238abf325b09e6e4b541"
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_git.bb b/meta/recipes-kernel/linux/linux-wrs_git.bb
index 45c11505b3..93285f2768 100644
--- a/meta/recipes-kernel/linux/linux-wrs_git.bb
+++ b/meta/recipes-kernel/linux/linux-wrs_git.bb
@@ -28,7 +28,7 @@ COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemux86-64|atom-pc|route
28 28
29LINUX_VERSION = "v2.6.34" 29LINUX_VERSION = "v2.6.34"
30LINUX_VERSION_EXTENSION = "-wr-${LINUX_KERNEL_TYPE}" 30LINUX_VERSION_EXTENSION = "-wr-${LINUX_KERNEL_TYPE}"
31PR = "r10" 31PR = "r11"
32 32
33S = "${WORKDIR}/linux" 33S = "${WORKDIR}/linux"
34B = "${WORKDIR}/linux-${WRMACHINE}-${LINUX_KERNEL_TYPE}-build" 34B = "${WORKDIR}/linux-${WRMACHINE}-${LINUX_KERNEL_TYPE}-build"