[RFC 0/2] LLD cleanup and device split

[RFC 0/2] LLD cleanup and device split

[Jacob Stiffler]

I plan to clean up the LLD recipes and split up the device-specific
libraries to only the relevant machine. There are quite a few LLDs
which will need this clean up so I wanted to submit an RFC before
proceeding with the rest of them.

Jacob Stiffler (2):
  cppi-lld: Clean up recipes
  cppi-lld: Only build binaries relevent to the machine

 recipes-bsp/cppi-lld/cppi-lld-test_git.bb |  2 ++
 recipes-bsp/cppi-lld/cppi-lld.inc         | 24 ++++++++++++++++++------
 recipes-bsp/cppi-lld/cppi-lld_git.bb      | 13 +++++++++++--
 3 files changed, 31 insertions(+), 8 deletions(-)

-- 
1.9.1

[RFC 1/2] cppi-lld: Clean up recipes

[Jacob Stiffler]

* Use INC_PR to track recipe revisions
* Define variables for GIT SRC_URI parameters

Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
---
 recipes-bsp/cppi-lld/cppi-lld-test_git.bb |  2 ++
 recipes-bsp/cppi-lld/cppi-lld.inc         | 17 ++++++++++++-----
 recipes-bsp/cppi-lld/cppi-lld_git.bb      |  2 ++
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/recipes-bsp/cppi-lld/cppi-lld-test_git.bb b/recipes-bsp/cppi-lld/cppi-lld-test_git.bb
index 871546e..8f4856a 100644
--- a/recipes-bsp/cppi-lld/cppi-lld-test_git.bb
+++ b/recipes-bsp/cppi-lld/cppi-lld-test_git.bb
@@ -4,6 +4,8 @@ DEPENDS = "common-csl-ip rm-lld cppi-lld qmss-lld"
 
 include cppi-lld.inc
 
+PR = "${INC_PR}.0"
+
 CHOICELIST = "yes no"
 
 do_compile () {
diff --git a/recipes-bsp/cppi-lld/cppi-lld.inc b/recipes-bsp/cppi-lld/cppi-lld.inc
index 21c8fe0..ae81a3f 100644
--- a/recipes-bsp/cppi-lld/cppi-lld.inc
+++ b/recipes-bsp/cppi-lld/cppi-lld.inc
@@ -1,14 +1,21 @@
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://${WORKDIR}/git/ti/drv/cppi/COPYING.txt;md5=e8f6789acdcda76d02ed9203fc2e603d"
 
-BRANCH = "master"
-SRC_URI = "git://git.ti.com/keystone-rtos/cppi-lld.git;destsuffix=git/ti/drv/cppi;protocol=git;branch=${BRANCH}"
+CPPI_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/cppi-lld.git"
+CPPI_LLD_GIT_PROTOCOL = "git"
+CPPI_LLD_GIT_BRANCH = "master"
+CPPI_LLD_GIT_DESTSUFFIX = "git/ti/drv/cppi"
 
 # Below Commit ID corresponds to "DEV.CPPI_LLD.02.01.00.10"
-SRCREV = "97c537fa544a78e83512db3499a49d0bd86fad32"
+CPPI_LLD_SRCREV = "97c537fa544a78e83512db3499a49d0bd86fad32"
+
+BRANCH = "${CPPI_LLD_GIT_BRANCH}"
+SRC_URI = "${CPPI_LLD_GIT_URI};destsuffix=${CPPI_LLD_GIT_DESTSUFFIX};protocol=${CPPI_LLD_GIT_PROTOCOL};branch=${BRANCH}"
+
+SRCREV = "${CPPI_LLD_SRCREV}"
 PV = "02.01.00.10"
+INC_PR = "r1"
 
 DEVICELIST = "k2h k2k k2l k2e"
 
-BASEDIR = "${WORKDIR}/git"
-S = "${BASEDIR}/ti/drv/cppi"
+S = "${WORKDIR}/${CPPI_LLD_GIT_DESTSUFFIX}"
diff --git a/recipes-bsp/cppi-lld/cppi-lld_git.bb b/recipes-bsp/cppi-lld/cppi-lld_git.bb
index cd419f6..169e0fc 100644
--- a/recipes-bsp/cppi-lld/cppi-lld_git.bb
+++ b/recipes-bsp/cppi-lld/cppi-lld_git.bb
@@ -5,6 +5,8 @@ DEPENDS = "common-csl-ip rm-lld qmss-lld"
 
 include cppi-lld.inc
 
+PR = "${INC_PR}.0"
+
 SRC_URI += "file://init_cppi.sh"
 
 inherit update-rc.d
-- 
1.9.1

[RFC 2/2] cppi-lld: Only build binaries relevent to the machine

[Jacob Stiffler]

Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
---
 recipes-bsp/cppi-lld/cppi-lld.inc    |  9 +++++++--
 recipes-bsp/cppi-lld/cppi-lld_git.bb | 13 ++++++++++---
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/recipes-bsp/cppi-lld/cppi-lld.inc b/recipes-bsp/cppi-lld/cppi-lld.inc
index ae81a3f..cbcad34 100644
--- a/recipes-bsp/cppi-lld/cppi-lld.inc
+++ b/recipes-bsp/cppi-lld/cppi-lld.inc
@@ -1,6 +1,9 @@
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://${WORKDIR}/git/ti/drv/cppi/COPYING.txt;md5=e8f6789acdcda76d02ed9203fc2e603d"
 
+COMPATIBLE_MACHINE = "keystone"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
 CPPI_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/cppi-lld.git"
 CPPI_LLD_GIT_PROTOCOL = "git"
 CPPI_LLD_GIT_BRANCH = "master"
@@ -14,8 +17,10 @@ SRC_URI = "${CPPI_LLD_GIT_URI};destsuffix=${CPPI_LLD_GIT_DESTSUFFIX};protocol=${
 
 SRCREV = "${CPPI_LLD_SRCREV}"
 PV = "02.01.00.10"
-INC_PR = "r1"
+INC_PR = "r2"
 
-DEVICELIST = "k2h k2k k2l k2e"
+DEVICELIST_k2hk-evm = "k2h k2k"
+DEVICELIST_k2l-evm  = "k2l"
+DEVICELIST_k2e-evm  = "k2e"
 
 S = "${WORKDIR}/${CPPI_LLD_GIT_DESTSUFFIX}"
diff --git a/recipes-bsp/cppi-lld/cppi-lld_git.bb b/recipes-bsp/cppi-lld/cppi-lld_git.bb
index 169e0fc..e526ea8 100644
--- a/recipes-bsp/cppi-lld/cppi-lld_git.bb
+++ b/recipes-bsp/cppi-lld/cppi-lld_git.bb
@@ -1,11 +1,10 @@
 DESCRIPTION = "TI CPPI Module low level driver"
-COMPATIBLE_MACHINE = "keystone"
 
 DEPENDS = "common-csl-ip rm-lld qmss-lld"
 
 include cppi-lld.inc
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 SRC_URI += "file://init_cppi.sh"
 
@@ -25,10 +24,18 @@ do_compile () {
 
 do_install () {
 	make -f makefile_armv7 install PDK_INSTALL_PATH=${STAGING_INCDIR} INSTALL_INC_BASE_DIR=${D}/${includedir} INSTALL_LIB_BASE_DIR=${D}${libdir}
+
 #   Set the generic device library symbolic link to default k2h
     cd ${D}${libdir}
-    ln -sf libcppi_k2h.so.1.0.0 libcppi_device.so.1
+
+    # Link only the first device in the list
+    for device in ${DEVICELIST}
+    do
+        ln -sf libcppi_${device}.so.1.0.0 libcppi_device.so.1
+        break
+    done
     ln -sf libcppi_device.so.1 libcppi_device.so
+
 #   Copy init scripts
     install -d ${D}${sysconfdir}/init.d/
     install -c -m 755 ${WORKDIR}/init_cppi.sh ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
-- 
1.9.1

Re: [RFC 0/2] LLD cleanup and device split

[Jacob Stiffler]

Any comments?

If not, I will submit similar patches for all of the LLDs.

- Jake

On 10/27/2015 12:56 PM, Jacob Stiffler wrote:
> I plan to clean up the LLD recipes and split up the device-specific
> libraries to only the relevant machine. There are quite a few LLDs
> which will need this clean up so I wanted to submit an RFC before
> proceeding with the rest of them.
>
> Jacob Stiffler (2):
>    cppi-lld: Clean up recipes
>    cppi-lld: Only build binaries relevent to the machine
>
>   recipes-bsp/cppi-lld/cppi-lld-test_git.bb |  2 ++
>   recipes-bsp/cppi-lld/cppi-lld.inc         | 24 ++++++++++++++++++------
>   recipes-bsp/cppi-lld/cppi-lld_git.bb      | 13 +++++++++++--
>   3 files changed, 31 insertions(+), 8 deletions(-)
>

Re: [RFC 0/2] LLD cleanup and device split

[Denys Dmytriyenko]

On Thu, Oct 29, 2015 at 08:30:19AM -0400, Jacob Stiffler wrote:
> Any comments?
> 
> If not, I will submit similar patches for all of the LLDs.

In general it looks fine, but are you going to export each and every LLD's 
URL, branch and commit into variables?


> On 10/27/2015 12:56 PM, Jacob Stiffler wrote:
> >I plan to clean up the LLD recipes and split up the device-specific
> >libraries to only the relevant machine. There are quite a few LLDs
> >which will need this clean up so I wanted to submit an RFC before
> >proceeding with the rest of them.
> >
> >Jacob Stiffler (2):
> >   cppi-lld: Clean up recipes
> >   cppi-lld: Only build binaries relevent to the machine
> >
> >  recipes-bsp/cppi-lld/cppi-lld-test_git.bb |  2 ++
> >  recipes-bsp/cppi-lld/cppi-lld.inc         | 24 ++++++++++++++++++------
> >  recipes-bsp/cppi-lld/cppi-lld_git.bb      | 13 +++++++++++--
> >  3 files changed, 31 insertions(+), 8 deletions(-)
> >
> 
> -- 
> _______________________________________________
> meta-ti mailing list
> meta-ti@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-ti

Re: [RFC 0/2] LLD cleanup and device split

[Jacob Stiffler]

On 10/29/2015 10:31 AM, Denys Dmytriyenko wrote:
> On Thu, Oct 29, 2015 at 08:30:19AM -0400, Jacob Stiffler wrote:
>> Any comments?
>>
>> If not, I will submit similar patches for all of the LLDs.
> In general it looks fine, but are you going to export each and every LLD's
> URL, branch and commit into variables?

That is the plan, but it will be tedious task.

The problem is that these LLDs are developed internally, so for our 
internal builds, we would like to override only git repo in the SRC_URI 
to the internal repos along with AUTOREVing. This will be beneficial 
when the git repo is shared between multiple recipes (e.g. lib and test 
recipes), or when there is another file added to the SRC_URI (e.g. an 
init script).

>
>> On 10/27/2015 12:56 PM, Jacob Stiffler wrote:
>>> I plan to clean up the LLD recipes and split up the device-specific
>>> libraries to only the relevant machine. There are quite a few LLDs
>>> which will need this clean up so I wanted to submit an RFC before
>>> proceeding with the rest of them.
>>>
>>> Jacob Stiffler (2):
>>>    cppi-lld: Clean up recipes
>>>    cppi-lld: Only build binaries relevent to the machine
>>>
>>>   recipes-bsp/cppi-lld/cppi-lld-test_git.bb |  2 ++
>>>   recipes-bsp/cppi-lld/cppi-lld.inc         | 24 ++++++++++++++++++------
>>>   recipes-bsp/cppi-lld/cppi-lld_git.bb      | 13 +++++++++++--
>>>   3 files changed, 31 insertions(+), 8 deletions(-)
>>>
>> -- 
>> _______________________________________________
>> meta-ti mailing list
>> meta-ti@yoctoproject.org
>> https://lists.yoctoproject.org/listinfo/meta-ti