diff options
| author | Sergey Lapin <slapin@ossfans.org> | 2010-02-06 23:12:38 +0300 |
|---|---|---|
| committer | Sergey Lapin <slapin@ossfans.org> | 2010-02-06 23:12:38 +0300 |
| commit | 9dbc3d716405d56def0af95748632035864c07b7 (patch) | |
| tree | 8c2865915bcc385c78a32a1c67398e366fea02ae /conf/machine/include | |
| parent | 029e21c8111deafa850ad1724e48da29c321f2f8 (diff) | |
| parent | 01dcb228756ee2348a8f6257b39d196340b69d96 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'conf/machine/include')
| -rw-r--r-- | conf/machine/include/htc-msm7.inc | 19 | ||||
| -rw-r--r-- | conf/machine/include/htc-qsd8.inc | 30 | ||||
| -rw-r--r-- | conf/machine/include/kirkwood.inc | 2 |
3 files changed, 44 insertions, 7 deletions
diff --git a/conf/machine/include/htc-msm7.inc b/conf/machine/include/htc-msm7.inc index 5d7596f38d..32a48807af 100644 --- a/conf/machine/include/htc-msm7.inc +++ b/conf/machine/include/htc-msm7.inc @@ -1,9 +1,19 @@ # kernel -PREFERRED_PROVIDER_virtual/kernel = "linux-msm7xxxx" +PREFERRED_PROVIDER_virtual/kernel = "linux-msm7" # xserver -PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" -XSERVER = "xserver-kdrive-fbdev" +PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" + +XSERVER = " \ + xserver-xorg \ + xserver-xorg-extension-glx \ + xserver-xorg-extension-dri \ + xf86-input-evtouch \ + xf86-input-evdev \ + xf86-input-mouse \ + xf86-input-keyboard \ + xf86-video-msm \ +" # capability database MACHINE_DISPLAY_WIDTH_PIXELS = "480" @@ -15,9 +25,6 @@ MACHINE_CLASS = "htc-msm7" # features MACHINE_FEATURES = "kernel26 touchscreen screen phone gps usb keyboard" -# filesystems -IMAGE_FSTYPES = "tar.gz" - # CPU require conf/machine/include/tune-arm1136-novfp.inc diff --git a/conf/machine/include/htc-qsd8.inc b/conf/machine/include/htc-qsd8.inc new file mode 100644 index 0000000000..ac3e7d22ee --- /dev/null +++ b/conf/machine/include/htc-qsd8.inc @@ -0,0 +1,30 @@ +# kernel +PREFERRED_PROVIDER_virtual/kernel = "linux-qsd8" + +# xserver +PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" + +XSERVER = " \ + xserver-xorg \ + xserver-xorg-extension-glx \ + xserver-xorg-extension-dri \ + xf86-input-evtouch \ + xf86-input-evdev \ + xf86-input-mouse \ + xf86-input-keyboard \ + xf86-video-msm \ +" + +# capability database +MACHINE_DISPLAY_WIDTH_PIXELS = "480" +MACHINE_DISPLAY_HEIGHT_PIXELS = "640" + +# use this for overrides +MACHINE_CLASS = "htc-qsd8" + +# features +MACHINE_FEATURES = "kernel26 touchscreen screen phone gps usb keyboard" + +# CPU +TARGET_ARCH = "arm" +require conf/machine/include/tune-cortexa8.inc diff --git a/conf/machine/include/kirkwood.inc b/conf/machine/include/kirkwood.inc index c3c59aa48b..8507857b11 100644 --- a/conf/machine/include/kirkwood.inc +++ b/conf/machine/include/kirkwood.inc @@ -11,7 +11,7 @@ USE_DEVFS = "0" PREFERRED_PROVIDER_virtual/bootloader = "" PREFERRED_PROVIDER_virtual/kernel = "linux-kirkwood" -MACHINE_KERNEL_PR = "r14" +MACHINE_KERNEL_PR = "r16" IMAGE_FSTYPES += "tar.gz ubi" SERIAL_CONSOLE = "ttyS0 115200" |