summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/machine/beagleboard.conf6
-rw-r--r--packages/tasks/task-base.bb2
2 files changed, 4 insertions, 4 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"
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index c3ada840e2..a59002654a 100644
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r67"
+PR = "r68"
inherit task