summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/distro/include/sane-srcrevs.inc2
-rw-r--r--recipes/linux/linux-openmoko-2.6.32/om-gta02/defconfig8
-rw-r--r--recipes/linux/linux-openmoko-2.6.32_git.bb5
3 files changed, 12 insertions, 3 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index fefeb7de25..316027272d 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -154,7 +154,7 @@ SRCREV_pn-linux-ixp4xx ?= "1089"
SRCREV_pn-linux-openmoko-2.6.24 ?= "fb42ce6724576fc173faf8abfb04aa2c36d213b7"
SRCREV_pn-linux-openmoko-2.6.28 ?= "8c65792a5c83c76d662a617a7c4e1ae8104bb6a5"
SRCREV_pn-linux-openmoko-2.6.31 ?= "4331f6c95fadc37ea89359d6afb915be838790f9"
-SRCREV_pn-linux-openmoko-2.6.32 ?= "06ac2c30542ba47bfe0ffc15b7868bb049bec053"
+SRCREV_pn-linux-openmoko-2.6.32 ?= "5e5d518ecad86cc891d91c88d3b144eb30339bca"
SRCREV_pn-linux-openmoko-devel ?= "b9aa5bf345a0b802af0d10b6cf1079738fe4fd12"
SRCREV_pn-linux-openmoko-shr-devel ?= "b90406de472c1aa5371ab593a2bb79136d5de658"
SRCREV_pn-linux-openmoko-shr-drm-devel ?= "dd6196f5cc0cd707e7f694f52d7e847e066a1967"
diff --git a/recipes/linux/linux-openmoko-2.6.32/om-gta02/defconfig b/recipes/linux/linux-openmoko-2.6.32/om-gta02/defconfig
index 8f84224b4f..e83981b3e2 100644
--- a/recipes/linux/linux-openmoko-2.6.32/om-gta02/defconfig
+++ b/recipes/linux/linux-openmoko-2.6.32/om-gta02/defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.32
-# Tue Dec 22 15:58:31 2009
+# Linux kernel version: 2.6.32.2
+# Mon Dec 28 12:30:05 2009
#
CONFIG_ARM=y
CONFIG_HAVE_PWM=y
@@ -1044,6 +1044,7 @@ CONFIG_REGULATOR_PCF50633=y
# Graphics support
#
CONFIG_DRM=y
+CONFIG_DRM_KMS_HELPER=y
# CONFIG_DRM_MGA is not set
# CONFIG_DRM_VIA is not set
# CONFIG_DRM_SAVAGE is not set
@@ -1453,6 +1454,9 @@ CONFIG_RTC_DRV_S3C=y
# TI VLYNQ
#
# CONFIG_STAGING is not set
+CONFIG_AR6000_WLAN=m
+# CONFIG_AR6000_WLAN_DEBUG is not set
+# CONFIG_AR6000_WLAN_RESET is not set
#
# File systems
diff --git a/recipes/linux/linux-openmoko-2.6.32_git.bb b/recipes/linux/linux-openmoko-2.6.32_git.bb
index da82b89435..c4aa28f62c 100644
--- a/recipes/linux/linux-openmoko-2.6.32_git.bb
+++ b/recipes/linux/linux-openmoko-2.6.32_git.bb
@@ -12,6 +12,8 @@ PR = "r2"
SRC_URI = "\
git://git.openmoko.org/git/kernel.git;protocol=git;branch=om-gta02-2.6.32 \
+# latest stable patch for ubi fix 943e167cb3e8fb191894bde8a4a75db78531a7c8
+ ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.2.bz2;patch=1;name=stablepatch \
file://defconfig \
# build fix
file://0001-wm8753-fix-build-with-gcc-4.4.2-which-works-ok-with-.patch;patch=1 \
@@ -25,6 +27,9 @@ SRC_URI = "\
file://0002-glamo-drm-select-DRM_KMS_HELPER-for-crtc-functions.patch;patch=1 \
"
+SRC_URI[stablepatch.md5sum] = "924b7aa0fcd6e54c12ecc9b3c3082f59"
+SRC_URI[stablepatch.sha256sum] = "d207f4217c4b3fef9c5a19620b6ca90dbd9b9583ed9c686b5636eec973a7cc60"
+
S = "${WORKDIR}/git"
do_configure_prepend() {