[PATCH 0/7] Update ipsecmgr and add back keystone LLDs

[PATCH 0/7] Update ipsecmgr and add back keystone LLDs

[Jacob Stiffler]

* Update ipsecmgr-mod to the 4.1 kernel
* Fully integrate ipsecmgr into the SDK, including sources and
  top-level makefile target
* Add back keystone LLDs which were disabled during migration to
  4.1 kernel
* Add LLD test packages to the filesystem

Jacob Stiffler (7):
  ipsecmgr: Bump SRCREV to port to 4.1 kernel
  packagegroup-arago-base-tisdk-server-extra: Re-enable keystone LLDs
  packagegroup-arago-test-addons: Re-enable keystone LLDs and tests
  tisdk-server-rootfs-image: Add test packagegroups
  arago-source-ipk: Enable ipsecmgr-mod-src
  packagegroup-arago-tisdk-addons-sdk-host: Add ipsecmgr-mod-src to SDK
  ti-tisdk-makefile: Add ipsecmgr-mod target

 .../conf/distro/arago-source-ipk.conf              |  3 +
 .../images/tisdk-server-rootfs-image.bb            |  2 +
 .../packagegroup-arago-base-tisdk-server-extra.bb  | 46 +++++++-----
 .../packagegroup-arago-test-addons.bb              | 84 ++++++++++++++--------
 .../packagegroup-arago-tisdk-addons-sdk-host.bb    |  3 +-
 .../ti-tisdk-makefile/Makefile_ipsecmgr-mod        | 28 ++++++++
 .../ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb     |  4 +-
 .../recipes-support/ipsecmgr/ipsecmgr-mod_git.bb   |  4 +-
 .../recipes-support/ipsecmgr/ipsecmgr.inc          |  2 +-
 .../recipes-support/ipsecmgr/ipsecmgr_git.bb       |  2 +
 10 files changed, 125 insertions(+), 53 deletions(-)
 create mode 100644 meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_ipsecmgr-mod

-- 
1.9.1

[PATCH 1/7] ipsecmgr: Bump SRCREV to port to 4.1 kernel

[Jacob Stiffler]

* And add ipsecmgr-mod to KERNEL_MODULE_AUTOLOAD

Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
---
 meta-arago-extras/recipes-support/ipsecmgr/ipsecmgr-mod_git.bb | 4 +++-
 meta-arago-extras/recipes-support/ipsecmgr/ipsecmgr.inc        | 2 +-
 meta-arago-extras/recipes-support/ipsecmgr/ipsecmgr_git.bb     | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/meta-arago-extras/recipes-support/ipsecmgr/ipsecmgr-mod_git.bb b/meta-arago-extras/recipes-support/ipsecmgr/ipsecmgr-mod_git.bb
index 7bb760a..b282818 100644
--- a/meta-arago-extras/recipes-support/ipsecmgr/ipsecmgr-mod_git.bb
+++ b/meta-arago-extras/recipes-support/ipsecmgr/ipsecmgr-mod_git.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://../../ipsecmgr_snoop.h;beginline=1;endline=33;md5=f7e
 
 include ipsecmgr.inc
 
-MACHINE_KERNEL_PR_append = "a"
+MACHINE_KERNEL_PR_append = "b"
 PR = "${MACHINE_KERNEL_PR}"
 
 EXTRA_OEMAKE += "KDIR="${STAGING_KERNEL_DIR}""
@@ -18,3 +18,5 @@ do_install() {
 # Install kernel module
 	oe_runmake INSTALL_MOD_PATH="${D}" install
 }
+
+KERNEL_MODULE_AUTOLOAD += "ipsecmgr_mod"
diff --git a/meta-arago-extras/recipes-support/ipsecmgr/ipsecmgr.inc b/meta-arago-extras/recipes-support/ipsecmgr/ipsecmgr.inc
index ac99c30..1dba485 100644
--- a/meta-arago-extras/recipes-support/ipsecmgr/ipsecmgr.inc
+++ b/meta-arago-extras/recipes-support/ipsecmgr/ipsecmgr.inc
@@ -2,5 +2,5 @@ LICENSE = "BSD-3-Clause"
 BRANCH="master"
 SRC_URI = "git://arago-project.org/git/projects/ipsecmgr.git;protocol=git;branch=${BRANCH}"
 #Commit ID corresponding to DEV.IPSECMGR.01.01.00.04
-SRCREV = "d28e0b78bf55a2e0af596bab697a448aa3343470"
+SRCREV = "c385c146846a60f5f68cb12670dee6d7c5edb028"
 PV     = "01.01.00.04+git${SRCPV}"
diff --git a/meta-arago-extras/recipes-support/ipsecmgr/ipsecmgr_git.bb b/meta-arago-extras/recipes-support/ipsecmgr/ipsecmgr_git.bb
index c9c3af9..97f28b4 100644
--- a/meta-arago-extras/recipes-support/ipsecmgr/ipsecmgr_git.bb
+++ b/meta-arago-extras/recipes-support/ipsecmgr/ipsecmgr_git.bb
@@ -5,6 +5,8 @@ LIC_FILES_CHKSUM = "file://../ipsecmgr_snoop.h;beginline=1;endline=33;md5=f7eadc
 
 include ipsecmgr.inc
 
+PR = "r1"
+
 DEPENDS = "libnl-xfrm"
 RDEPENDS_${PN} = "ipsecmgr-mod"
 
-- 
1.9.1

[PATCH 2/7] packagegroup-arago-base-tisdk-server-extra: Re-enable keystone LLDs

[Jacob Stiffler]

* These had been broken by the kernel upgrade to 4.1 and have since
  been fixed

Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
---
 .../packagegroup-arago-base-tisdk-server-extra.bb  | 46 +++++++++++++---------
 1 file changed, 28 insertions(+), 18 deletions(-)

diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-base-tisdk-server-extra.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-base-tisdk-server-extra.bb
index 98debfa..2fc335e 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-base-tisdk-server-extra.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-base-tisdk-server-extra.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Additional packages beyond console packages shared by TI SDKs"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PR = "r6"
+PR = "r7"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
@@ -81,19 +81,6 @@ ARAGO_SECURE_STORAGE = "\
     engine-pkcs11 \
     "
 
-# Disable due to IPC for now
-#    demo-image-proc
-#    rm-lld
-#    pa-lld
-#    qmss-lld
-#    hplib
-#    hplib-mod
-#    nwal-lld
-#    netapi
-#    netapi-test
-#    pktlib
-#    cppi-lld
-#    ipsecmgr-mod
 ARAGO_TI_KEYSTONE_PKGS = "\
     ${ARAGO_SECURE_STORAGE} \
     uio-module-drv \
@@ -109,28 +96,51 @@ ARAGO_TI_KEYSTONE_PKGS = "\
     ti-ipc \
     mpm-transport \
     multiprocmgr \
+    rm-lld \
+    demo-image-proc \
+    pa-lld \
+    qmss-lld \
+    hplib-mod \
+    pktlib \
+    cppi-lld \
+    ipsecmgr-mod \
     "
 
+# The following packages are not yet ready for k2g-evm
+#    netapi
+#    netapi-test
+#    hplib
+#    nwal-lld
+
 ARAGO_TI_PKGS = ""
-#    uio-module-drv \
-#    cmem \
-#    cmem-mod \
-#    "
 ARAGO_TI_PKGS_append_keystone = " ${ARAGO_TI_KEYSTONE_PKGS}"
 ARAGO_TI_PKGS_append_k2l-evm = "\
     dfe-lld \
     iqn2-lld \
+    netapi \
+    netapi-test \
+    hplib \
+    nwal-lld \
     "
 
 ARAGO_TI_PKGS_append_k2hk-evm = "\
     srio-lld \
     mmap-lld \
     hyplnk-lld \
+    aif2-lld \
+    netapi \
+    netapi-test \
+    hplib \
+    nwal-lld \
     "
 
 ARAGO_TI_PKGS_append_k2e-evm = "\
     mmap-lld \
     hyplnk-lld \
+    netapi \
+    netapi-test \
+    hplib \
+    nwal-lld \
     "
 
 RDEPENDS_${PN} = "\
-- 
1.9.1

[PATCH 3/7] packagegroup-arago-test-addons: Re-enable keystone LLDs and tests

[Jacob Stiffler]

* These had been broken by the kernel upgrade to 4.1 and have since
  been fixed

Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
---
 .../packagegroup-arago-test-addons.bb              | 84 ++++++++++++++--------
 1 file changed, 53 insertions(+), 31 deletions(-)

diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-test-addons.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-test-addons.bb
index a437c45..9131a37 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-test-addons.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-test-addons.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Task to install additional utilities/demos for test image"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PR = "r4"
+PR = "r5"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
@@ -22,38 +22,60 @@ TEST_ADDONS_TI = " \
 TEST_ADDONS_TI_append_keystone = " \
     mpm-transport-test \
     multiprocmgr-test \
+    qmss-lld-test \
+    pa-lld-test \
+    cppi-lld-test \
+    edma3-lld-test \
+    rm-lld \
+    rm-lld-test \
+    sa-lld \
+    sa-lld-test \
+    traceframework-test \
+    multiprocmgr-test \
+    udma-test \
+    mpm-transport-test \
+    ipsecmgr \
+    "
+
+# The following are not yet ready for k2g-evm
+#    nwal-lld-test
+#    hplib-test
+#    nwal-lld
+#    ipc-transport-qmss-test
+#    netapi-test
+
+TEST_ADDONS_TI_append_k2hk-evm = " \
+    srio-lld-test \
+    ipc-transport-srio-test \
+    hyplnk-lld-test \
+    mmap-lld-test \
+    aif2-lld-test \
+    nwal-lld-test \
+    hplib-test \
+    nwal-lld \
+    ipc-transport-qmss-test \
+    netapi-test \
+    "
+
+TEST_ADDONS_TI_append_k2l-evm = " \
+    dfe-lld-test \
+    iqn2-lld-test \
+    nwal-lld-test \
+    hplib-test \
+    nwal-lld \
+    ipc-transport-qmss-test \
+    netapi-test \
     "
 
-#    qmss-lld-test \
-#    pa-lld-test \
-#    cppi-lld-test \
-#    hyplnk-lld-test \
-#    edma3-lld-test \
-#    mmap-lld-test \
-#    rm-lld \
-#    rm-lld-test \
-#    sa-lld \
-#    sa-lld-test \
-#    traceframework-test \
-#    hplib-test \
-#    hyplnk-lld-test \
-#    nwal-lld \
-#    nwal-lld-test \
-#    udma-test \
-#    ipc-transport-qmss-test \
-#    ipsecmgr \
-#    netapi-test \
-#    "
-
-#TEST_ADDONS_TI_append_k2hk-evm = " \
-#    srio-lld-test \
-#    ipc-transport-srio-test \
-#    "
-
-#TEST_ADDONS_TI_append_k2l-evm = " \
-#    dfe-lld-test \
-#    iqn2-lld-test \
-#    "
+TEST_ADDONS_TI_append_k2e-evm = " \
+    mmap-lld-test \
+    hyplnk-lld-test \
+    nwal-lld-test \
+    hplib-test \
+    nwal-lld \
+    ipc-transport-qmss-test \
+    netapi-test \
+    "
 
 RDEPENDS_${PN} = "\
     ${TEST_ADDONS} \
-- 
1.9.1

[PATCH 4/7] tisdk-server-rootfs-image: Add test packagegroups

[Jacob Stiffler]

Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
---
 meta-arago-distro/recipes-core/images/tisdk-server-rootfs-image.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-arago-distro/recipes-core/images/tisdk-server-rootfs-image.bb b/meta-arago-distro/recipes-core/images/tisdk-server-rootfs-image.bb
index 74b6a01..6ddebe1 100644
--- a/meta-arago-distro/recipes-core/images/tisdk-server-rootfs-image.bb
+++ b/meta-arago-distro/recipes-core/images/tisdk-server-rootfs-image.bb
@@ -10,6 +10,8 @@ IMAGE_INSTALL += "\
     packagegroup-arago-tisdk-crypto \
     packagegroup-arago-tisdk-matrix \
     packagegroup-arago-base-tisdk-server-extra \
+    packagegroup-arago-test \
+    packagegroup-arago-test-addons \
     gdb \
 "
 
-- 
1.9.1

[PATCH 5/7] arago-source-ipk: Enable ipsecmgr-mod-src

[Jacob Stiffler]

Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
---
 meta-arago-distro/conf/distro/arago-source-ipk.conf | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-arago-distro/conf/distro/arago-source-ipk.conf b/meta-arago-distro/conf/distro/arago-source-ipk.conf
index 4447463..49002ea 100644
--- a/meta-arago-distro/conf/distro/arago-source-ipk.conf
+++ b/meta-arago-distro/conf/distro/arago-source-ipk.conf
@@ -348,6 +348,9 @@ SRCIPK_INSTALL_DIR_pn-hplib-mod = "board-support/extra-drivers/${PN}-${PV}"
 CREATE_SRCIPK_pn-uio-module-drv = "1"
 SRCIPK_INSTALL_DIR_pn-uio-module-drv = "board-support/extra-drivers/${PN}-${PV}"
 
+CREATE_SRCIPK_pn-ipsecmgr-mod = "1"
+SRCIPK_INSTALL_DIR_pn-ipsecmgr-mod = "board-support/extra-drivers/${PN}-${PV}"
+
 CREATE_SRCIPK_pn-pru-icss = "1"
 SRCIPK_INSTALL_DIR_pn-pru-icss = "example-applications/${PN}-${PV}"
 
-- 
1.9.1

[PATCH 6/7] packagegroup-arago-tisdk-addons-sdk-host: Add ipsecmgr-mod-src to SDK

[Jacob Stiffler]

Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
---
 .../packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb
index eed469d..3b97c18 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Task to install sources for additional utilities/demos for SDKs"
 LICENSE = "MIT"
-PR = "r17"
+PR = "r18"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
@@ -63,6 +63,7 @@ EXTRA_LIBS_append_keystone = " \
     cmem-mod-src \
     uio-module-drv-src \
     hplib-mod-src \
+    ipsecmgr-mod-src \
 "
 
 EXTRA_LIBS_append_k2hk-evm = " \
-- 
1.9.1

[PATCH 7/7] ti-tisdk-makefile: Add ipsecmgr-mod target

[Jacob Stiffler]

Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
---
 .../ti-tisdk-makefile/Makefile_ipsecmgr-mod        | 28 ++++++++++++++++++++++
 .../ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb     |  4 +++-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_ipsecmgr-mod

diff --git a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_ipsecmgr-mod b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_ipsecmgr-mod
new file mode 100644
index 0000000..e39a2c0
--- /dev/null
+++ b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_ipsecmgr-mod
@@ -0,0 +1,28 @@
+ipsecmgr-mod: linux
+	@echo ================================
+	@echo      Building ipsecmgr-mod
+	@echo ================================
+	@cd board-support/extra-drivers; \
+	cd `find . -maxdepth 1 -name "ipsecmgr-mod*"`; \
+	make ARCH=arm KDIR=$(LINUXKERNEL_INSTALL_DIR)
+
+ipsecmgr-mod_clean:
+	@echo ================================
+	@echo      Cleaning ipsecmgr-mod
+	@echo ================================
+	@cd board-support/extra-drivers; \
+	cd `find . -maxdepth 1 -name "ipsecmgr-mod*"`; \
+	make ARCH=arm KDIR=$(LINUXKERNEL_INSTALL_DIR) clean
+
+ipsecmgr-mod_install:
+	@echo ================================
+	@echo      Installing ipsecmgr-mod
+	@echo ================================
+	@if [ ! -d $(DESTDIR) ] ; then \
+		echo "The extracted target filesystem directory doesn't exist."; \
+		echo "Please run setup.sh in the SDK's root directory and then try again."; \
+		exit 1; \
+	fi
+	@cd board-support/extra-drivers; \
+	cd `find . -maxdepth 1 -name "ipsecmgr-mod*"`; \
+	make ARCH=arm  KDIR=$(LINUXKERNEL_INSTALL_DIR)  INSTALL_MOD_PATH=$(DESTDIR) PREFIX=$(SDK_PATH_TARGET) install
diff --git a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb
index 14f8e8a..3813082 100644
--- a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb
+++ b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb
@@ -43,9 +43,10 @@ SRC_URI = "\
     file://Makefile_uio-module-drv \
     file://Makefile_pru-icss \
     file://Makefile_qt-opencv-opencl-opengl-multithreaded \
+    file://Makefile_ipsecmgr-mod \
 "
 
-PR = "r64"
+PR = "r65"
 
 MAKEFILES_MATRIX_GUI = "matrix-gui-browser \
                         refresh-screen \
@@ -123,6 +124,7 @@ MAKEFILES_append_keystone = " u-boot-spl \
                               ti-crypto-examples \
                               hplib-mod \
                               uio-module-drv \
+                              ipsecmgr-mod-src \
 "
 
 MAKEFILES_append_k2hk-evm = " opencl-examples \
-- 
1.9.1