diff options
| author | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-01-14 20:39:47 +0100 |
|---|---|---|
| committer | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-01-14 20:39:47 +0100 |
| commit | 3fd04f71ad25d5df59c636986f741b9a36ce6501 (patch) | |
| tree | 995f4a15764d4196a92ecd966150e38d910d57d1 /conf/machine/jornada6xx.conf | |
| parent | b5b3d83a6f3b1c04a4ebe09f636683ef22495d09 (diff) | |
| parent | e426517ed76c7532434f0687f88fca1295530000 (diff) | |
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
Conflicts:
recipes/linux/linux-kirkwood_2.6.33-rc1.bb
Diffstat (limited to 'conf/machine/jornada6xx.conf')
| -rw-r--r-- | conf/machine/jornada6xx.conf | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/conf/machine/jornada6xx.conf b/conf/machine/jornada6xx.conf index c5249d94ef..f709f51c09 100644 --- a/conf/machine/jornada6xx.conf +++ b/conf/machine/jornada6xx.conf @@ -6,9 +6,16 @@ TARGET_ARCH = "sh3" require conf/machine/include/tune-sh3.inc +MACHINE_FEATURES = "kernel26 alsa pcmcia irda keyboard touchscreen screen vfat" +MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" + PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-jornada6xx" -PREFERRED_VERSION_linux-jlime-jornada6xx = "2.6.17" +PREFERRED_VERSION_linux-jlime-jornada6xx = "2.6.32" + +PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" +XSERVER = "xserver-xorg \ + xf86-input-evdev \ + xf86-input-tslib \ + xf86-video-fbdev" -MACHINE_FEATURES = "kernel26 pcmcia irda keyboard touchscreen screen vfat" -MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" PCMCIA_MANAGER = "pcmciautils"
\ No newline at end of file |