diff options
| author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-05-01 20:34:12 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-05-01 20:34:12 +0000 |
| commit | aadc224474b16ce789e357665147666c3f2ca6ee (patch) | |
| tree | a826749e5b9c4e7711f542d9df56e08eb894b420 | |
| parent | c928c63119e7946ede587fcd633f752859d0b77e (diff) | |
| parent | 349d59919077eff86e3fb48215459697d30e9731 (diff) | |
merge of 'a1d436a1b0cce90dce4363a3bfd62bd8c6f53913'
and 'e4016811f7d88c926c4dc798795d2b46651ddaf7'
| -rw-r--r-- | conf/machine/beagleboard.conf | 6 | ||||
| -rw-r--r-- | packages/tasks/task-base.bb | 2 |
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 |