From 1c796aa88d142d0b474a3b9110aed3b3d634aabf Mon Sep 17 00:00:00 2001 From: Sam Nelson Date: Fri, 20 Nov 2015 09:54:59 +0000 Subject: [PATCH] ipc: ti-ipc, ti-ipc-rtos: Update to new version of IPC 3.41.0.3_eng - Update to new version of IPC: 3.41.0.3_eng - Add recipe to build ti-ipc-rtos from git repo - Remove K2G hack Signed-off-by: Sam Nelson Signed-off-by: Denys Dmytriyenko --- recipes-ti/ipc/ti-ipc-rtos.inc | 19 -------- recipes-ti/ipc/ti-ipc-rtos_3.40.01.08.bb | 9 ---- recipes-ti/ipc/ti-ipc-rtos_git.bb | 55 ++++++++++++++++++++++++ recipes-ti/ipc/ti-ipc.inc | 26 +++++++++++ recipes-ti/ipc/ti-ipc_git.bb | 29 +++---------- 5 files changed, 87 insertions(+), 51 deletions(-) delete mode 100644 recipes-ti/ipc/ti-ipc-rtos.inc delete mode 100644 recipes-ti/ipc/ti-ipc-rtos_3.40.01.08.bb create mode 100644 recipes-ti/ipc/ti-ipc-rtos_git.bb create mode 100644 recipes-ti/ipc/ti-ipc.inc diff --git a/recipes-ti/ipc/ti-ipc-rtos.inc b/recipes-ti/ipc/ti-ipc-rtos.inc deleted file mode 100644 index d14c7567..00000000 --- a/recipes-ti/ipc/ti-ipc-rtos.inc +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "TI Inter Process Communication (IPC) Mechanisms (for Uni- and Multi- Processor Configurations)" -HOMEPAGE="http://processors.wiki.ti.com/index.php/Category:IPC" - -LICENSE = "BSD" - -require recipes-ti/includes/ti-paths.inc -require recipes-ti/includes/ti-staging.inc - -SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/ipc/${PV}/exports/ipc_${PV}.zip;name=ipczip" - -S = "${WORKDIR}/ipc_${PV}" - -do_install() { - install -d ${D}${IPC_INSTALL_DIR_RECIPE} - cp -pPrf ${S}/* ${D}${IPC_INSTALL_DIR_RECIPE} -} - -ALLOW_EMPTY_${PN} = "1" -FILES_${PN}-dev += "${IPC_INSTALL_DIR_RECIPE}" diff --git a/recipes-ti/ipc/ti-ipc-rtos_3.40.01.08.bb b/recipes-ti/ipc/ti-ipc-rtos_3.40.01.08.bb deleted file mode 100644 index 7c93695b..00000000 --- a/recipes-ti/ipc/ti-ipc-rtos_3.40.01.08.bb +++ /dev/null @@ -1,9 +0,0 @@ -require ti-ipc-rtos.inc - -PV = "3_40_01_08" -PR = "r0" - -LIC_FILES_CHKSUM = "file://${S}/ipc-linux.mak;beginline=1;endline=30;md5=7b327f9b710fd7c95e545b91cec79255" - -SRC_URI[ipczip.md5sum] = "738e1d54da9fab94899ad162f1ad78de" -SRC_URI[ipczip.sha256sum] = "8cc7d40ad7eab916eae109b355dc7e7876c6ab82e3b40bf5b6bf60474312d6cf" diff --git a/recipes-ti/ipc/ti-ipc-rtos_git.bb b/recipes-ti/ipc/ti-ipc-rtos_git.bb new file mode 100644 index 00000000..2e9dba1d --- /dev/null +++ b/recipes-ti/ipc/ti-ipc-rtos_git.bb @@ -0,0 +1,55 @@ +require recipes-ti/includes/ti-paths.inc +require recipes-ti/includes/ti-staging.inc +require ti-ipc.inc + +PR = "${INC_PR}.0" + +DEPENDS = "ti-xdctools ti-sysbios" +DEPENDS_append_keystone += "ti-cgt6x-native gcc-arm-none-eabi-native" +DEPENDS_append_omap-15 += "ti-cgt6x-native ti-ccsv6-native gcc-arm-none-eabi-native" + +PACKAGES =+ "${PN}-fw" +FILES_${PN}-fw = "${libdir}/firmware/*" +FILES_${PN}-dev += "${IPC_INSTALL_DIR_RECIPE}" + +INSANE_SKIP_${PN}-fw += "arch" +INSANE_SKIP_${PN}-dev += "arch" + +ALLOW_EMPTY_${PN} = "1" + +IPC_TARGETS = "" +IPC_TARGETS_omap-a15 = "\ + gnu.targets.arm.A15F="${GCC_ARM_NONE_TOOLCHAIN}" \ + ti.targets.elf.C66="${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x" \ + ti.targets.arm.elf.M4="${M4_TOOLCHAIN_INSTALL_DIR}" \ + ti.targets.arm.elf.M4F="${M4_TOOLCHAIN_INSTALL_DIR}" \ +" + +IPC_TARGETS_keystone = " \ + gnu.targets.arm.A15F="${GCC_ARM_NONE_TOOLCHAIN}" \ + ti.targets.elf.C66="${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x" \ +" + +EXTRA_OEMAKE = "\ + PLATFORM=${PLATFORM} \ + XDC_INSTALL_DIR="${XDC_INSTALL_DIR}" \ + BIOS_INSTALL_DIR="${SYSBIOS_INSTALL_DIR}" \ + ${IPC_TARGETS} -f ipc-bios.mak\ +" + +do_compile() { + oe_runmake clean + oe_runmake all +} + +do_compile_append() { + sourceipk_do_create_srcipk +} + +do_install() { + install -d ${D}${IPC_INSTALL_DIR_RECIPE} + cp -pPrf ${S}/* ${D}${IPC_INSTALL_DIR_RECIPE} + + install -d ${D}${libdir}/firmware + find . -name "*.xe66" -type f | xargs -I {} install -m 0644 {} ${D}${libdir}/firmware/ +} diff --git a/recipes-ti/ipc/ti-ipc.inc b/recipes-ti/ipc/ti-ipc.inc new file mode 100644 index 00000000..d41796de --- /dev/null +++ b/recipes-ti/ipc/ti-ipc.inc @@ -0,0 +1,26 @@ +DESCRIPTION = "TI Inter Process Communication (IPC) Mechanisms (for Uni- and Multi- Processor Configurations)" +HOMEPAGE="http://processors.wiki.ti.com/index.php/Category:IPC" + +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://${S}/ipc-linux.mak;beginline=1;endline=30;md5=7b327f9b710fd7c95e545b91cec79255" + +BRANCH = "ipc-next" + +SRC_URI = "git://git.ti.com/ipc/ipcdev.git;protocol=git;branch=${BRANCH}" + +#Corresponds to 3.41.00.03_eng +SRCREV = "354db7d3b6aa397e6ab4b86fdbd312746fd46a07" + +S = "${WORKDIR}/git" +PV = "3.41.00.03" +INC_PR = "r0" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +PLATFORM = "UNKNOWN" +PLATFORM_omap5-evm = "OMAP54XX" +PLATFORM_dra7xx = "DRA7XX" +PLATFORM_k2hk-evm = "TCI6638" +PLATFORM_k2l-evm = "TCI6630" +PLATFORM_k2e-evm = "66AK2E" +PLATFORM_k2g-evm = "66AK2G" diff --git a/recipes-ti/ipc/ti-ipc_git.bb b/recipes-ti/ipc/ti-ipc_git.bb index a6b6a90d..f98df66d 100644 --- a/recipes-ti/ipc/ti-ipc_git.bb +++ b/recipes-ti/ipc/ti-ipc_git.bb @@ -1,32 +1,15 @@ DESCRIPTION = "TI Inter Process Communication (IPC) Mechanisms (for Uni- and Multi- Processor Configurations)" HOMEPAGE="http://processors.wiki.ti.com/index.php/Category:IPC" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://${S}/ipc-linux.mak;beginline=1;endline=30;md5=7b327f9b710fd7c95e545b91cec79255" +require ti-ipc.inc + +PR = "${INC_PR}.0" DEPENDS += "virtual/kernel" -PV = "3.41.00.02" - -BRANCH = "ipc-next" -SRC_URI = "git://git.ti.com/ipc/ipcdev.git;protocol=git;branch=${BRANCH} \ - file://tiipclad-daemon.sh \ - file://0001-Add-kernel-build-dir.patch \ +SRC_URI += "file://tiipclad-daemon.sh \ + file://0001-Add-kernel-build-dir.patch \ " -# Commit corresponds to 3.41.00.02-eng -SRCREV = "b34c8ada4ed243cd52e504bf2c6fb3451dc730f8" - -S = "${WORKDIR}/git" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -PLATFORM = "UNKNOWN" -PLATFORM_omap5-evm = "OMAP54XX" -PLATFORM_dra7xx = "DRA7XX" -PLATFORM_k2hk-evm = "TCI6638" -PLATFORM_k2l-evm = "TCI6630" -PLATFORM_k2e-evm = "66AK2E" -PLATFORM_k2g-evm = "66AK2E" DAEMON = "UNKNOWN" DAEMON_omap5-evm = "lad_omap54xx_smp" @@ -34,7 +17,7 @@ DAEMON_dra7xx = "lad_dra7xx" DAEMON_k2hk-evm = "lad_tci6638" DAEMON_k2l-evm = "lad_tci6630" DAEMON_k2e-evm = "lad_66ak2e" -DAEMON_k2g-evm = "lad_66ak2e" +DAEMON_k2g-evm = "lad_66ak2g" inherit autotools-brokensep pkgconfig update-rc.d