aboutsummaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorKoen Kooi <k-kooi@ti.com>2010-02-25 16:12:56 +0100
committerKoen Kooi <koen@openembedded.org>2010-04-12 19:43:20 +0200
commitb14ca0169babf5bd2a599b19ee156427b822ab00 (patch)
treeb2e13fad6aca56259cded0a3aa3c8805ad2dbd59 /conf
parent73efa8afa568d88ebf94563e9200fbcdfb669fbe (diff)
downloadopenembedded-b14ca0169babf5bd2a599b19ee156427b822ab00.tar.gz
openembedded-b14ca0169babf5bd2a599b19ee156427b822ab00.tar.bz2
openembedded-b14ca0169babf5bd2a599b19ee156427b822ab00.zip
linux-omap-psp 2.6.32: update to latest PSP git
* refresh patches and make them all git am'able * Add initial beagleboardXM support * make it the default for beagleboard * turn off rtc-ds1307 since it renders beagles without zippy expansion boards unbootable * PSP git broke multi usb gadget, disable it for now
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/beagleboard.conf2
-rw-r--r--conf/machine/include/omap3.inc2
2 files changed, 3 insertions, 1 deletions
diff --git a/conf/machine/beagleboard.conf b/conf/machine/beagleboard.conf
index a5de68e0af..bcbf23eaa8 100644
--- a/conf/machine/beagleboard.conf
+++ b/conf/machine/beagleboard.conf
@@ -15,6 +15,8 @@ GUI_MACHINE_CLASS = "bigscreen"
require conf/machine/include/omap3.inc
+PREFERRED_PROVIDER_virtual/kernel = "linux-omap-psp"
+
IMAGE_FSTYPES += "tar.bz2 ubi"
EXTRA_IMAGECMD_jffs2 = "-lnp "
diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
index 33e9d65eee..0723b89a61 100644
--- a/conf/machine/include/omap3.inc
+++ b/conf/machine/include/omap3.inc
@@ -3,7 +3,7 @@ SOC_FAMILY = "omap3"
require conf/machine/include/tune-cortexa8.inc
PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
# Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r60"
+MACHINE_KERNEL_PR = "r61"
KERNEL_IMAGETYPE = "uImage"