[zeus/master][PATCH 1/2] Revert "packagegroup-*-server-extra: disable uio, as module won't build againsnt K5.4"

[zeus/master][PATCH 1/2] Revert "packagegroup-*-server-extra: disable uio, as module won't build againsnt K5.4"

[Denys Dmytriyenko]

From: Denys Dmytriyenko <denys@ti.com>

This reverts commit 0f21efd2f1f826b8ebe8634f06d63455b9e6f05f.

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 .../packagegroups/packagegroup-arago-base-tisdk-server-extra.bb         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 ffc480a..1c68ba9 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
@@ -87,9 +87,9 @@ ARAGO_SECURE_STORAGE = ""
 # disable ipsecmgr-mod,hplib-mod due to K4.14 API changes
 #    ipsecmgr-mod
 #    hplib-mod
-# uio-module-drv
 ARAGO_TI_KEYSTONE_PKGS = "\
     ${ARAGO_SECURE_STORAGE} \
+    uio-module-drv \
     traceframework \
     cuia \
     libnl-xfrm \
-- 
2.7.4

[zeus/master][PATCH 2/2] Revert "packagegroup-*-addons: disable uio, as module won't build againsnt K5.4"

[Denys Dmytriyenko]

From: Denys Dmytriyenko <denys@ti.com>

This reverts commit b34d559fdb547a9c3ddf05bf2fcd107eb38086f7.

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 .../packagegroup-arago-tisdk-addons-sdk-host.bb    |  8 ++++----
 .../packagegroup-arago-tisdk-addons.bb             | 24 +++++++++++-----------
 2 files changed, 16 insertions(+), 16 deletions(-)

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 701e4a8..90ce00e 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
@@ -53,9 +53,9 @@ UTILS_append_am65xx = " \
 
 EXTRA_LIBS = ""
 
-# uio-module-drv-src
 EXTRA_LIBS_append_omap-a15 = " \
     cmem-mod-src \
+    uio-module-drv-src \
     big-data-ipc-demo-linux-src \
 "
 
@@ -64,22 +64,22 @@ EXTRA_LIBS_append_omap-a15 = " \
 #    gdbserverproxy-module-drv-src \
 #"
 
-# uio-module-drv-src
 EXTRA_LIBS_append_ti33x = " \
+    uio-module-drv-src \
 "
 
-# uio-module-drv-src
 EXTRA_LIBS_append_ti43x = " \
     cmem-mod-src \
+    uio-module-drv-src \
 "
 
 # Disable ipsecmgr due to libnl and xfrm conflict
 #    ipsecmgr-mod-src
 # Disable hplib-mod-srv due to K4.14 breakage
 #    hplib-mod-src
-# uio-module-drv-src
 EXTRA_LIBS_append_keystone = " \
     cmem-mod-src \
+    uio-module-drv-src \
 "
 
 #EXTRA_LIBS_append_k2hk = " \
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
index a1b55ee..7cfa4c8 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
@@ -41,32 +41,32 @@ UTILS_DSP = " \
 "
 
 # switch-config
-# uio-module-drv-test
-# uio-test-pruss
 UTILS_append_ti33x = " mmc-utils \
                        can-utils \
                        pru-icss \
                        pru-swuart-fw \
+                       uio-module-drv-test \
+                       uio-test-pruss \
 "
 
 # switch-config
-# uio-module-drv-test
-# uio-test-pruss
 UTILS_append_ti43x = " mmc-utils \
                        can-utils \
                        libdrm-omap \
                        pru-icss \
+                       uio-module-drv-test \
+                       uio-test-pruss \
 "
 
 # switch-config
-# uio-test-pruss
-# uio-module-drv-test
 UTILS_append_omap-a15 = " mmc-utils \
                           parted \
                           libdrm-omap \
                           stream-openmp \
                           pru-icss \
                           ti-ipc-rtos-fw \
+                          uio-test-pruss \
+                          uio-module-drv-test \
 "
 
 # switch-config
@@ -87,8 +87,8 @@ UTILS_append_dra7xx = " can-utils \
                         ${@bb.utils.contains('MACHINE_FEATURES','gpu','glsdk-example-apps','',d)} \
 "
 
-# uio-module-drv-test
 UTILS_append_keystone = " \
+    uio-module-drv-test \
     ti-ipc-rtos-fw \
 "
 
@@ -104,30 +104,30 @@ UTILS_append_k2e = " \
     ${UTILS_DSP} \
 "
 
-# uio-test-pruss
 UTILS_append_k2g = " \
     can-utils \
     pru-icss \
+    uio-test-pruss \
 "
 
 EXTRA_LIBS = ""
-# uio-module-drv
 EXTRA_LIBS_append_omap-a15 = " \
     cmem \
+    uio-module-drv \
 "
 
-# uio-module-drv
 EXTRA_LIBS_append_keystone = " \
     cmem \
+    uio-module-drv \
 "
 
-# uio-module-drv
 EXTRA_LIBS_append_ti43x = " \
     cmem \
+    uio-module-drv \
 "
 
-# uio-module-drv
 EXTRA_LIBS_append_ti33x = " \
+    uio-module-drv \
 "
 
 DEVTOOLS = " \
-- 
2.7.4