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_2.6.22.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_2.6.22.bb')
| -rw-r--r-- | recipes/linux/linux_2.6.22.bb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/recipes/linux/linux_2.6.22.bb b/recipes/linux/linux_2.6.22.bb index bb8749f0d6..1e73139c5e 100644 --- a/recipes/linux/linux_2.6.22.bb +++ b/recipes/linux/linux_2.6.22.bb @@ -4,10 +4,12 @@ require linux.inc DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_cm-x270 = "-1" DEFAULT_PREFERENCE_bd-neon = "0" +DEFAULT_PREFERENCE_mx31moboard = "1" -PR = "r5" +PR = "r6" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.22.tar.bz2 \ + ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.19.bz2;patch=1 \ file://defconfig \ " @@ -21,6 +23,8 @@ SRC_URI_append_cm-x270 = "\ file://0007-mmcsd_large_cards-r0.patch;patch=1 \ file://0008-cm-x270-nand-simplify-name.patch;patch=1" +SRC_URI_append_mx31moboard = "http://mobots.epfl.ch/mx31moboard/linux-2.6.22-moboard.patch.bz2;patch=1" + CMDLINE_cm-x270 = "console=${CMX270_CONSOLE_SERIAL_PORT},38400 monitor=8 bpp=16 mem=64M mtdparts=physmap-flash.0:256k(boot)ro,0x180000(kernel),-(root);cm-x270-nand:64m(app),-(data) rdinit=/sbin/init root=mtd3 rootfstype=jffs2" FILES_kernel-image_cm-x270 = "" |