[PATCH 07/12 v2] motorola-ezx-base.inc: refresh machine definition

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 31-05-10 16:28, Antonio Ospite wrote:
> Reorder sections to a more logic scheme, following magician.conf, other
> cleanups:
> 
>  * sort MACHINE_FEATURES alphabetically
>  * add ezx-gen-blob to EXTRA_IMAGEDEPENDS
>  * use MODUTILS=26
>  * Add needed kernel modules for BP
> 
> Signed-off-by: Antonio Ospite <ospite at studenti.unina.it>

Acked-by: Koen Kooi <koen at openembedded.org>


> ---
> 
> Changes since v1:
> 
> Drop the IMAGE_DEV_MANAGER = "" bit, as Koen remarked this belongs to
> image not machine.
> 
> Regards,
>    Antonio
> 
>  conf/machine/include/motorola-ezx-base.inc |   43 +++++++++++++++++----------
>  1 files changed, 27 insertions(+), 16 deletions(-)
> 
> diff --git a/conf/machine/include/motorola-ezx-base.inc b/conf/machine/include/motorola-ezx-base.inc
> index 9ad2f14..3fb42f4 100644
> --- a/conf/machine/include/motorola-ezx-base.inc
> +++ b/conf/machine/include/motorola-ezx-base.inc
> @@ -1,7 +1,16 @@
> +# use this for overrides
> +MACHINE_CLASS = "motorola-ezx"
> +
> +#
> +# Hardware-based properties
> +#
>  TARGET_ARCH = "arm"
>  
> -PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
> -PREFERRED_PROVIDER_virtual/kernel ?= "openezx-kernel"
> +# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
> +require conf/machine/include/tune-xscale.inc
> +
> +# Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first
> +#require conf/machine/include/tune-iwmmxt.inc
>  
>  #cat /proc/mtd
>  #dev:    size   erasesize  name
> @@ -10,34 +19,36 @@ PREFERRED_PROVIDER_virtual/kernel ?= "openezx-kernel"
>  #mtd2: 00580000 00020000 "VFM_Filesystem"
>  #mtd3: 00020000 00020000 "Logo"
>  
> -MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth usbgadget usbhost keyboard screen phone"
> -MACHINE_FEATURES += " iwmmxt"
> -
> +ROOT_FLASH_SIZE = "24"
> +MACHINE_GUI_CLASS = "smallscreen"
>  MACHINE_DISPLAY_WIDTH_PIXELS = "240"
>  MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
>  MACHINE_DISPLAY_ORIENTATION = "0"
>  MACHINE_DISPLAY_PPI = "180"
> +MACHINE_FEATURES = "alsa apm bluetooth kernel26 keyboard phone screen touchscreen usbgadget usbhost vfat"
> +MACHINE_FEATURES += " iwmmxt"
>  
> -# use this for overrides
> -MACHINE_CLASS = "motorola-ezx"
> -
> +#
> +# Software/packages selection
> +#
> +PREFERRED_PROVIDER_virtual/kernel ?= "openezx-kernel"
> +MODUTILS = "26"	
>  XSERVER = "xserver-kdrive-fbdev"
> -
> -ROOT_FLASH_SIZE = "24"
> +PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
>  
>  IMAGE_FSTYPES ?= "jffs2"
>  EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
>  
> -EXTRA_IMAGEDEPENDS += "ezx-boot-usb-native"
> +EXTRA_IMAGEDEPENDS += "ezx-boot-usb-native ezx-gen-blob"
>  
> -# the EZX phones need a userspace daemon to stop the BP from shutting down the phone
> -MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "ezxd"
> +IMAGE_INSTALL_append += "\
> +  kernel-module-ohci-hcd \
> +  kernel-module-moto-usb-ipc \
> +  kernel-module-ts27010mux \
> +"
>  
>  # Ezxd needs to be started very early so we need the mux devices in static /dev
>  IMAGE_DEVICE_TABLES = "files/device_table-minimal.txt \
>                         files/device_table-ezx.txt"
>  
> -# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
> -require conf/machine/include/tune-xscale.inc
> -
>  SERIAL_CONSOLE = "115200 ttyS0"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFMA+ShMkyGM64RGpERAqwmAJ0VVAVvp2Hl/iQRTXaHz9jBnsLZTwCglWF3
nIrYQcobWkB002urMk8kN58=
=69z5
-----END PGP SIGNATURE-----