On 11/18/2015 8:38 AM, Jacob Stiffler wrote:
>
>
> On 11/18/2015 7:58 AM, Jacob Stiffler wrote:
>>
>>
>> On 11/17/2015 5:06 PM, Sam Nelson wrote:
>>> - 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 <sam.nelson at ti.com>
>>>
>>> ---
>>> Changes from the previous version of the patch
>>> - Removed redundant platform definitions
>>> ---
>>> ---
>>> 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 | 51
>>> ++++++++++++++++++++++++++++++++
>>> recipes-ti/ipc/ti-ipc.inc | 26 ++++++++++++++++
>>> recipes-ti/ipc/ti-ipc_git.bb | 27 +++--------------
>>> 5 files changed, 81 insertions(+), 51 deletions(-)
>>> delete mode 100644 recipes-ti/ipc/ti-ipc-rtos.inc
>>
>> Other layers use this file. Do we want to keep it, or should those
>> layers make a copy of it?
>>
>>> 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 d14c756..0000000
>>> --- 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 7c93695..0000000
>>> --- 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 0000000..aaea3f7
>>> --- /dev/null
>>> +++ b/recipes-ti/ipc/ti-ipc-rtos_git.bb
>>> @@ -0,0 +1,51 @@
>>> +require recipes-ti/includes/ti-paths.inc
>>> +require recipes-ti/includes/ti-staging.inc
>>> +require ti-ipc.inc
>>> +
>>> +DEPENDS += "ti-cgt6x-native ti-xdctools ti-sysbios"
>>> +
>>> +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="${A15_TOOLCHAIN_INSTALL_DIR}" \
>>> + 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}" \
>>> +"
>>> +
>>
>> If you are building for the baremetal A15 and M4, you need to add
>> gcc-arm-none-eabi-native and ti-ccsv6-native to the dependencies.
>>
And "A15_TOOLCHAIN_INSTALL_DIR" is not defined, so the A15 targets will
not get built. This is now "GCC_ARM_NONE_TOOLCHAIN".
>>> +IPC_TARGETS_keystone = " \
>>> + gnu.targets.arm.A15F="${A15_TOOLCHAIN_INSTALL_DIR}" \
>>> + 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} \
>>> +"
>>> +
>>> +do_compile() {
>>> + oe_runmake -f ipc-bios.mak clean
>>> + oe_runmake -f ipc-bios.mak all
>
> I just checked with how we were doing this internally, and we were
> only building the libs. Do we also want to make the tests also?
>
>>> +}
>>> +
>>> +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 0000000..325fbc4
>>> --- /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"
>>> +PR = "r1"
>>
>> Can you use "INC_PR"?
>>
>>> +
>>> +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 a6b6a90..070247b 100644
>>> --- a/recipes-ti/ipc/ti-ipc_git.bb
>>> +++ b/recipes-ti/ipc/ti-ipc_git.bb
>>> @@ -1,32 +1,13 @@
>>> 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
>>> 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 +15,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
>>
>