From b0c1d5fd215e7f9a7d594131a6e914e8a8d6813f Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Tue, 19 Feb 2013 19:05:33 +0100
Subject: [PATCH] meta-digi-arm: rework machine configuration files

So they don't depend on the machine files from meta-fs-arm layer.

This allows to override some settings in project's local.conf file.

https://jira.digi.com/browse/DEL-219 #resolve

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 meta-digi-arm/conf/machine/ccardimx28js.conf  | 20 ++++-----
 meta-digi-arm/conf/machine/ccimx51js.conf     | 15 +++----
 meta-digi-arm/conf/machine/ccimx53js.conf     | 14 ++++---
 .../conf/machine/include/digi-defaults.inc    | 13 +++---
 .../conf/machine/include/imx-digi-base.inc    | 41 +++++++++++++++----
 .../conf/machine/include/mxs-digi-base.inc    | 31 ++++++++------
 6 files changed, 85 insertions(+), 49 deletions(-)

diff --git a/meta-digi-arm/conf/machine/ccardimx28js.conf b/meta-digi-arm/conf/machine/ccardimx28js.conf
index 133bcd3a3..aead85564 100644
--- a/meta-digi-arm/conf/machine/ccardimx28js.conf
+++ b/meta-digi-arm/conf/machine/ccardimx28js.conf
@@ -4,7 +4,9 @@
 
 include conf/machine/include/mxs-digi-base.inc
 
-UBOOT_ENTRYPOINT = "0x41008000"
+SOC_FAMILY = "mxs"
+
+UBOOT_ENTRYPOINT  = "0x41008000"
 UBOOT_LOADADDRESS = "0x41008000"
 
 # Set UBOOT_CONFIG_VARIANT in local.conf accordingly, default is empty: 261MHz,360MHz,test,dbg
@@ -16,17 +18,13 @@ UBOOT_IMAGE = 'u-boot-${MACHINE}${@base_conditional( "UBOOT_CONFIG_VARIANT", "",
 UBOOT_BINARY = "u-boot-ivt.${UBOOT_SUFFIX}"
 UBOOT_SYMLINK = 'u-boot-${MACHINE}${@base_conditional( "UBOOT_CONFIG_VARIANT", "", "-", "-${UBOOT_CONFIG_VARIANT}-", d )}ivt.${UBOOT_SUFFIX}'
 
-KERNEL_IMAGETYPE = "uImage"
-
-# Digi's kernel does not use device tree.
-# KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/ccardimx28js.dts"
-
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-module-atheros"
-
 SERIAL_CONSOLE = "115200 ttyAM0"
 
-KERNEL_IMAGETYPE = "uImage"
+# wpa_supplicant driver to use in '/etc/network/interfaces'
+WPA_DRIVER = "nl80211"
 
-MACHINE_FEATURES = "apm usbgadget usbhost vfat alsa touchscreen bluetooth wifi"
+# Firmware
+MACHINE_FIRMWARE = "firmware-mxs-ar3k"
+MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}"
 
-MACHINE_FIRMWARE += "firmware-mxs-ar3k"
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-module-atheros"
diff --git a/meta-digi-arm/conf/machine/ccimx51js.conf b/meta-digi-arm/conf/machine/ccimx51js.conf
index 9ca2b75b0..272d9b280 100644
--- a/meta-digi-arm/conf/machine/ccimx51js.conf
+++ b/meta-digi-arm/conf/machine/ccimx51js.conf
@@ -3,18 +3,19 @@
 #@DESCRIPTION: Machine configuration for Digi's ConnectCore for MX51 JSK
 
 include conf/machine/include/imx-digi-base.inc
-include conf/machine/include/tune-cortexa8.inc
 
 SOC_FAMILY = "mx51:mx5"
 
-# Digi's kernel does not use device trees.
-# KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/ccimx51js.dts"
+MACHINE_FEATURES += "accel-video wifi"
 
-MACHINE_FEATURES += " wifi accel-video"
-
-UBOOT_ENTRYPOINT_mx51  = "0x94000000"
-UBOOT_LOADADDRESS_mx51 = "0x94000000"
+UBOOT_ENTRYPOINT  = "0x94000000"
+UBOOT_LOADADDRESS = "0x94000000"
 
 SERIAL_CONSOLE = "38400 ttymxc1"
 
+# Firmware
+MACHINE_FIRMWARE = "firmware-imx-vpu-imx51 firmware-imx-sdma-imx51"
+
+MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}"
+
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-module-redpine"
diff --git a/meta-digi-arm/conf/machine/ccimx53js.conf b/meta-digi-arm/conf/machine/ccimx53js.conf
index e97255ea5..5d7588a36 100644
--- a/meta-digi-arm/conf/machine/ccimx53js.conf
+++ b/meta-digi-arm/conf/machine/ccimx53js.conf
@@ -3,16 +3,18 @@
 #@DESCRIPTION: Machine configuration for Digi's ConnectCore for MX53 JSK.
 
 include conf/machine/include/imx-digi-base.inc
-include conf/machine/include/tune-cortexa8.inc
 
 SOC_FAMILY = "mx53:mx5"
 
-# Digi's kernel does not use device tree.
-# KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx53-qsb.dts"
+MACHINE_FEATURES += "accel-video wifi"
 
-MACHINE_FEATURES += " wifi accel-video"
+UBOOT_ENTRYPOINT  = "0x70800000"
+UBOOT_LOADADDRESS = "0x70800000"
 
-UBOOT_ENTRYPOINT_mx53  = "0x70800000"
-UBOOT_LOADADDRESS_mx53 = "0x70800000"
+SERIAL_CONSOLE = "115200 ttymxc0"
+
+# Firmware
+MACHINE_FIRMWARE = "firmware-imx-vpu-imx53 firmware-imx-sdma-imx53"
+MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}"
 
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-module-redpine"
diff --git a/meta-digi-arm/conf/machine/include/digi-defaults.inc b/meta-digi-arm/conf/machine/include/digi-defaults.inc
index 639a16ac9..be96780cb 100644
--- a/meta-digi-arm/conf/machine/include/digi-defaults.inc
+++ b/meta-digi-arm/conf/machine/include/digi-defaults.inc
@@ -1,15 +1,16 @@
 # Digi BSP default providers
-PREFERRED_PROVIDER_virtual/kernel = "linux-imx"
-PREFERRED_PROVIDER_u-boot = "u-boot-imx"
+PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-imx"
+PREFERRED_PROVIDER_u-boot ?= "u-boot-imx"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-imx"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 
-PREFERRED_PROVIDER_virtual/egl_mx5      = "${@base_contains('DISTRO_FEATURES', 'x11', 'amd-gpu-x11-bin-mx51', 'amd-gpu-bin-mx51', d)}"
-PREFERRED_PROVIDER_virtual/libgles1_mx5 = "${@base_contains('DISTRO_FEATURES', 'x11', 'amd-gpu-x11-bin-mx51', 'amd-gpu-bin-mx51', d)}"
-PREFERRED_PROVIDER_virtual/libgles2_mx5 = "${@base_contains('DISTRO_FEATURES', 'x11', 'amd-gpu-x11-bin-mx51', 'amd-gpu-bin-mx51', d)}"
 PREFERRED_PROVIDER_virtual/libx11 ?= "${@base_contains('DISTRO_FEATURES', 'x11', 'libx11', '', d)}"
 PREFERRED_PROVIDER_jpeg-native ?= "jpeg-native"
 
+PREFERRED_VERSION_udev = "173"
+
 # Digi BSP default settings
-IMAGE_CLASSES += "image_types_digi"
+IMAGE_CLASSES = "image_types_digi"
 
 # Do not enable console on VT (see sysvinit-inittab recipe)
 USE_VT = "0"
diff --git a/meta-digi-arm/conf/machine/include/imx-digi-base.inc b/meta-digi-arm/conf/machine/include/imx-digi-base.inc
index cef9d9443..0333dd97d 100644
--- a/meta-digi-arm/conf/machine/include/imx-digi-base.inc
+++ b/meta-digi-arm/conf/machine/include/imx-digi-base.inc
@@ -1,10 +1,10 @@
-# Provides the i.MXC architecture common settings
-include conf/machine/include/imx-base.inc
-
-# Overrides the default FSL settings
-
-# Single override file for settings, versions and providers.
+# Digi's i.MX platforms common settings
 include conf/machine/include/digi-defaults.inc
+include conf/machine/include/soc-family.inc
+include conf/machine/include/tune-cortexa8.inc
+
+# Disable perf features as 2.6.35.3 fail to build otherwise
+PERF_FEATURES_ENABLE = ""
 
 UBOOT_MAKE_TARGET = "u-boot.bin"
 UBOOT_SUFFIX = "bin"
@@ -21,5 +21,32 @@ UBOOT_MACHINE = '${MACHINE}${@base_conditional( "UBOOT_CONFIG_VARIANT", "", "_",
 UBOOT_IMAGE = 'u-boot-${MACHINE}${@base_conditional( "UBOOT_CONFIG_VARIANT", "", "-", "-${UBOOT_CONFIG_VARIANT}-", d )}${PV}-${PR}.${UBOOT_SUFFIX}'
 UBOOT_SYMLINK = 'u-boot-${MACHINE}${@base_conditional( "UBOOT_CONFIG_VARIANT", "", "", "-${UBOOT_CONFIG_VARIANT}", d )}.${UBOOT_SUFFIX}'
 
+XSERVER = "xserver-xorg \
+           xf86-input-evdev \
+           xf86-video-imxfb"
+
+# Ship kernel modules
+MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
+
+# Extra audio support
+MACHINE_EXTRA_RRECOMMENDS += "imx-audio"
+
+# Extra udev rules
+MACHINE_EXTRA_RRECOMMENDS += "udev-extraconf"
+
+# Gstreamer plugin
+MACHINE_GSTREAMER_PLUGIN ?= "gst-fsl-plugin"
+
+PREFERRED_PROVIDER_virtual/egl_mx5      ?= "${@base_contains('DISTRO_FEATURES', 'x11', 'amd-gpu-x11-bin-mx51', 'amd-gpu-bin-mx51', d)}"
+PREFERRED_PROVIDER_virtual/libgles1_mx5 ?= "${@base_contains('DISTRO_FEATURES', 'x11', 'amd-gpu-x11-bin-mx51', 'amd-gpu-bin-mx51', d)}"
+PREFERRED_PROVIDER_virtual/libgles2_mx5 ?= "${@base_contains('DISTRO_FEATURES', 'x11', 'amd-gpu-x11-bin-mx51', 'amd-gpu-bin-mx51', d)}"
+
+EXTRA_IMAGEDEPENDS = "u-boot"
+
 # Flash image types
-IMAGE_FSTYPES += "sum.jffs2 ubifs"
+SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
+IMAGE_FSTYPES ?= "ext3 sdcard sum.jffs2 tar.bz2 ubifs"
+
+KERNEL_IMAGETYPE = "uImage"
+
+MACHINE_FEATURES = "apm usbgadget usbhost vfat alsa touchscreen"
diff --git a/meta-digi-arm/conf/machine/include/mxs-digi-base.inc b/meta-digi-arm/conf/machine/include/mxs-digi-base.inc
index b0f665c11..53ee16c25 100644
--- a/meta-digi-arm/conf/machine/include/mxs-digi-base.inc
+++ b/meta-digi-arm/conf/machine/include/mxs-digi-base.inc
@@ -1,20 +1,27 @@
-# Provides the i.MXS architecture common settings
-include conf/machine/include/mxs-base.inc
-
-# Overrides the default FSL settings
-
-# Single override file for settings, versions and providers.
+# Digi's i.MX platforms common settings
 include conf/machine/include/digi-defaults.inc
+include conf/machine/include/soc-family.inc
+include conf/machine/include/tune-arm926ejs.inc
 
-# Flash image types
-SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
+# Disable perf features as 2.6.35.3 fail to build otherwise
+PERF_FEATURES_ENABLE = ""
+
+XSERVER = "xserver-xorg \
+           xf86-input-evdev \
+           xf86-video-fbdev"
+
+# Ship kernel modules
+MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
 
 EXTRA_IMAGEDEPENDS = "u-boot"
 
+# Flash image types
 # [TODO] add SDCARD support
 # At the moment it's failing due to wrong u-boot image
-IMAGE_FSTYPES ?= "tar.bz2"
-IMAGE_FSTYPES += "sum.jffs2 ubifs"
+# SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
+# IMAGE_FSTYPES ?= "ext3 sdcard sum.jffs2 tar.bz2 ubifs"
+IMAGE_FSTYPES ?= "sum.jffs2 tar.bz2 ubifs"
 
-# wpa_supplicant driver to use in '/etc/network/interfaces'
-WPA_DRIVER = "nl80211"
+KERNEL_IMAGETYPE = "uImage"
+
+MACHINE_FEATURES = "apm usbgadget usbhost vfat alsa touchscreen bluetooth wifi"