diff options
| author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-04-11 17:44:44 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-04-11 17:44:44 +0000 |
| commit | 9964a54c69bd8fd89751dcafbeaabd7df87dbb44 (patch) | |
| tree | 24af7d7c4c612a6a8235e1707f7997b6fbe1492f | |
| parent | 78152a4ce7c7a80ead65c580bfebfa983602bf1e (diff) | |
| parent | cbdeb4279489036aeeb031a005140ea7831a4d86 (diff) | |
merge of '85a2f16fc0d263698947f31a1f50694c14d86e70'
and 'ac0792f17a9fb0d1306d68b84abb3370a80d4bce'
| -rw-r--r-- | conf/machine/beagleboard.conf | 6 | ||||
| -rw-r--r-- | packages/linux/linux-omap2-git/beagleboard/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/linux/linux-omap2-git/beagleboard/beagle-board-patch-dirk.diff (renamed from packages/linux/linux-beagleboard/beagle-board-patch-dirk.diff) | 0 | ||||
| -rw-r--r-- | packages/linux/linux-omap2-git/beagleboard/defconfig (renamed from packages/linux/linux-beagleboard/defconfig) | 0 | ||||
| -rw-r--r-- | packages/linux/linux-omap2_git.bb | 12 |
5 files changed, 12 insertions, 6 deletions
diff --git a/conf/machine/beagleboard.conf b/conf/machine/beagleboard.conf index ee074f641c..a8193fd69c 100644 --- 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 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-omap2-git/beagleboard/.mtn2git_empty diff --git a/packages/linux/linux-beagleboard/beagle-board-patch-dirk.diff b/packages/linux/linux-omap2-git/beagleboard/beagle-board-patch-dirk.diff index b382423635..b382423635 100644 --- a/packages/linux/linux-beagleboard/beagle-board-patch-dirk.diff +++ b/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 index 6f8534eb3b..6f8534eb3b 100644 --- a/packages/linux/linux-beagleboard/defconfig +++ b/packages/linux/linux-omap2-git/beagleboard/defconfig diff --git a/packages/linux/linux-omap2_git.bb b/packages/linux/linux-omap2_git.bb index f11c040399..bb69b4e125 100644 --- 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" |