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

diff --git a/conf/machine/beagleboard.conf b/conf/machine/beagleboard.conf
index ee074f6..a8193fd 100644 (file)
--- a/conf/machine/beagleboard.conf
+++ b/conf/machine/beagleboard.conf
@@ -14,9 +14,9 @@ GUI_MACHINE_CLASS = "bigscreen"
 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 @@ IMAGE_FSTYPES ?= "tar.bz2"
 SERIAL_CONSOLE = "115200 ttyS2"
 
 # No kernel recipe yet
-PREFERRED_PROVIDER_virtual/kernel = "linux-beagleboard"
+PREFERRED_PROVIDER_virtual/kernel = "linux-omap2"
 
 KERNEL_IMAGETYPE = "uImage"
 

diff --git a/packages/linux/linux-omap2-git/beagleboard/.mtn2git_empty b/packages/linux/linux-omap2-git/beagleboard/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/linux/linux-beagleboard/beagle-board-patch-dirk.diff b/packages/linux/linux-omap2-git/beagleboard/beagle-board-patch-dirk.diff
similarity index 100%
rename from packages/linux/linux-beagleboard/beagle-board-patch-dirk.diff
rename to packages/linux/linux-omap2-git/beagleboard/beagle-board-patch-dirk.diff

diff --git a/packages/linux/linux-beagleboard/defconfig b/packages/linux/linux-omap2-git/beagleboard/defconfig
similarity index 100%
rename from packages/linux/linux-beagleboard/defconfig
rename to packages/linux/linux-omap2-git/beagleboard/defconfig

diff --git a/packages/linux/linux-omap2_git.bb b/packages/linux/linux-omap2_git.bb
index f11c040..bb69b4e 100644 (file)
--- a/packages/linux/linux-omap2_git.bb
+++ b/packages/linux/linux-omap2_git.bb
@@ -1,12 +1,18 @@
 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"