Skip to contentSkip to conversation

arago.conf: Add sgx MACHINE_FEATURES support

PATCH New [email protected] 1 participant 10 messages Feb 26, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/10 arago.conf: Add sgx MACHINE_FEATURES support

From: Franklin S. Cooper Jr <[email protected]>

* Meta-ti added sgx to the list of MACHINE_FEATURES.
* Use this variable to determine if packagegroups/recipes that depend on sgx should be used or not.

---
 meta-arago-distro/conf/distro/arago.conf           |    4 +---
 .../recipes-core/images/tisdk-rootfs-image.bb      |    2 +-
 .../packagegroup-arago-tisdk-matrix.bb             |    6 +++---
 .../packagegroup-arago-toolchain-tisdk-target.bb   |    6 ++++--
 4 files changed, 9 insertions(+), 9 deletions(-)
meta-arago-distro/conf/distro/arago.conf +1 -3
index 9aef151..bc75ff2 100644
@@ -45,9 +45,7 @@ PREFERRED_VERSION_hostap-daemon = "2.0-devel-ti"
 PREFERRED_VERSION_omap3-sgx-modules = "4.08.00.01"
 PREFERRED_VERSION_libgles-omap3 = "4.08.00.01"
 
-ARAGO_QT_PROVIDER = "qt4-embedded"
-# Enable Qt+GLES for ARM v7a devices
-ARAGO_QT_PROVIDER_armv7a = "qt4-embedded-gles"
+ARAGO_QT_PROVIDER = "${@base_contains('MACHINE_FEATURES','sgx','qt4-embedded-gles','qt4-embedded',d)}"
 
 PREFERRED_PROVIDER_qt4-embedded = "${ARAGO_QT_PROVIDER}"
 
meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb +1 -1
index f5215d1..d6924d1 100644
@@ -5,7 +5,7 @@ require arago-base-tisdk-image.bb
 
 IMAGE_INSTALL += "\
     packagegroup-arago-test \
-    packagegroup-arago-tisdk-graphics \
+    ${@base_contains('MACHINE_FEATURES','sgx','packagegroup-arago-tisdk-graphics','',d)} \
     packagegroup-arago-tisdk-qte \
     packagegroup-arago-tisdk-addons \
     packagegroup-arago-tisdk-connectivity \
meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb +3 -3
index 4c41265..46c9a2a 100644
@@ -1,6 +1,6 @@
 DESCRIPTION = "Task to include Matrix v2"
 LICENSE = "MIT"
-PR = "r9"
+PR = "r10"
 
 inherit packagegroup
 
@@ -36,13 +36,13 @@ MATRIX_QT_APPS_keystone = ""
 MATRIX_APPS = ""
 
 MATRIX_APPS_append_omap3 = "        \
-    matrix-gui-3d-demos             \
+    ${@base_contains('MACHINE_FEATURES','sgx','matrix-gui-3d-demos','',d)} \
     matrix-gui-multimedia-demos     \
 "
 
 MATRIX_APPS_append_ti33x = "        \
     matrix-gui-ethernet-demos       \
-    matrix-gui-3d-demos             \
+    ${@base_contains('MACHINE_FEATURES','sgx','matrix-gui-3d-demos','',d)} \
     matrix-gui-multimedia-demos     \
                                     \
     matrix-gui-clocks-275mhz        \
meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-toolchain-tisdk-target.bb +4 -2
index ecc06b6..495a0e4 100644
@@ -1,14 +1,16 @@
 DESCRIPTION = "Task to build and install header and libs into the sdk"
 LICENSE = "MIT"
-PR = "r4"
+PR = "r5"
 
 inherit packagegroup
 
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
 RDEPENDS_${PN} = "\
     packagegroup-arago-qte-toolchain-target \
     packagegroup-arago-tisdk-multimedia-sdk-target \
     packagegroup-arago-tisdk-connectivity-sdk-target \
     packagegroup-arago-tisdk-crypto-sdk-target \
-    packagegroup-arago-tisdk-graphics-sdk-target \
+    ${@base_contains('MACHINE_FEATURES','sgx','packagegroup-arago-tisdk-graphics-sdk-target','',d)} \
     packagegroup-arago-tisdk-addons-sdk-target \
 "
Signature · 1 line
1.7.0.4
#1 lore raw

PATCH 2/10 arago-tisdk-amsdk-sdk-host: Use generic name for sources

From: Franklin S. Cooper Jr <[email protected]>

* Use generic name for kernel and u-boot sources which will allow for any machine to be used without modification.

---
 .../packagegroup-arago-tisdk-amsdk-sdk-host.bb     |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)
meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-amsdk-sdk-host.bb +3 -5
index 14626c8..0ac8d9d 100644
@@ -1,17 +1,15 @@
 DESCRIPTION = "Task to install additional scripts and applications into the SDK"
 LICENSE = "MIT"
-PR = "r3"
+PR = "r4"
 
 inherit packagegroup
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 # Choose the kernel and u-boot recipe sources to use
-U-BOOT_SRC = ""
-KERNEL_SRC = ""
 
-U-BOOT_SRC_am335x-evm = "u-boot-src"
-KERNEL_SRC_am335x-evm = "linux-am335x-src"
+U-BOOT_SRC = "${PREFERRED_PROVIDER_virtual/bootloader}-src"
+KERNEL_SRC = "${PREFERRED_PROVIDER_virtual/kernel}-src"
 
 TOOLS = "pinmux-utility"
 TOOLS_am37x-evm_append = " flash-utility"
Signature · 1 line
1.7.0.4
#2 lore raw

PATCH 3/10 ti-pru-sw-app-loader: Port ti-pru-sw-app-loader from Arago

In reply to [email protected]

From: Franklin S. Cooper Jr <[email protected]>

* Add PRU sw application loader recipe for the omapl138 machines

* This recipe builds the PRU application loader that is used to load a binary to the PRU's memory and manage the code executed in the PRU from the user space.

---
 .../ti-pru-sw-app-loader_1.00.00.bb                |   25 ++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 deletions(-)
 create mode 100644 meta-arago-extras/recipes-core/ti-pru-sw-app-loader/ti-pru-sw-app-loader_1.00.00.bb
meta-arago-extras/recipes-core/ti-pru-sw-app-loader/ti-pru-sw-app-loader_1.00.00.bb new file +25 -0
new file mode 100644
index 0000000..59e7562
@@ -0,0 +1,25 @@
+DESCRIPTION = "PRU sw application loader"
+HOMEPAGE = "https://gforge.ti.com/gf/project/pru_sw/"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://interface/prussdrv.c;beginline=1;endline=47;md5=6012fea45c1fbced663277bc90d2163a"
+
+RRECOMMENDS_${PN} = "kernel-module-uio-pru"
+PR = "r0+svnr${SRCPV}"
+
+COMPATIBLE_MACHINE = "omapl138"
+
+SRC_URI = "svn://gforge.ti.com/svn/pru_sw/;module=trunk;protocol=https;user=anonymous;pswd=''"
+
+SRCREV = "33"
+S = "${WORKDIR}/trunk/app_loader"
+
+do_compile () {
+        make -C ${S}/interface CCTOOL_PREFIX=${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}
+}
+
+do_install () {
+        install -d ${D}${libdir}
+        install -d ${D}${includedir}
+        install -m 0644 ${S}/include/* ${D}${includedir}
+        install -m 0644 ${S}/lib/* ${D}${libdir}
+}
Signature · 1 line
1.7.0.4
#3 lore raw

PATCH 4/10 ti-pru-sw-edma-library: Port recipe from Arago

In reply to [email protected]

From: Franklin S. Cooper Jr <[email protected]>

* Add PRU sw edma library recipe from Arago
* This recipe builds and stages the edma user space libraries for use by the PRU software.

---
 .../ti-pru-sw-edma-library_1.00.00.bb              |   29 ++++++++++++++++++++
 1 files changed, 29 insertions(+), 0 deletions(-)
 create mode 100644 meta-arago-extras/recipes-core/ti-pru-sw-edma-library/ti-pru-sw-edma-library_1.00.00.bb
meta-arago-extras/recipes-core/ti-pru-sw-edma-library/ti-pru-sw-edma-library_1.00.00.bb new file +29 -0
new file mode 100644
index 0000000..613962e
@@ -0,0 +1,29 @@
+DESCRIPTION = "eDMA library for use by PRU sw example applications"
+HOMEPAGE = "https://gforge.ti.com/gf/project/pru_sw/"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://edma.c;beginline=1;endline=46;md5=f6bde95a8e2277050e36b257ca9214a6"
+
+DEPENDS += "virtual/kernel"
+
+RDEPENDS_${PN} += "ti-pru-sw-edma-driver"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+COMPATIBLE_MACHINE = "omapl138"
+
+MACHINE_KERNEL_PR_append = "a+svnr${SRCPV}"
+PR = "${MACHINE_KERNEL_PR}"
+
+SRC_URI = "svn://gforge.ti.com/svn/pru_sw/;module=trunk;protocol=https;user=anonymous;pswd=''"
+
+SRCREV = "33"
+S = "${WORKDIR}/trunk/peripheral_lib/edma_driver/interface"
+
+do_compile () {
+	oe_runmake KERNEL_DIR="${STAGING_KERNEL_DIR}" CCTOOL_PREFIX=${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}
+}
+
+do_install () {
+	install -d ${D}/${libdir}
+	install -m 0755 ${S}/../lib/libedmautils.a ${D}/${libdir}/
+}
Signature · 1 line
1.7.0.4
#4 lore raw

PATCH 5/10 ti-pru-sw-examples: Port PRU SW example from Arago

In reply to [email protected]

From: Franklin S. Cooper Jr <[email protected]>

* Add PRU SW example recipe
* Ti-pru-sw-example recipe builds examples that demonstrate the use of the am180x-evm PRU.

---
 .../ti-pru-sw-examples_1.00.00.bb                  |   30 ++++++++++++++++++++
 1 files changed, 30 insertions(+), 0 deletions(-)
 create mode 100644 meta-arago-extras/recipes-core/ti-pru-sw-examples/ti-pru-sw-examples_1.00.00.bb
meta-arago-extras/recipes-core/ti-pru-sw-examples/ti-pru-sw-examples_1.00.00.bb new file +30 -0
new file mode 100644
index 0000000..ee62d89
@@ -0,0 +1,30 @@
+DESCRIPTION = "PRU sw example applications"
+HOMEPAGE = "https://gforge.ti.com/gf/project/pru_sw/"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://LICENCE.txt;md5=c4fd8ee7443c1b2b6238b4b5df796481"
+DEPENDS = "ti-pru-sw-app-loader ti-pru-sw-edma-library"
+RDEPENDS_${PN} = "ti-pru-sw-edma-driver"
+PR = "r0+svnr${SRCPV}"
+
+COMPATIBLE_MACHINE = "am180x-evm"
+
+SRC_URI = "svn://gforge.ti.com/svn/pru_sw/;module=trunk;protocol=https;user=anonymous;pswd=''"
+
+SRCREV = "33"
+S = "${WORKDIR}/trunk"
+
+do_compile () {
+        make -C ${S}/example_apps \
+          CCTOOLS="${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}"\
+          BINDIR_APPLICATIONS="${S}/example_apps/bin" \
+          BINDIR_FW="${S}/example_apps/bin" \
+          UTILS_DIR="${S}/utils"
+}
+
+do_install () {
+        install -d ${D}/usr/share/ti/ti-pru-eg/
+        install -m 0755 ${S}/example_apps/bin/* ${D}/usr/share/ti/ti-pru-eg/
+}
+
+FILES_${PN} += "${datadir}/ti/ti-pru-eg/*"
+FILES_${PN}-dbg += "${datadir}/ti/ti-pru-eg/.debug/*"
Signature · 1 line
1.7.0.4
#5 lore raw

PATCH 6/10 packagegroup-arago-tisdk-matrix: Add PRU Matrix demos for am180x-evm

In reply to [email protected]

From: Franklin S. Cooper Jr <[email protected]>

---
 .../packagegroup-arago-tisdk-matrix.bb             |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb +2 -1
index 46c9a2a..2093178 100644
@@ -1,6 +1,6 @@
 DESCRIPTION = "Task to include Matrix v2"
 LICENSE = "MIT"
-PR = "r10"
+PR = "r11"
 
 inherit packagegroup
 
@@ -96,6 +96,7 @@ MATRIX_APPS_append_am180x-evm = "   \
     matrix-gui-bluetooth-demos      \
     matrix-gui-wifi-direct-demo     \
     matrix-gui-wifi-battleship-demo \
+    matrix-gui-pru-demos            \
 "
 
 RDEPENDS_${PN} = "        \
Signature · 1 line
1.7.0.4
#6 lore raw

PATCH 7/10 arago-source-ipk: Enable CREATE_SRCIPK for linux-omapl138-psp recipe

In reply to [email protected]

From: Franklin S. Cooper Jr <[email protected]>

---
 .../conf/distro/arago-source-ipk.conf              |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
meta-arago-distro/conf/distro/arago-source-ipk.conf +4 -0
index d23e564..bc5ff59 100644
@@ -112,6 +112,10 @@ SRCIPK_INSTALL_DIR_pn-x-load = "board-support/x-load-${XVER}-psp${PSPREL}"
 SRCIPK_INSTALL_DIR_pn-x-load_beagleboard = "board-support/${P}"
 SRCIPK_PACKAGE_ARCH_pn-x-load = "${MACHINE_ARCH}"
 
+CREATE_SRCIPK_pn-linux-omapl138-psp = "1"
+SRCIPK_INSTALL_DIR_pn-linux-omapl138-psp = "board-support/linux-${KVER}-psp${PSPREL}"
+SRCIPK_PACKAGE_ARCH_pn-linux-omapl138-psp = "${MACHINE_ARCH}"
+
 CREATE_SRCIPK_pn-linux-omap3 = "1"
 SRCIPK_INSTALL_DIR_pn-linux-omap3 = "board-support/linux-${KVER}-psp${PSPREL}"
 SRCIPK_PACKAGE_ARCH_pn-linux-omap3 = "${MACHINE_ARCH}"
Signature · 1 line
1.7.0.4
#7 lore raw

PATCH 8/10 linux-omapl138-psp_2.6.37: Add sourceipk variables

In reply to [email protected]

From: Franklin S. Cooper Jr <[email protected]>

* Set variables for sourceipk
* Add empty file to disable multikernel stuff

---
 .../linux/linux-omapl138-psp_2.6.37.bbappend       |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)
 create mode 100644 meta-arago-distro/recipes-kernel/linux/linux-omapl138-psp-2.6.37/am180x-evm/configs/empty
 create mode 100644 meta-arago-distro/recipes-kernel/linux/linux-omapl138-psp_2.6.37.bbappend
meta-arago-distro/recipes-kernel/linux/linux-omapl138-psp-2.6.37/am180x-evm/configs/empty new file +0 -0
new file mode 100644
index 0000000..e69de29
meta-arago-distro/recipes-kernel/linux/linux-omapl138-psp_2.6.37.bbappend new file +10 -0
new file mode 100644
index 0000000..e8b0606
@@ -0,0 +1,10 @@
+MACHINE_KERNEL_PR_append = "-arago0"
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"
+
+# KVER is used by arago-source-ipk.conf
+KVER = "2.6.37"
+PSPREL = "03.21.00.04.sdk"
+
+require copy-defconfig.inc
+require setup-defconfig.inc
Signature · 1 line
1.7.0.4
#8 lore raw

PATCH 9/10 arago.conf: Use SDK supported kernel for am180x-evm

In reply to [email protected]

From: Franklin S. Cooper Jr <[email protected]>

---
 meta-arago-distro/conf/distro/arago.conf |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
meta-arago-distro/conf/distro/arago.conf +4 -0
index bc75ff2..6b0879d 100644
@@ -56,6 +56,10 @@ PREFERRED_VERSION_virtual/kernel_am335x-evm = "3.2.0-psp05.06.00.00"
 # Use the SDK supported u-boot version
 PREFERRED_VERSION_u-boot_am335x-evm = "2012.10-psp05.06.00.00"
 
+PREFERRED_VERSION_linux-omapl138-psp_am180x-evm = "2.6.37"
+PREFERRED_PROVIDER_virtual/kernel_am180x-evm = "linux-omapl138-psp"
+
+
 # Pin down udev version from oe-core, as meta-oe pulls in newer systemd-enhanced version
 PREFERRED_VERSION_udev = "164"
 PREFERRED_PROVIDER_udev = "udev"
Signature · 1 line
1.7.0.4
#9 lore raw

PATCH 10/10 arago.conf: Use SDK support u-boot for am180x-evm

In reply to [email protected]

From: Franklin S. Cooper Jr <[email protected]>

---
 meta-arago-distro/conf/distro/arago.conf |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
meta-arago-distro/conf/distro/arago.conf +1 -0
index 6b0879d..b7f0e2c 100644
@@ -58,6 +58,7 @@ PREFERRED_VERSION_u-boot_am335x-evm = "2012.10-psp05.06.00.00"
 
 PREFERRED_VERSION_linux-omapl138-psp_am180x-evm = "2.6.37"
 PREFERRED_PROVIDER_virtual/kernel_am180x-evm = "linux-omapl138-psp"
+PREFERRED_VERSION_u-boot_am180x-evm = "2010.12-psp03.21.00.04.sdk"
 
 
 # Pin down udev version from oe-core, as meta-oe pulls in newer systemd-enhanced version
Signature · 1 line
1.7.0.4