diff options
| author | Koen Kooi <koen@openembedded.org> | 2008-08-07 11:14:47 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2008-08-07 11:14:47 +0000 |
| commit | 9000ac7f4d6c3b230c1845b07725113c420b4981 (patch) | |
| tree | 6bf5f8113d9fade1af5bbdaaab23f494b681f814 | |
| parent | d0e8cbe858493dc40709e264a7b25ba89866e0f8 (diff) | |
| parent | 75c31cfbfe04621d2be4a905ac74eddb1cb2a48b (diff) | |
merge of '5a2fb2965a905224af0a1e26d73f342ecf8944e8'
and '6fc6bb1fff3ea7b5546ddedf048c33f9a287ac15'
| -rw-r--r-- | conf/machine/beagleboard.conf | 10 | ||||
| -rw-r--r-- | packages/tasks/task-base.bb | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/conf/machine/beagleboard.conf b/conf/machine/beagleboard.conf index cbd82fa467..5d88adee4a 100644 --- a/conf/machine/beagleboard.conf +++ b/conf/machine/beagleboard.conf @@ -4,8 +4,12 @@ TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6 armv7 armv7a" -PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" -XSERVER = "xserver-kdrive-fbdev" +PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" +XSERVER = "xserver-xorg \ + xf86-input-evdev \ + xf86-input-mouse \ + xf86-video-fbdev \ + xf86-input-keyboard" # Only has DVI connector for external screen GUI_MACHINE_CLASS = "bigscreen" @@ -36,4 +40,4 @@ PREFERRED_VERSION_u-boot = "git" EXTRA_IMAGEDEPENDS += "u-boot x-load" # and sdio -MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat alsa" +MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa" diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index 69dfd0133d..8ca1991ee4 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 = "r71" +PR = "r72" inherit task |