From: Ting Liu <[email protected]> Changelog: af0a2a1 B4:DSP_BT: Add new DDRC target ID configuration parameter c8a84c6 B4:L1D: Add support for L1 defense New flow 8e79e5c B4:DSP_BT: DSP cache-cluster init now done from DSP boot loader 44da44a B4:DSP_BT: Add support for DSP MMU configuration
Signed-off-by: Ting Liu <[email protected]> --- conf/machine/include/qoriq.inc | 4 ---- recipes-extended/ipc-ust/ipc-ust_git.bb | 15 ++++----------- recipes-extended/ipc-ust/ipc.inc | 6 ------ .../kernel-modules/kernel-module-ipc-multi_git.bb | 2 +- .../kernel-modules/kernel-module-ipc-single_git.bb | 2 -- recipes-kernel/kernel-modules/kernel-module-ipc.inc | 11 +++++------ 6 files changed, 10 insertions(+), 30 deletions(-) delete mode 100644 recipes-extended/ipc-ust/ipc.inc diff --git a/conf/machine/include/qoriq.inc b/conf/machine/include/qoriq.inc index 8b2b0c7..c5cbe29 100644 --- a/conf/machine/include/qoriq.inc +++ b/conf/machine/include/qoriq.inc @@ -20,8 +20,4 @@ MACHINE_EXTRA_RRECOMMENDS ?= "udev-rules-qoriq" EXTRA_IMAGEDEPENDS += "u-boot cst-native" -IPC_UST_SOC_bsc9131 = "B913x" -IPC_UST_SOC_bsc9132 = "B913x" -IPC_UST_SOC_b4 = "B4860" - MACHINEOVERRIDES =. "qoriq:" diff --git a/recipes-extended/ipc-ust/ipc-ust_git.bb b/recipes-extended/ipc-ust/ipc-ust_git.bb index 23350b3..2c9ddd2 100644 --- a/recipes-extended/ipc-ust/ipc-ust_git.bb +++ b/recipes-extended/ipc-ust/ipc-ust_git.bb @@ -3,23 +3,15 @@ DESCRIPTION = "DSP boot application and ipc test application" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=fa38cd73d71527dc6efb546474f64d10" -require ipc.inc - -python () { - if not d.getVar("IPC_UST_SOC", True): - raise bb.parse.SkipPackage("IPC_UST_SOC is not defined in qoriq-base.inc") -} +SRC_URI = "git://git.freescale.com/ppc/sdk/ipc.git;branch=sdk-v2.0.x" +SRCREV = "74d662707558290f070f9589177db730444bc435" S = "${WORKDIR}/git" # workaround for issue of parallel build, required a actual fix in ipc source PARALLEL_MAKE = "" -EXTRA_OEMAKE = 'CROSS_COMPILE="${TARGET_PREFIX}" CC="${CC}" AR="${AR}"' - -do_compile () { - oe_runmake ${IPC_UST_SOC}=1 -} +EXTRA_OEMAKE = 'CROSS_COMPILE="${TARGET_PREFIX}" CC="${CC}" AR="${AR}" B4860=1' do_install () { install -d ${D}${bindir} @@ -52,3 +44,4 @@ FILES_${PN}-dbg += "/ipc/.debug" INSANE_SKIP_${PN} += "file-rdeps" INSANE_SKIP_${PN}-dev += "dev-elf" +COMPATIBLE_MACHINE = "(b4)" diff --git a/recipes-extended/ipc-ust/ipc.inc b/recipes-extended/ipc-ust/ipc.inc deleted file mode 100644 index f1dee08..0000000 --- a/recipes-extended/ipc-ust/ipc.inc +++ /dev/null @@ -1,6 +0,0 @@ -DEPENDS = "virtual/kernel" - -SRC_URI = "git://git.freescale.com/ppc/sdk/ipc.git;branch=sdk-v1.9.x" -SRCREV = "b010e35daf0a32ee45153fc76dd392949a3097a2" - -COMPATIBLE_MACHINE = "(bsc9132qds|bsc9131rdb|b4860qds|b4420qds)" diff --git a/recipes-kernel/kernel-modules/kernel-module-ipc-multi_git.bb b/recipes-kernel/kernel-modules/kernel-module-ipc-multi_git.bb index 4570e78..5ff7b4e 100644 --- a/recipes-kernel/kernel-modules/kernel-module-ipc-multi_git.bb +++ b/recipes-kernel/kernel-modules/kernel-module-ipc-multi_git.bb @@ -1,6 +1,6 @@ require kernel-module-ipc.inc -EXTRA_OEMAKE ="KERNEL_DIR=${STAGING_KERNEL_DIR} ${SOC}=1 CONFIG_MULTI_RAT=1" +EXTRA_OEMAKE += "CONFIG_MULTI_RAT=1" do_install(){ install -d ${D}/usr/driver/IPC/multi_rat diff --git a/recipes-kernel/kernel-modules/kernel-module-ipc-single_git.bb b/recipes-kernel/kernel-modules/kernel-module-ipc-single_git.bb index 5c81d34..9422cc0 100644 --- a/recipes-kernel/kernel-modules/kernel-module-ipc-single_git.bb +++ b/recipes-kernel/kernel-modules/kernel-module-ipc-single_git.bb @@ -1,7 +1,5 @@ require kernel-module-ipc.inc -EXTRA_OEMAKE ="KERNEL_DIR=${STAGING_KERNEL_DIR} ${SOC}=1" - do_install(){ install -d ${D}/usr/driver/IPC/single_rat install -m 755 ${S}/kernel/*.ko ${D}/usr/driver/IPC/single_rat diff --git a/recipes-kernel/kernel-modules/kernel-module-ipc.inc b/recipes-kernel/kernel-modules/kernel-module-ipc.inc index f0a82d3..d0919ad 100644 --- a/recipes-kernel/kernel-modules/kernel-module-ipc.inc +++ b/recipes-kernel/kernel-modules/kernel-module-ipc.inc @@ -3,16 +3,14 @@ DESCRIPTION = "DSP boot application and ipc test application" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=fa38cd73d71527dc6efb546474f64d10" -require recipes-extended/ipc-ust/ipc.inc - inherit module qoriq_build_64bit_kernel +SRC_URI = "git://git.freescale.com/ppc/sdk/ipc.git;branch=sdk-v2.0.x" +SRCREV = "74d662707558290f070f9589177db730444bc435" + S = "${WORKDIR}/git" -SOC ?= "" -SOC_b4 = "B4860" -SOC_bsc9131 = "B913x" -SOC_bsc9132 = "B913x" +EXTRA_OEMAKE ="KERNEL_DIR=${STAGING_KERNEL_DIR} B4860=1" do_configure[depends] += "virtual/kernel:do_shared_workdir" do_compile_prepend () { @@ -20,3 +18,4 @@ do_compile_prepend () { } INHIBIT_PACKAGE_STRIP = "1" +COMPATIBLE_MACHINE = "(b4)" -- 1.9.2 -- _______________________________________________ meta-freescale mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-freescale
