diff options
| author |   Sebastian Spaeth <Sebastian@SSpaeth.de> | 2009-12-17 13:47:50 +0100 |
|---|---|---|
| committer | Sebastian Spaeth <Sebastian@SSpaeth.de> | 2009-12-17 13:47:50 +0100 |
| commit | f45580a1527dccdda100eee7f25f9f2c41af4db8 (patch) | |
| tree | 2218d4955f368e1804d86f212cc78317b4327f77 /recipes/linux/linux-omap_2.6.32.bb | |
| parent | 887b437869709625f5323438808ded9990cf590a (diff) | |
| parent | e3df24d64a48aff19aa9960dd9308a071b243b09 (diff) | |
| download | openembedded-f45580a1527dccdda100eee7f25f9f2c41af4db8.tar.gz | |
Merge commit 'origin/shr/merge' into shr/testing2009
Conflicts:
conf/distro/include/sane-srcrevs.inc
recipes/enotes/enotes_svn.bb
recipes/intone-video/intone-video_svn.bb
recipes/intone/intone_svn.bb
recipes/shr/shr-wizard_git.bb
recipes/tasks/task-shr-minimal.bb
Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
Diffstat (limited to 'recipes/linux/linux-omap_2.6.32.bb')
| -rw-r--r-- | recipes/linux/linux-omap_2.6.32.bb | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/recipes/linux/linux-omap_2.6.32.bb b/recipes/linux/linux-omap_2.6.32.bb index 95692c07ed..83c326a76a 100644 --- a/recipes/linux/linux-omap_2.6.32.bb +++ b/recipes/linux/linux-omap_2.6.32.bb @@ -3,11 +3,12 @@ require linux.inc DESCRIPTION = "Linux kernel for OMAP processors" KERNEL_IMAGETYPE = "uImage" -COMPATIBLE_MACHINE = "omap5912osk|omap1710h3|omap2430sdp|omap2420h4|beagleboard|omap3evm|omap3-pandora|overo|omapzoom|omapzoom2|omap4430-sdp" +COMPATIBLE_MACHINE = "omap5912osk|omap1710h3|omap2430sdp|omap2420h4|beagleboard|omap3evm|omap3-pandora|overo|omapzoom|omapzoom2|omap4430-sdp|cm-t35" DEFAULT_PREFERENCE = "-1" +DEFAULT_PREFERENCE_cm-t35 = "1" -SRCREV = "89c9eaeb92c97348dcabd6cb377b646c00855f6a" +SRCREV = "6833f1a8cdcb65a370f898bde6b6af63f81962df" # The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc PV = "2.6.32" @@ -16,8 +17,12 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.g file://defconfig" SRC_URI_append = " \ -file://usb/ehci.patch;patch=1 \ -file://usb/ehci-omap.c-mach-to-plat.diff;patch=1 \ +file://sctp-fix.patch;patch=1 \ +file://cm-t35/0001-omap3-cm-t35-add-mux-initialization.patch;patch=1 \ +file://cm-t35/0001-OMAP-DSS2-add-Toppoly-TDO35S-panel.patch;patch=1 \ +file://cm-t35/0002-omap3-cm-t35-add-DSS2-display-support.patch;patch=1 \ +file://cm-t35/0003-omap3-cm-t35-update-defconfig-for-DSS2.patch;patch=1 \ +file://cm-t35/0006-omap3-cm-t35-update-defconfig.patch;patch=1 \ " SRC_URI_append_beagleboard = " file://logo_linux_clut224.ppm \ |