From f778c69b980f60051eacbab88ea0e377f5208377 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Wed, 22 Feb 2017 11:22:45 +0100 Subject: [PATCH] morty migration: sync machine config files with meta-freescale https://jira.digi.com/browse/DEL-3451 Signed-off-by: Javier Viguera --- .../conf/machine/include/ccardimx28.inc | 6 ++-- meta-digi-arm/conf/machine/include/ccimx6.inc | 8 ++--- .../conf/machine/include/ccimx6ul.inc | 8 ++--- .../conf/machine/include/digi-defaults.inc | 2 +- .../conf/machine/include/imx-digi-base.inc | 30 ++++++++++++++----- 5 files changed, 34 insertions(+), 20 deletions(-) diff --git a/meta-digi-arm/conf/machine/include/ccardimx28.inc b/meta-digi-arm/conf/machine/include/ccardimx28.inc index b7198a6a6..ab0ce8835 100644 --- a/meta-digi-arm/conf/machine/include/ccardimx28.inc +++ b/meta-digi-arm/conf/machine/include/ccardimx28.inc @@ -2,12 +2,12 @@ #@NAME: ConnectCore for MX28 module. #@DESCRIPTION: Machine configuration for Digi's ConnectCore for MX28 module. +DIGI_FAMILY = "ccardimx28" +MACHINEOVERRIDES =. "mxs:mx28:${DIGI_FAMILY}:" + include conf/machine/include/imx-digi-base.inc include conf/machine/include/tune-arm926ejs.inc -DIGI_FAMILY = "ccardimx28" -SOC_FAMILY = "mxs:mx28:${DIGI_FAMILY}" - # Platform u-boot settings UBOOT_ENTRYPOINT = "0x40008000" UBOOT_SUFFIX = "sb" diff --git a/meta-digi-arm/conf/machine/include/ccimx6.inc b/meta-digi-arm/conf/machine/include/ccimx6.inc index b0d4e2a7c..b3477ba03 100644 --- a/meta-digi-arm/conf/machine/include/ccimx6.inc +++ b/meta-digi-arm/conf/machine/include/ccimx6.inc @@ -2,12 +2,12 @@ #@NAME: ConnectCore 6 module. #@DESCRIPTION: Machine configuration for Digi's ConnectCore 6 module. +DIGI_FAMILY = "ccimx6" +MACHINEOVERRIDES =. "mx6:mx6dl:mx6q:${DIGI_FAMILY}:" + include conf/machine/include/imx-digi-base.inc include conf/machine/include/tune-cortexa9.inc -DIGI_FAMILY = "ccimx6" -SOC_FAMILY = "mx6:mx6dl:mx6q:${DIGI_FAMILY}" - # Platform u-boot settings UBOOT_ENTRYPOINT = "0x10800000" UBOOT_SUFFIX = "imx" @@ -30,6 +30,6 @@ MACHINE_EXTRA_RDEPENDS += " \ u-boot-fw-utils \ " MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE} ${WIRELESS_MODULE}" -MACHINE_EXTRA_RRECOMMENDS += "fsl-alsa-plugins cryptodev-module rng-tools" +MACHINE_EXTRA_RRECOMMENDS += "imx-alsa-plugins cryptodev-module rng-tools" MACHINE_FEATURES += "accel-graphics accel-video wifi bluetooth" diff --git a/meta-digi-arm/conf/machine/include/ccimx6ul.inc b/meta-digi-arm/conf/machine/include/ccimx6ul.inc index 819cfb730..23537c811 100644 --- a/meta-digi-arm/conf/machine/include/ccimx6ul.inc +++ b/meta-digi-arm/conf/machine/include/ccimx6ul.inc @@ -2,12 +2,12 @@ #@NAME: ConnectCore for i.MX6UL. #@DESCRIPTION: Machine configuration for Digi's ConnectCore 6UL. +DIGI_FAMILY = "ccimx6ul" +MACHINEOVERRIDES =. "mx6:mx6ul:${DIGI_FAMILY}:" + include conf/machine/include/imx-digi-base.inc include conf/machine/include/tune-cortexa7.inc -DIGI_FAMILY = "ccimx6ul" -SOC_FAMILY = "mx6ul:${DIGI_FAMILY}" - # Platform u-boot settings UBOOT_SUFFIX = "imx" UBOOT_SYMLINK = "u-boot-${MACHINE}.${UBOOT_SUFFIX}" @@ -26,7 +26,7 @@ MACHINE_EXTRA_RDEPENDS += " \ u-boot-fw-utils \ " MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE} ${WIRELESS_MODULE}" -MACHINE_EXTRA_RRECOMMENDS += "fsl-alsa-plugins cryptodev-module" +MACHINE_EXTRA_RRECOMMENDS += "imx-alsa-plugins cryptodev-module" MACHINE_FEATURES += "wifi bluetooth" diff --git a/meta-digi-arm/conf/machine/include/digi-defaults.inc b/meta-digi-arm/conf/machine/include/digi-defaults.inc index 754a2a6e7..9cbde48ae 100644 --- a/meta-digi-arm/conf/machine/include/digi-defaults.inc +++ b/meta-digi-arm/conf/machine/include/digi-defaults.inc @@ -45,7 +45,7 @@ P2P0_STATIC_NETMASK ?= "255.255.255.0" IMAGE_CLASSES = "image_types_digi" # Do not enable console on VT (see sysvinit-inittab recipe) -USE_VT = "0" +USE_VT ?= "0" # Add the machine variant to the valid machine override MACHINE_VARIANT ?= "" 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 151948418..b5447c7de 100644 --- a/meta-digi-arm/conf/machine/include/imx-digi-base.inc +++ b/meta-digi-arm/conf/machine/include/imx-digi-base.inc @@ -1,9 +1,8 @@ # Digi's i.MX platforms common settings include conf/machine/include/digi-defaults.inc -include conf/machine/include/soc-family.inc XSERVER_DRIVER = "xf86-video-fbdev" -XSERVER_DRIVER_mx6 = "xf86-video-imxfb-vivante" +XSERVER_DRIVER_imxgpu2d = "xf86-video-imxfb-vivante" XSERVER = "xserver-xorg \ xf86-input-evdev \ ${XSERVER_DRIVER}" @@ -21,26 +20,41 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-modules" DEFAULTTUNE_mx6 ?= "cortexa9thf-neon" DEFAULTTUNE_mx6ul ?= "cortexa7thf-neon" +INHERIT += "machine-overrides-extender" + +MACHINEOVERRIDES_EXTENDER_mx6q = "imxipu:imxvpu:imxgpu2d:imxgpu3d" +MACHINEOVERRIDES_EXTENDER_mx6dl = "imxpxp:imxipu:imxvpu:imxgpu2d:imxgpu3d:imxepdc" +MACHINEOVERRIDES_EXTENDER_mx6ul = "imxpxp" + # Sub-architecture support MACHINE_SOCARCH_SUFFIX ?= "" MACHINE_SOCARCH_SUFFIX_mx6q = "-mx6qdl" MACHINE_SOCARCH_SUFFIX_mx6dl = "-mx6qdl" MACHINE_SOCARCH_SUFFIX_mx6ul = "-mx6ul" -MACHINE_ARCH_FILTER = "virtual/kernel imx-vpu" -MACHINE_SOCARCH_FILTER_append_mx6 = " libfslcodec libfslvpuwrap libfslparser" -MACHINE_SOCARCH_FILTER_append_mx6 = " virtual/libopenvg virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl virtual/libg2d" +MACHINE_ARCH_FILTER = "virtual/kernel" +MACHINE_SOCARCH_FILTER_append_imxvpu = " imx-vpu libimxvpuapi imx-codec imx-vpuwrap imx-parser" +MACHINE_SOCARCH_FILTER_append_imxgpu2d = " virtual/libopenvg virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl virtual/libg2d cairo pango" +MACHINE_SOCARCH_FILTER_append_imxpxp = " imx-codec imx-parser" INHERIT += "fsl-dynamic-packagearch" +SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS_append = " \ + imx-gpu-viv->kernel-module-imx-gpu-viv \ + libimxvpuapi->imx-vpu \ + imx-vpuwrap->imx-vpu \ + imx-codec->imx-vpu \ + imx-test->imx-vpu \ +" + # Extra udev rules MACHINE_EXTRA_RRECOMMENDS += "udev-extraconf udev-rules-imx" # GStreamer 1.0 plugins MACHINE_GSTREAMER_1_0_PLUGIN ?= "" -MACHINE_GSTREAMER_1_0_PLUGIN_mx6q ?= "gst1.0-fsl-plugin gst1.0-fsl-plugin-gplay gst1.0-fsl-plugin-grecorder" -MACHINE_GSTREAMER_1_0_PLUGIN_mx6dl ?= "gst1.0-fsl-plugin gst1.0-fsl-plugin-gplay gst1.0-fsl-plugin-grecorder" -MACHINE_GSTREAMER_1_0_PLUGIN_mx6ul ?= "gst1.0-fsl-plugin gst1.0-fsl-plugin-gplay gst1.0-fsl-plugin-grecorder" +MACHINE_GSTREAMER_1_0_PLUGIN_mx6q ?= "imx-gst1.0-plugin imx-gst1.0-plugin-gplay imx-gst1.0-plugin-grecorder" +MACHINE_GSTREAMER_1_0_PLUGIN_mx6dl ?= "imx-gst1.0-plugin imx-gst1.0-plugin-gplay imx-gst1.0-plugin-grecorder" +MACHINE_GSTREAMER_1_0_PLUGIN_mx6ul ?= "imx-gst1.0-plugin imx-gst1.0-plugin-gplay imx-gst1.0-plugin-grecorder" # Determines if the SoC has support for Vivante kernel driver SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT = "0"