summaryrefslogtreecommitdiff
path: root/packages/linux/linux-omap2_git.bb
diff options
context:
space:
mode:
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-05-05 21:52:39 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-05-05 21:52:39 +0000
commit0fb268a8c03bbea4fc1f34a3b7a9ebe7a02c471d (patch)
treeccf99743568c299437bb03381b1625b8c0a838ee /packages/linux/linux-omap2_git.bb
parent6165473d292012b6c60308c8eb0f3604a020b046 (diff)
parent66af3461a3fdf3eb7ceb76bb2a04e66be8283b8c (diff)
merge of '86dacb8c8e579fd5d42ab61a0c0f344bcf74146d'
and 'd4a97f257158aba4fde91347580030110ef215bf'
Diffstat (limited to 'packages/linux/linux-omap2_git.bb')
-rw-r--r--packages/linux/linux-omap2_git.bb25
1 files changed, 8 insertions, 17 deletions
diff --git a/packages/linux/linux-omap2_git.bb b/packages/linux/linux-omap2_git.bb
index 4bf3c2a0ce..71bd173541 100644
--- a/packages/linux/linux-omap2_git.bb
+++ b/packages/linux/linux-omap2_git.bb
@@ -2,27 +2,18 @@ require linux-omap.inc
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-omap2-git/${MACHINE}"
-SRCREV = "e015fc7dba8f5002daa0982eb81d33cc72e68e95"
+SRCREV = "547ba9200727d2334f779cbf46ab62accb1281aa"
-# The e105fc commit is the merge of 2.6.25 into the omap tree, so we leave of the +git part of PV
-#PV = "2.6.25+git${SRCREV}"
-PV = "2.6.25"
-PR = "r5"
+PV = "2.6.25+git${SRCREV}"
+PR = "r8"
SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \
- file://defconfig"
-
-SRC_URI_append_beagleboard = " \
- file://2-update-omap3evm-kconfig.patch;patch=1 \
- file://3-omap3evm-board.patch;patch=1 \
- file://4-omap3evm-config.patch;patch=1 \
- file://5-omap3evm-header.patch;patch=1 \
- file://beagle-board-file.diff;patch=1 \
- file://beagle-board-header.diff;patch=1 \
- file://beagle-kconfig-makefile.diff;patch=1 \
- file://add-beagle-sd-support.diff;patch=1 \
- file://add-beagle-usb-support.diff;patch=1 \
+ file://defconfig"
+
+SRC_URI_append_beagleboard = " file://no-harry-potter.diff;patch=1 \
+ file://usb-timout.patch;patch=1 \
+# file://l2-cache.patch;patch=1 \
"
COMPATIBLE_MACHINE = "omap2430sdp|omap2420h4|beagleboard"