Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Javier Viguera 2013-02-19 19:05:33 +01:00
parent 3c3aac2628
commit b0c1d5fd21
6 changed files with 85 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
meta-digi-arm/conf/machine/ccardimx28js.conf
View File

@ -4,7 +4,9 @@
include conf/machine/include/mxs-digi-base.inc include conf/machine/include/mxs-digi-base.inc
UBOOT_ENTRYPOINT = "0x41008000" SOC_FAMILY = "mxs"
UBOOT_ENTRYPOINT = "0x41008000"
UBOOT_LOADADDRESS = "0x41008000" UBOOT_LOADADDRESS = "0x41008000"
# Set UBOOT_CONFIG_VARIANT in local.conf accordingly, default is empty: 261MHz,360MHz,test,dbg # 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_BINARY = "u-boot-ivt.${UBOOT_SUFFIX}"
UBOOT_SYMLINK = 'u-boot-${MACHINE}${@base_conditional( "UBOOT_CONFIG_VARIANT", "", "-", "-${UBOOT_CONFIG_VARIANT}-", d )}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" 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"

15
meta-digi-arm/conf/machine/ccimx51js.conf
View File

@ -3,18 +3,19 @@
#@DESCRIPTION: Machine configuration for Digi's ConnectCore for MX51 JSK #@DESCRIPTION: Machine configuration for Digi's ConnectCore for MX51 JSK
include conf/machine/include/imx-digi-base.inc include conf/machine/include/imx-digi-base.inc
include conf/machine/include/tune-cortexa8.inc
SOC_FAMILY = "mx51:mx5" SOC_FAMILY = "mx51:mx5"
# Digi's kernel does not use device trees. MACHINE_FEATURES += "accel-video wifi"
# KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/ccimx51js.dts"
MACHINE_FEATURES += " wifi accel-video" UBOOT_ENTRYPOINT = "0x94000000"
UBOOT_LOADADDRESS = "0x94000000"
UBOOT_ENTRYPOINT_mx51 = "0x94000000"
UBOOT_LOADADDRESS_mx51 = "0x94000000"
SERIAL_CONSOLE = "38400 ttymxc1" 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" MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-module-redpine"

14
meta-digi-arm/conf/machine/ccimx53js.conf
View File

@ -3,16 +3,18 @@
#@DESCRIPTION: Machine configuration for Digi's ConnectCore for MX53 JSK. #@DESCRIPTION: Machine configuration for Digi's ConnectCore for MX53 JSK.
include conf/machine/include/imx-digi-base.inc include conf/machine/include/imx-digi-base.inc
include conf/machine/include/tune-cortexa8.inc
SOC_FAMILY = "mx53:mx5" SOC_FAMILY = "mx53:mx5"
# Digi's kernel does not use device tree. MACHINE_FEATURES += "accel-video wifi"
# KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx53-qsb.dts"
MACHINE_FEATURES += " wifi accel-video" UBOOT_ENTRYPOINT = "0x70800000"
UBOOT_LOADADDRESS = "0x70800000"
UBOOT_ENTRYPOINT_mx53 = "0x70800000" SERIAL_CONSOLE = "115200 ttymxc0"
UBOOT_LOADADDRESS_mx53 = "0x70800000"
# Firmware
MACHINE_FIRMWARE = "firmware-imx-vpu-imx53 firmware-imx-sdma-imx53"
MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}"
MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-module-redpine" MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-module-redpine"

13
meta-digi-arm/conf/machine/include/digi-defaults.inc
View File

@ -1,15 +1,16 @@
# Digi BSP default providers # Digi BSP default providers
PREFERRED_PROVIDER_virtual/kernel = "linux-imx" PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-imx"
PREFERRED_PROVIDER_u-boot = "u-boot-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_virtual/libx11 ?= "${@base_contains('DISTRO_FEATURES', 'x11', 'libx11', '', d)}"
PREFERRED_PROVIDER_jpeg-native ?= "jpeg-native" PREFERRED_PROVIDER_jpeg-native ?= "jpeg-native"
PREFERRED_VERSION_udev = "173"
# Digi BSP default settings # Digi BSP default settings
IMAGE_CLASSES += "image_types_digi" IMAGE_CLASSES = "image_types_digi"
# Do not enable console on VT (see sysvinit-inittab recipe) # Do not enable console on VT (see sysvinit-inittab recipe)
USE_VT = "0" USE_VT = "0"

41
meta-digi-arm/conf/machine/include/imx-digi-base.inc
View File

@ -1,10 +1,10 @@
# Provides the i.MXC architecture common settings # Digi's i.MX platforms common settings
include conf/machine/include/imx-base.inc
# Overrides the default FSL settings
# Single override file for settings, versions and providers.
include conf/machine/include/digi-defaults.inc 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_MAKE_TARGET = "u-boot.bin"
UBOOT_SUFFIX = "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_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}' 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 # 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"

31
meta-digi-arm/conf/machine/include/mxs-digi-base.inc
View File

@ -1,20 +1,27 @@
# Provides the i.MXS architecture common settings # Digi's i.MX platforms common settings
include conf/machine/include/mxs-base.inc
# Overrides the default FSL settings
# Single override file for settings, versions and providers.
include conf/machine/include/digi-defaults.inc include conf/machine/include/digi-defaults.inc
include conf/machine/include/soc-family.inc
include conf/machine/include/tune-arm926ejs.inc
# Flash image types # Disable perf features as 2.6.35.3 fail to build otherwise
SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3" PERF_FEATURES_ENABLE = ""
XSERVER = "xserver-xorg \
xf86-input-evdev \
xf86-video-fbdev"
# Ship kernel modules
MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
EXTRA_IMAGEDEPENDS = "u-boot" EXTRA_IMAGEDEPENDS = "u-boot"
# Flash image types
# [TODO] add SDCARD support # [TODO] add SDCARD support
# At the moment it's failing due to wrong u-boot image # At the moment it's failing due to wrong u-boot image
IMAGE_FSTYPES ?= "tar.bz2" # SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
IMAGE_FSTYPES += "sum.jffs2 ubifs" # 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' KERNEL_IMAGETYPE = "uImage"
WPA_DRIVER = "nl80211"
MACHINE_FEATURES = "apm usbgadget usbhost vfat alsa touchscreen bluetooth wifi"