Re: [PATCH 03/10] qmss-lld: Upgrade to version 2.1.0.14

[Jacob Stiffler <j-stiffler@ti.com>]

On 3/21/2016 11:08 AM, Denys Dmytriyenko wrote:
> On Mon, Mar 21, 2016 at 10:51:06AM -0400, Jacob Stiffler wrote:
>> * Update license with TI_TFL license
>>
>> Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
>> ---
>>   recipes-bsp/qmss-lld/qmss-lld.inc                        | 16 +++++-----------
>>   .../qmss-lld/qmss-ld-fix-firmware-installation.patch     | 13 -------------
>>   2 files changed, 5 insertions(+), 24 deletions(-)
>>   delete mode 100644 recipes-bsp/qmss-lld/qmss-lld/qmss-ld-fix-firmware-installation.patch
>>
>> diff --git a/recipes-bsp/qmss-lld/qmss-lld.inc b/recipes-bsp/qmss-lld/qmss-lld.inc
>> index fae58e1..1ed77a0 100644
>> --- a/recipes-bsp/qmss-lld/qmss-lld.inc
>> +++ b/recipes-bsp/qmss-lld/qmss-lld.inc
>> @@ -1,5 +1,5 @@
>> -LICENSE = "BSD-3-Clause"
>> -LIC_FILES_CHKSUM = "file://${WORKDIR}/git/ti/drv/qmss/COPYING.txt;md5=e8f6789acdcda76d02ed9203fc2e603d"
>> +LICENSE = "BSD-3-Clause & TI_TFL"
> It's dash, not underscore ^^^
>
> Also, I haven't looked at the new COPYING file, but is it parts BSD and parts
> TFL or is it dual-licensed i.e. one or another?

Parts BSD and parts TI-TFL. The firmware is TI-TFL, and the remaining is 
BSD.

This is the case for qmss-lld as well as sa-lld and pa-lld.

>
>> +LIC_FILES_CHKSUM = "file://${WORKDIR}/git/ti/drv/qmss/COPYING.txt;md5=cd04fb087063a2a82c4ce61983836871"
>>   
>>   COMPATIBLE_MACHINE = "keystone"
>>   PACKAGE_ARCH = "${MACHINE_ARCH}"
>> @@ -9,14 +9,14 @@ QMSS_LLD_GIT_PROTOCOL = "git"
>>   QMSS_LLD_GIT_BRANCH = "master"
>>   QMSS_LLD_GIT_DESTSUFFIX = "git/ti/drv/qmss"
>>   
>> -# commit ID corresponding to DEV.QMSS_LLD.02.01.00.12
>> -QMSS_LLD_SRCREV = "6b093515f38c6e4d3a8014903a563a9b89fd7c98"
>> +# commit ID corresponding to DEV.QMSS_LLD.02.01.00.14
>> +QMSS_LLD_SRCREV = "4cc3a3f1bcddfc19e2e7d8dd4208ca215e7ecbae"
>>   
>>   BRANCH ="${QMSS_LLD_GIT_BRANCH}"
>>   SRC_URI = "${QMSS_LLD_GIT_URI};destsuffix=${QMSS_LLD_GIT_DESTSUFFIX};protocol=${QMSS_LLD_GIT_PROTOCOL};branch=${BRANCH}"
>>   SRCREV = "${QMSS_LLD_SRCREV}"
>>   
>> -PV = "02.01.00.12"
>> +PV = "02.01.00.14"
>>   INC_PR = "r0"
>>   
>>   DEVICELIST = "k2h k2k k2l k2e"
>> @@ -25,9 +25,3 @@ DEVICELIST_k2l-evm = "k2l"
>>   DEVICELIST_k2e-evm = "k2e"
>>   
>>   S = "${WORKDIR}/${QMSS_LLD_GIT_DESTSUFFIX}"
>> -
>> -FILESEXTRAPATHS_prepend := "${THISDIR}/qmss-lld:"
>> -
>> -SRC_URI_append = " \
>> -    file://qmss-ld-fix-firmware-installation.patch \
>> -"
>> diff --git a/recipes-bsp/qmss-lld/qmss-lld/qmss-ld-fix-firmware-installation.patch b/recipes-bsp/qmss-lld/qmss-lld/qmss-ld-fix-firmware-installation.patch
>> deleted file mode 100644
>> index a48aae1..0000000
>> --- a/recipes-bsp/qmss-lld/qmss-lld/qmss-ld-fix-firmware-installation.patch
>> +++ /dev/null
>> @@ -1,13 +0,0 @@
>> -diff --git a/makefile_armv7 b/makefile_armv7
>> -index a1fd5c0..d050ace 100644
>> ---- a/makefile_armv7
>> -+++ b/makefile_armv7
>> -@@ -117,7 +117,7 @@ install:
>> - 	install -d $(INSTALL_LIB_BASE_DIR)
>> - 	$(CP) ./*.h                $(INSTALL_INC_BASE_DIR)/ti/drv/qmss
>> - 	$(CP) ./include/*.h        $(INSTALL_INC_BASE_DIR)/ti/drv/qmss/include
>> --	$(CP) ./firmware/*.h       $(INSTALL_INC_BASE_DIR)/ti/drv/qmss/firmware
>> -+	$(CP) -r ./firmware/*      $(INSTALL_INC_BASE_DIR)/ti/drv/qmss/firmware
>> - 	$(CP) -r ./device $(INSTALL_INC_BASE_DIR)/ti/drv/qmss/
>> - 	@$(CP) -r $(ARMV7LIBDIR)/*.a         $(INSTALL_LIB_BASE_DIR)
>> - 	@$(CP) -r $(ARMV7LIBDIR)/*.so        $(INSTALL_LIB_BASE_DIR)
>> -- 
>> 1.9.1
>>
>> -- 
>> _______________________________________________
>> meta-ti mailing list
>> meta-ti@yoctoproject.org
>> https://lists.yoctoproject.org/listinfo/meta-ti