summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-05-01 20:34:12 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-05-01 20:34:12 +0000
commitaadc224474b16ce789e357665147666c3f2ca6ee (patch)
treea826749e5b9c4e7711f542d9df56e08eb894b420 /conf
parentc928c63119e7946ede587fcd633f752859d0b77e (diff)
parent349d59919077eff86e3fb48215459697d30e9731 (diff)
merge of 'a1d436a1b0cce90dce4363a3bfd62bd8c6f53913'
and 'e4016811f7d88c926c4dc798795d2b46651ddaf7'
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/beagleboard.conf6
1 files changed, 3 insertions, 3 deletions
diff --git a/conf/machine/beagleboard.conf b/conf/machine/beagleboard.conf
index a8193fd69c..637126b1e3 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"
@@ -34,4 +34,4 @@ UBOOT_LOADADDRESS = "0x80008000"
# and sdio
-MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat"
+MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat alsa"