aboutsummaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2006-08-28 20:57:29 +0000
committerKoen Kooi <koen@openembedded.org>2006-08-28 20:57:29 +0000
commit4f3fdadd87d7e5cea2bd97454857fbc4fd4018e0 (patch)
treec23064487b502432d9a5cf70bf8fa9e9529cd0c3 /conf
parent7e1b30bd2ac0c2d6d27813775cef64db17f04829 (diff)
parent98d2a57db6b822014361aabad9486fd426d88eaa (diff)
downloadopenembedded-4f3fdadd87d7e5cea2bd97454857fbc4fd4018e0.tar.gz
merge of 'c1a64808fc49d61ea2634c0c011011da9e5a7886'
and 'c6503f659bf477fbd684cf50b9a73db2e7af3bbc'
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/omap5912osk.conf6
1 files changed, 4 insertions, 2 deletions
diff --git a/conf/machine/omap5912osk.conf b/conf/machine/omap5912osk.conf
index a2c01add5d..04178166d9 100644
--- a/conf/machine/omap5912osk.conf
+++ b/conf/machine/omap5912osk.conf
@@ -10,8 +10,10 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-omap1"
PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
PREFERRED_VERSION_u-boot = "LABEL.2006.06.30.2020"
-#PREFERRED_VERSION_linux-omap1 = "2.6.17-omap1"
-PREFERRED_VERSION_linux-omap1 = "2.6.12-rc2"
+
+# Use current git until I can find a git tag that builds for omap5912osk
+PREFERRED_VERSION_linux-omap1 = "2.6.x+git"
+#PREFERRED_VERSION_linux-omap1 = "2.6.12-rc2"
BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral"