[oe-commits] org.oe.dev linux-omap2: merge in beagleboard support and clean up versioning

[koen commit]

linux-omap2: merge in beagleboard support and clean up versioning
* SRCREV is kept in recipe to make it easier to have different SRCREVs per omap board

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: ac0792f17a9fb0d1306d68b84abb3370a80d4bce
ViewMTN: http://monotone.openembedded.org/revision/info/ac0792f17a9fb0d1306d68b84abb3370a80d4bce
Files:
1
packages/linux/linux-beagleboard/beagle-board-patch-dirk.diff
packages/linux/linux-omap2-git/beagleboard/beagle-board-patch-dirk.diff
packages/linux/linux-beagleboard/defconfig
packages/linux/linux-omap2-git/beagleboard/defconfig
packages/linux/linux-omap2-git/beagleboard
conf/machine/beagleboard.conf
packages/linux/linux-omap2_git.bb
Diffs:

#
# mt diff -r35fd623c105c7e1623fe4439e73e0e330116a43a -rac0792f17a9fb0d1306d68b84abb3370a80d4bce
#
#
#
# rename "packages/linux/linux-beagleboard/beagle-board-patch-dirk.diff"
#     to "packages/linux/linux-omap2-git/beagleboard/beagle-board-patch-dirk.diff"
# 
# rename "packages/linux/linux-beagleboard/defconfig"
#     to "packages/linux/linux-omap2-git/beagleboard/defconfig"
# 
# add_dir "packages/linux/linux-omap2-git/beagleboard"
# 
# patch "conf/machine/beagleboard.conf"
#  from [600f5c43f12d2de1e453ff501297abf5a5cc0f64]
#    to [ed984e852b63ec950dba7f7bae3b3504a0b74fa6]
# 
# patch "packages/linux/linux-omap2_git.bb"
#  from [d52fa45e838f0f38b600f28fb5ba06801961d1cb]
#    to [54e881f43e88f1a9e7f204f4b384d8156014bd07]
#
============================================================
--- conf/machine/beagleboard.conf	600f5c43f12d2de1e453ff501297abf5a5cc0f64
+++ conf/machine/beagleboard.conf	ed984e852b63ec950dba7f7bae3b3504a0b74fa6
@@ -14,9 +14,9 @@ TARGET_FPU = "hard"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
 
 TARGET_FPU = "hard"
-include conf/machine/include/tune-arm1136jf-s.inc
+#include conf/machine/include/tune-arm1136jf-s.inc
 # requires gcc 4.3.0:
-#include conf/machine/include/tune-cortexa8.inc
+include conf/machine/include/tune-cortexa8.inc
 
 
 IMAGE_FSTYPES ?= "tar.bz2"
@@ -25,7 +25,7 @@ SERIAL_CONSOLE = "115200 ttyS2"
 SERIAL_CONSOLE = "115200 ttyS2"
 
 # No kernel recipe yet
-PREFERRED_PROVIDER_virtual/kernel = "linux-beagleboard"
+PREFERRED_PROVIDER_virtual/kernel = "linux-omap2"
 
 KERNEL_IMAGETYPE = "uImage"
 
============================================================
--- packages/linux/linux-omap2_git.bb	d52fa45e838f0f38b600f28fb5ba06801961d1cb
+++ packages/linux/linux-omap2_git.bb	54e881f43e88f1a9e7f204f4b384d8156014bd07
@@ -1,12 +1,18 @@ FILESDIR = "${@os.path.dirname(bb.data.g
 require linux-omap.inc
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-omap2-git/${MACHINE}"
-PV = "2.6.x+git${SRCDATE}"
-PR = "r1"
 
-COMPATIBLE_MACHINE = "omap2430sdp|omap2420h4"
+SRCREV = "039ced63db6a3f90f8b8f23a74499e38c0462b27"
+PV = "2.6.24+2.6.25rc7-git${SRCREV}"
+PR = "r2"
 
+
 SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \
            file://defconfig"
 
+SRC_URI_append_beagleboard = " file://beagle-board-patch-dirk.diff;patch=1 "
+
+COMPATIBLE_MACHINE = "omap2430sdp|omap2420h4|beagleboard"
+
+
 S = "${WORKDIR}/git"