From: Ting Liu Date: Fri, 17 Jul 2015 05:36:38 +0000 (+0800) Subject: fmc: update to revision b9e52be X-Git-Tag: 2.1~515 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=62b8cb80fe8257d4bdc0689d4ae9f3aaf99f6938;p=meta-freescale.git fmc: update to revision b9e52be This imports the following changes: b9e52be ENGR00354640: fmc regression: Bad FMan port handle used in FM_PORT_VSPAlloc causes FMD call trace 435d76d ENGR354592: FMC SoftParser 'otherl3' protocol definition generates error 92494f0 Changed makefile to use flags: FMAN_V3H / FMAN_V3L (ENGR353626) 1695da4 ENGR00352834: FMC: Add support for FM_PCD_KgSetAdditionalDataAfterParsing API 450d314 ENGR351010: FMC: Share schemes used for IPR across multiple ports b2b6226 ENGR00349008: ALU PCD generates Segmentation fault for direct schemes usage 6b14996 ENGR00348810: ALU PCD generates: FmPcdCcGetGrpParams: Invalid Handle 955706a ENGR348539: ALU PCD generates: grpId you asked > numOfGroup of relevant tree 06548b6 ENGR00347977: ALU PCD using direct schemes generates Error: Unresolved cycled dependencies e843d51 ENGR00315208: [FMC] failed to configure ALU PCD Use override mechanism to define EXTRA_OEMAKE_PLATFORM, instead of bash script. and p1023rds is not supported now, remove the reference to it. Signed-off-by: Ting Liu Acked-by: Otavio Salvador Signed-off-by: Otavio Salvador --- diff --git a/meta-fsl-ppc/recipes-dpaa/fmc/fmc_git.bb b/meta-fsl-ppc/recipes-dpaa/fmc/fmc_git.bb index a9da96f8..f9bd74f6 100644 --- a/meta-fsl-ppc/recipes-dpaa/fmc/fmc_git.bb +++ b/meta-fsl-ppc/recipes-dpaa/fmc/fmc_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a504ab5a8ff235e67c7301214749346c" PR = "r2" SRC_URI = "git://git.freescale.com/ppc/sdk/fmc.git;nobranch=1" -SRCREV = "4f4a3ebe447c3c982d453596a82af7b40ac3a28a" +SRCREV = "b9e52be1f62a5fcc912d44875bf155ad55650d68" DEPENDS = "libxml2 fmlib tclap" @@ -25,14 +25,13 @@ EXTRA_OEMAKE_virtclass-native = 'FMCHOSTMODE=1 FMD_USPACE_HEADER_PATH="${STAGING PARALLEL_MAKE = "" +EXTRA_OEMAKE_PLATFORM ?= "" +EXTRA_OEMAKE_PLATFORM_b4 = "b4860qds" +EXTRA_OEMAKE_PLATFORM_t2 = "b4860qds" +EXTRA_OEMAKE_PLATFORM_t4 = "b4860qds" +EXTRA_OEMAKE_PLATFORM_t1 = "t1040qds" + do_compile () { - if echo ${MACHINE} | egrep -q "^(b4|t1|t2|t4)"; then - EXTRA_OEMAKE_PLATFORM="b4860qds" - elif [ "p1023rds" = "${MACHINE}" ];then - EXTRA_OEMAKE_PLATFORM="p1023rds" - else - EXTRA_OEMAKE_PLATFORM="" - fi oe_runmake MACHINE=${EXTRA_OEMAKE_PLATFORM} -C source }