From 9f5c37c95d539cddbafb195c852f1c008d8d0d38 Mon Sep 17 00:00:00 2001 From: Ricardo Salveti de Araujo Date: Thu, 26 Nov 2009 22:00:22 -0300 Subject: [PATCH 015/118] nokia800.conf: merging mamona changes Changes: - nokia8xx override - nokiait override - using xserver-kdrive-xomap until xserver-xorg is actually running with n800 - extra machine features - tar.bz2 should also be an fstype, as we can easily use an image at the sd card Signed-off-by: Ricardo Salveti de Araujo --- conf/machine/nokia800.conf | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/conf/machine/nokia800.conf b/conf/machine/nokia800.conf index 8d5a5b0..31b06da 100644 --- a/conf/machine/nokia800.conf +++ b/conf/machine/nokia800.conf @@ -1,13 +1,20 @@ #@TYPE: Machine #@NAME: Nokia 800 internet tablet #@DESCRIPTION: Machine configuration for the Nokia 800 +#@MAINTAINER: Mamona Developers + TARGET_ARCH = "arm" +OVERRIDES = "local:${MACHINE}:nokia8xx:nokiait:${PRODUCT}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}" + PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-xomap" -XSERVER = "xserver-xorg \ - xf86-input-evdev \ - xf86-input-tslib \ - xf86-video-omapfb " +XSERVER = "xserver-kdrive-xomap \ + xserver-kdrive-common " +# FIXME : xserver-kdrive-xomap is the only one that actually works atm, need to fix xserver-xorg before using it +#XSERVER = "xserver-xorg \ +# xf86-input-evdev \ +# xf86-input-tslib \ +# xf86-video-omapfb " GUI_MACHINE_CLASS = "bigscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "800" @@ -18,17 +25,17 @@ include conf/machine/include/tune-arm1136jf-s.inc ROOT_FLASH_SIZE = "174" EXTRA_IMAGECMD_jffs2_nokia800 = "--pad --little-endian --eraseblock=0x20000 -n" -IMAGE_FSTYPES ?= "jffs2" +IMAGE_FSTYPES ?= "tar.bz2 jffs2" SERIAL_CONSOLE = "115200 ttyS0" PREFERRED_PROVIDER_virtual/kernel = "linux-nokia800" -#use this if you are using the nokia initfs +# use this if you are using the nokia initfs ROOTFS_POSTPROCESS_COMMAND += " remove_init_link; " -MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost vfat" MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "nokia770-init" +MACHINE_FEATURES = "kernel26 bluetooth mmc usbgadget usbhost screen alsa touchscreen virtualkbd vfat wifi" # build tools EXTRA_IMAGEDEPENDS += "0xffff-native" -- 1.6.3.3