From f18a3162fcd304ad2cb255144a0e2c246c96ddac Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Thu, 13 Dec 2012 13:48:17 +0100 Subject: [PATCH] meta-digi-arm: include missing soc-family.inc This is needed to use SOC_FAMILY data and was the reason why imx-lib was not compiling correctly (see commit cec37f0). Thus revert also commit cec37f0 because that workaround is not needed anymore. Signed-off-by: Javier Viguera --- meta-digi-arm/conf/machine/ccxmx51js.conf | 1 + meta-digi-arm/conf/machine/ccxmx53js.conf | 1 + .../fsl-mm-core/imx-lib_11.09.01.bbappend | 7 ------- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/meta-digi-arm/conf/machine/ccxmx51js.conf b/meta-digi-arm/conf/machine/ccxmx51js.conf index edcb96120..789029362 100644 --- a/meta-digi-arm/conf/machine/ccxmx51js.conf +++ b/meta-digi-arm/conf/machine/ccxmx51js.conf @@ -2,6 +2,7 @@ #@NAME: ConnectCore for MX51 JumpStart Kit. #@DESCRIPTION: Machine configuration for Digi's ConnectCore for MX51 JSK +include conf/machine/include/soc-family.inc include conf/machine/include/imx-digi-base.inc include conf/machine/include/tune-cortexa8.inc diff --git a/meta-digi-arm/conf/machine/ccxmx53js.conf b/meta-digi-arm/conf/machine/ccxmx53js.conf index 3a812672e..841ef0140 100644 --- a/meta-digi-arm/conf/machine/ccxmx53js.conf +++ b/meta-digi-arm/conf/machine/ccxmx53js.conf @@ -2,6 +2,7 @@ #@NAME: ConnectCore for MX53 JumpStart Kit. #@DESCRIPTION: Machine configuration for Digi's ConnectCore for MX53 JSK. +include conf/machine/include/soc-family.inc include conf/machine/include/imx-digi-base.inc include conf/machine/include/tune-cortexa8.inc diff --git a/meta-digi-arm/recipes-multimedia/fsl-mm-core/imx-lib_11.09.01.bbappend b/meta-digi-arm/recipes-multimedia/fsl-mm-core/imx-lib_11.09.01.bbappend index 5f5a6f73d..4421c885a 100644 --- a/meta-digi-arm/recipes-multimedia/fsl-mm-core/imx-lib_11.09.01.bbappend +++ b/meta-digi-arm/recipes-multimedia/fsl-mm-core/imx-lib_11.09.01.bbappend @@ -2,10 +2,3 @@ PR_append = "+del.r0" FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}" SRC_URI += " file://imx-lib-11.09.01-0003-vpu-do-not-error-if-no-VPU-IRAM-present.patch " - -# We need to hardcode the PLATFORM variable per-machine because the one defined -# in FSL layer (PLATFORM_mx5) is not passed to do_compile throwing an error: -# "Unspecified PLATFORM variable". This is probably a bug in yocto build system -# maybe fixed in newer versions. -PLATFORM_ccxmx51js = "IMX51" -PLATFORM_ccxmx53js = "IMX51"