diff options
| author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2010-06-20 19:25:43 +0400 |
|---|---|---|
| committer | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2010-06-20 19:25:43 +0400 |
| commit | 22ff63fa0ea80d5afcddcf442bbf47c90e0468df (patch) | |
| tree | 320b1fb85a429c9be6b7b86130232c9ce9600ae7 /conf/machine | |
| parent | 982a1168dc24ca1bd36b068d60981a2c5cb2880d (diff) | |
| parent | c5955cfe486cb84ba27ad0692ceecdaab779bb99 (diff) | |
Merge branch 'org.openembedded.dev' of git://git.openembedded.org/openembedded into org.openembedded.dev
Diffstat (limited to 'conf/machine')
| -rw-r--r-- | conf/machine/include/zaurus-2.6.inc | 2 | ||||
| -rw-r--r-- | conf/machine/omap5912osk.conf | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index 8147c77bc9..0e347e2567 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus-2.6.inc @@ -47,7 +47,7 @@ XSERVER_akita = "xserver-kdrive-1300-fbdev" # spitz uses xserver-xorg PREFERRED_PROVIDER_virtual/xserver_spitz = "xserver-xorg" -XSERVER_spitz = "xserver-xorg xf86-input-keyboard xf86-input-mouse xf86-input-evdev" +XSERVER_spitz = "xserver-xorg xf86-video-fbdev xf86-input-keyboard xf86-input-mouse xf86-input-evdev" PREFERRED_PROVIDER_virtual/libgl_spitz = "mesa-dri" diff --git a/conf/machine/omap5912osk.conf b/conf/machine/omap5912osk.conf index 9fcd76e87f..4989a33e9d 100644 --- a/conf/machine/omap5912osk.conf +++ b/conf/machine/omap5912osk.conf @@ -5,7 +5,8 @@ TARGET_ARCH = "arm" PREFERRED_PROVIDER_xserver = "xserver-kdrive" -PREFERRED_PROVIDER_virtual/kernel = "linux-omap" +PREFERRED_PROVIDER_virtual/kernel = "linux" +KERNEL_IMAGETYPE = "uImage" UBOOT_ENTRYPOINT="0x10c08000" |