diff options
| author | Richard Purdie <richard@ted.(none)> | 2009-04-28 17:13:57 +0100 |
|---|---|---|
| committer | Richard Purdie <richard@ted.(none)> | 2009-04-28 17:13:57 +0100 |
| commit | 6a6f5cc8206f35dba044f59ae59ed878c2f8fb94 (patch) | |
| tree | d325b4fe4696551589573a1b43c19e82cc0cd0d1 /meta/conf | |
| parent | a8e1e028f85b4d6f37238b9cbb0bab19b5939b29 (diff) | |
| parent | 0adc74b06210f1be01145a5977a36b83aca0aa68 (diff) | |
| download | openembedded-core-6a6f5cc8206f35dba044f59ae59ed878c2f8fb94.tar.gz openembedded-core-6a6f5cc8206f35dba044f59ae59ed878c2f8fb94.tar.bz2 openembedded-core-6a6f5cc8206f35dba044f59ae59ed878c2f8fb94.tar.xz openembedded-core-6a6f5cc8206f35dba044f59ae59ed878c2f8fb94.zip | |
Merge branch 'marcin/trunk' of git://git.pokylinux.org/poky-contrib
Diffstat (limited to 'meta/conf')
| -rw-r--r-- | meta/conf/machine/beagleboard.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/conf/machine/beagleboard.conf b/meta/conf/machine/beagleboard.conf index 6a343068a..710fc7617 100644 --- a/meta/conf/machine/beagleboard.conf +++ b/meta/conf/machine/beagleboard.conf @@ -23,7 +23,7 @@ EXTRA_IMAGECMD_jffs2 = "-lnp " SERIAL_CONSOLE = "115200 ttyS2" # No kernel recipe yet -PREFERRED_PROVIDER_virtual/kernel = "linux-omap2" +PREFERRED_PROVIDER_virtual/kernel = "linux-omap" KERNEL_IMAGETYPE = "uImage" |