All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v2 01/13] rcw-bin: add recipes
@ 2018-01-30  9:09 Chunrong Guo
  2018-01-30  9:09 ` [PATCH v2 02/13] optee-os: " Chunrong Guo
                   ` (11 more replies)
  0 siblings, 12 replies; 13+ messages in thread
From: Chunrong Guo @ 2018-01-30  9:09 UTC (permalink / raw)
  To: meta-freescale; +Cc: chunrong.guo

From: Chunrong Guo <chunrong.guo@nxp.com>

*include the following changes:

bf3ae3c - armv8:LS1012A: Add support for LS1012A-2G5RDB board
e84010a - rcw: remove source files of SoCs
69104c3 - LS1012: Change header location in rcw for Secure Boot
43c79c9 - rcw: ls1088aqds: Add RCW PBL_QSPI_1600_700_2100_0x15_0x0d.bin
6719b04 - Ls1043a: add workaround for pcie errata A-009859
1a6236a - LS1012ARDB: Change rcw for secure boot
cdf4b72 - rcw: ls1088aqds: Add SCSI errata for detecttion of sata
16072f7 - armv8:LS1012A: RCW supporting 1GHz CPU frequency
90aef03 - LS1088ARDB:Reduce size in block copy command
53518dc - rcw: ls1088ardb: Add SCSI errata for detecttion of sata
0a869b3 - ls1021a: add workaround for pcie erratum A-007997 and A-007815
e7f18e5 - ls2088ardb: Add RCW for with platform frequency 700MHz
6f324fc - Use BSD license for both rcw and binary files
c69799f - Added copyright to byte_swap.tcl

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
---
 recipes-bsp/rcw/rcw-bin_git.bb | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 recipes-bsp/rcw/rcw-bin_git.bb

diff --git a/recipes-bsp/rcw/rcw-bin_git.bb b/recipes-bsp/rcw/rcw-bin_git.bb
new file mode 100644
index 0000000..bdb075f
--- /dev/null
+++ b/recipes-bsp/rcw/rcw-bin_git.bb
@@ -0,0 +1,32 @@
+SUMMARY = "Reset Configuration Word"
+DESCRIPTION = "Reset Configuration Word - hardware boot-time parameters for the QorIQ targets"
+LICENSE = "NXP-Binary-EULA"
+LIC_FILES_CHKSUM = "file://NXP-Binary-EULA;md5=ba5ff3a3faf52a38970d0a536ef42df5"
+
+inherit deploy siteinfo
+
+SRC_URI = "git://github.com/qoriq-open-source/rcw-bin.git;nobranch=1"
+SRCREV = "bf3ae3cb15829876007c553509501cdaa16745e7"
+
+S = "${WORKDIR}/git"
+
+M="${@d.getVar('MACHINE', True).replace('-64b','').replace('-32b','').replace('-${SITEINFO_ENDIANNESS}','')}"
+
+do_install () {
+    install -d ${D}/boot/rcw
+    cp -rf ${S}/${M}* ${D}/boot/rcw/
+    chown -R root:root ${D}
+}
+
+do_deploy () {
+    install -d ${DEPLOYDIR}/rcw
+    cp -rf ${S}/${M}* ${DEPLOYDIR}/rcw/
+}
+addtask deploy before do_build after do_install
+
+PACKAGES += "${PN}-image"
+FILES_${PN}-image += "/boot"
+
+COMPATIBLE_MACHINE = "(qoriq)"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+COMPATIBLE_MACHINE = "(ls1012a|ls2088a|ls1088a)"
-- 
1.9.0



^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH v2 02/13] optee-os: add recipes
  2018-01-30  9:09 [PATCH v2 01/13] rcw-bin: add recipes Chunrong Guo
@ 2018-01-30  9:09 ` Chunrong Guo
  2018-01-30  9:09 ` [PATCH v2 03/13] optee-client: " Chunrong Guo
                   ` (10 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: Chunrong Guo @ 2018-01-30  9:09 UTC (permalink / raw)
  To: meta-freescale; +Cc: chunrong.guo

From: Chunrong Guo <chunrong.guo@nxp.com>

*include the following changes:
ced7d32 - Merge pull request #2 in DASH/optee_os from ~NXA18717/dash_optee_os:master to master
b48ba24 - plat-ls: Add support for armv8 platform flavour
789e38a - core: arm: psci: pass nsec ctx to system_suspend
a7337d8 - core: fix allocated object on object creation failure in svc storage
639e5b8 - pta: change DMSG to FMSG for invoke in pta/SDP
bc0d271 - make clean: split file list into manageable chunks
8c6a8af - Fix comment in tee_ree_fs.c
6d57389 - Update CHANGELOG.md for 2.6.0
e4a1f58 - entry_std.c: Initialize num_params to fix gcc warning
b644907 - thread.c: free rpc arg mobj during cache disabling
a3bb288 - Update minor revision to 6 for release tag 2.6.0-rc1
b45ff69 - hikey, hikey960: enable dynamic shared memory
9a85cc0 - core: add v2p/p2v tests in embedded tests
3883028 - core:mmu: privileged land pa2va is not supported in dynamic SHM
0d86665 - core:debug: add verbosity when pa/va do not match
42d91b4 - core:mmu: fix userland pa2va conversion
bbed97b - core:mmu: fix userland va2pa conversion
def98e2 - core:unwind: check user context on stack print of panicked TAs
f98151a - core: map PTA registered shared memory late
430dcbd - core: reimplement mobj_mapped_shm_alloc()
071e702 - core: add mobj_reg_shm_{,un}map()
5c7a19b - core: mobj: remove double physical offset
a71af55 - core: mobj: add mobj_get_phys_offs()
8ae8c73 - Add Marvell platform with initial support for ARMADA A7K & A8K
ade1412 - Util: add ASM version ROUNDDOWN and ROUNDUP definitions
a5ebede - Util: add some useful SIZE definitions
ae9fdf9 - plat-stm: support registered shm buffers
ae19421 - core:sdp: fix SDP test pseudo-TA against dynamic shm
c5d84b7 - plat-rcar: add non-secure DDR configuration
d7269cc - plat-rcar: add initial support for salvator-m3 board
b369a93 - plat-rcar: force CFG_CORE_LARGE_PHYS_ADDR
ae841ed - pager: allow TA unwind when cause of unwind is not abort
785be2e - plat-vexpress: juno: add missing DRAM1
7411e0e - Add comment about CFG_UNWIND
3ff067c - plat-vexpress: fvp: add missing DRAM1
cbe4eae - core: add register_phys_mem_ul()
29ba2e7 - core: trivial large paddr_t fixes
dd3afba - Add CFG_CORE_LARGE_PHYS_ADDR for 64bit paddr_t

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
---
 ...1-allow-setting-sysroot-for-libgcc-lookup.patch | 13 +++++
 recipes-security/optee/optee-os_git.bb             | 67 ++++++++++++++++++++++
 2 files changed, 80 insertions(+)
 create mode 100644 recipes-security/optee/optee-os/0001-allow-setting-sysroot-for-libgcc-lookup.patch
 create mode 100644 recipes-security/optee/optee-os_git.bb

diff --git a/recipes-security/optee/optee-os/0001-allow-setting-sysroot-for-libgcc-lookup.patch b/recipes-security/optee/optee-os/0001-allow-setting-sysroot-for-libgcc-lookup.patch
new file mode 100644
index 0000000..17127d0
--- /dev/null
+++ b/recipes-security/optee/optee-os/0001-allow-setting-sysroot-for-libgcc-lookup.patch
@@ -0,0 +1,13 @@
+diff --git a/mk/gcc.mk b/mk/gcc.mk
+index fc38c4d..77b8d74 100644
+--- a/mk/gcc.mk
++++ b/mk/gcc.mk
+@@ -12,7 +12,7 @@ nostdinc$(sm)	:= -nostdinc -isystem $(shell $(CC$(sm)) \
+ 			-print-file-name=include 2> /dev/null)
+ 
+ # Get location of libgcc from gcc
+-libgcc$(sm)  	:= $(shell $(CC$(sm)) $(CFLAGS$(arch-bits-$(sm))) $(comp-cflags$(sm)) \
++libgcc$(sm)  	:= $(shell $(CC$(sm)) $(LIBGCC_LOCATE_CFLAGS) $(CFLAGS$(arch-bits-$(sm))) $(comp-cflags$(sm)) \
+ 			-print-libgcc-file-name 2> /dev/null)
+ 
+ # Define these to something to discover accidental use
diff --git a/recipes-security/optee/optee-os_git.bb b/recipes-security/optee/optee-os_git.bb
new file mode 100644
index 0000000..cda3a69
--- /dev/null
+++ b/recipes-security/optee/optee-os_git.bb
@@ -0,0 +1,67 @@
+SUMMARY = "OP-TEE Trusted OS"
+DESCRIPTION = "OPTEE OS"
+
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=69663ab153298557a59c67a60a743e5b"
+
+DEPENDS = "python-pycrypto-native"
+
+inherit deploy pythonnative
+
+SRCREV = "ced7d32072c2b350c2090803f6dcfa006057efda"
+SRC_URI = "git://github.com/qoriq-open-source/optee_os.git;nobranch=1 \
+           file://0001-allow-setting-sysroot-for-libgcc-lookup.patch \
+          "
+
+S = "${WORKDIR}/git"
+
+OPTEEMACHINE ?= "${MACHINE}"
+
+EXTRA_OEMAKE = "PLATFORM=ls-${OPTEEMACHINE} CFG_ARM64_core=y \
+                CROSS_COMPILE_core=${HOST_PREFIX} \
+                CROSS_COMPILE_ta_arm64=${HOST_PREFIX} \
+                NOWERROR=1 \
+                ta-targets=ta_arm64 \
+                LDFLAGS= \
+                LIBGCC_LOCATE_CFLAGS=--sysroot=${STAGING_DIR_HOST} \
+        "
+
+OPTEE_ARCH_armv7a = "arm32"
+OPTEE_ARCH_aarch64 = "arm64"
+
+do_compile() {
+    unset LDFLAGS
+    oe_runmake all CFG_TEE_TA_LOG_LEVEL=0
+}
+
+do_install() {
+    #install core on boot directory
+    install -d ${D}/lib/firmware/
+
+    install -m 644 ${B}/out/arm-plat-ls/core/tee.elf ${D}/lib/firmware/tee_${MACHINE}.bin
+    #install TA devkit
+    install -d ${D}/usr/include/optee/export-user_ta/
+
+    for f in  ${B}/out/arm-plat-ls/export-ta_${OPTEE_ARCH}/* ; do
+        cp -aR  $f  ${D}/usr/include/optee/export-user_ta/
+    done
+}
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+do_deploy() {
+        install -d ${DEPLOYDIR}/optee
+        for f in ${D}/lib/firmware/*; do
+            install -m 644 $f ${DEPLOYDIR}/optee/tee_${MACHINE}.bin
+        done
+}
+
+addtask deploy before do_build after do_install
+
+FILES_${PN} = "/lib/firmware/"
+FILES_${PN}-dev = "/usr/include/optee"
+
+INSANE_SKIP_${PN}-dev = "staticdev"
+
+INHIBIT_PACKAGE_STRIP = "1"
+COMPATIBLE_MACHINE = "(ls1043ardb|ls1046ardb|ls1012ardb)"
-- 
1.9.0



^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH v2 03/13] optee-client: add recipes
  2018-01-30  9:09 [PATCH v2 01/13] rcw-bin: add recipes Chunrong Guo
  2018-01-30  9:09 ` [PATCH v2 02/13] optee-os: " Chunrong Guo
@ 2018-01-30  9:09 ` Chunrong Guo
  2018-01-30  9:09 ` [PATCH v2 04/13] optee-test: " Chunrong Guo
                   ` (9 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: Chunrong Guo @ 2018-01-30  9:09 UTC (permalink / raw)
  To: meta-freescale; +Cc: chunrong.guo

From: Chunrong Guo <chunrong.guo@nxp.com>

*include the following changes:
73b4e49 - tee-supplicant: REE fs open file with O_SYNC flag
075c56e - tee_supplicant: add register memory feature
27888d7 - tee_client_api: register user memory
f761a27 - tee-supplicant: move TEEC_LOAD_PATH to Makefile
48107e5 - tee_client_api: support calling libteec from cplusplus
32d9b77 - rpi3: fix unsupported exclusive access issue
0efaf6b - libteec/Makefile: create relative links to shared library instead of absolute ones
44c0d30 - Makefile: preserve links to libraries during make copy_export
5883a75 - libteec: benchmark cleanup
e5ba7e8 - tee-supplicant: Report error on short buffer when loading TA
5db6c2d - Fix incorrect share memory size
48aed6e - Storage: Added CFG_TEE_FS_PARENT_PATH config option
1358c3f - Replace file permission symbolic values by octal numbers
63106fb - OP-TEE Benchmark
326001c - tee-supplicant: FS: remove unused legacy RPC functions
d6a3291 - Remove leftovers of SQL FS
5de013f - supplicant: use public rpc command ids
f8a4086 - supplicant: define/describe reserved Ids for supplicant commands
a47e334 - client api: fix ULONG_MAX dependency
9faeb1b - tee_client_api: Correct max shared memory size define
4d5cf67 - tee-supplicant: correct block device path for android
403c9a1 - Remove SQL-FS
0b7aa7d - Android.mk: fix CFG_TEE_CLIENT_LOG_FILE checking
1df4046 - ree_fs_new_opendir(): ignore empty directory
d507b84 - tee_supplicant_android.mk: Add missing configs for sockets
ea42194 - tee-supplicant: fix variable is used unitialized error
79309c4 - Use the mode also in open_wrapper
f79c74f - tee-supplicant: Add support for TCP/UDP iSocket interface
52e6ca1 - tee-supplicant: spawn threads as needed
5229afd - tee-supplicant: support asynchronous supplicant requests
5477e9e - tee-supplicant: Update TEEC_TEST_LOAD_PATH for Android
7f16107 - ree fs rpc: open with best-effort allowing RO data fs
3b4c507 - Add support for TA profiling (gprof)
a1df073 - Rename optee_msg_fs.h to optee_msg_supplicant.h
1aaf6dc - tee-supplicant: disable warnings only for sql_fs.c
3656576 - Add backward compatibility with older TA UUID format
1d5cc96 - Allow O to be an absolute path
ce5fefe - Format UUID strings correctly

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
---
 recipes-security/optee/optee-client.bb             | 26 +++++++++
 .../0001-Respect-LDFLAGS-set-from-OE-build.patch   | 67 ++++++++++++++++++++++
 2 files changed, 93 insertions(+)
 create mode 100644 recipes-security/optee/optee-client.bb
 create mode 100644 recipes-security/optee/optee-client/0001-Respect-LDFLAGS-set-from-OE-build.patch

diff --git a/recipes-security/optee/optee-client.bb b/recipes-security/optee/optee-client.bb
new file mode 100644
index 0000000..b811e60
--- /dev/null
+++ b/recipes-security/optee/optee-client.bb
@@ -0,0 +1,26 @@
+SUMMARY = "OPTEE Client"
+HOMEPAGE = "https://github.com/qoriq-open-source/optee_client"
+
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=69663ab153298557a59c67a60a743e5b"
+
+inherit pythonnative systemd
+
+SRC_URI = "git://github.com/qoriq-open-source/optee_client.git;nobranch=1 \
+           file://0001-Respect-LDFLAGS-set-from-OE-build.patch \
+"
+S = "${WORKDIR}/git"
+
+SRCREV = "73b4e490a8ed0b4a7714818e80998b9d8a7da958"
+
+do_install() {
+    oe_runmake install
+
+    install -D -p -m0755 ${S}/out/export/bin/tee-supplicant ${D}${bindir}/tee-supplicant
+
+    install -D -p -m0644 ${S}/out/export/lib/libteec.so.1.0 ${D}${libdir}/libteec.so.1.0
+    ln -sf libteec.so.1.0 ${D}${libdir}/libteec.so
+    ln -sf libteec.so.1.0 ${D}${libdir}/libteec.so.1
+
+    cp -a ${S}/out/export/include ${D}/usr/
+}
diff --git a/recipes-security/optee/optee-client/0001-Respect-LDFLAGS-set-from-OE-build.patch b/recipes-security/optee/optee-client/0001-Respect-LDFLAGS-set-from-OE-build.patch
new file mode 100644
index 0000000..8dd6c7a
--- /dev/null
+++ b/recipes-security/optee/optee-client/0001-Respect-LDFLAGS-set-from-OE-build.patch
@@ -0,0 +1,67 @@
+From 73cb675c16bd63ee0e760a4067ffda4b050d19fa Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Thu, 15 Jun 2017 17:20:35 -0700
+Subject: [PATCH] Respect LDFLAGS set from OE build
+
+* Unify LFLAGS/LDFLAGS variable names (only tee-supplicant was using LDFLAGS).
+* Fixes:
+  ERROR: optee-client-2.4.0+gitAUTOINC+1df4046bd7-r0 do_package_qa: QA Issue: No GNU_HASH in the elf binary: 'optee-client/2.4.0+gitAUTOINC+1df4046bd7-r0/packages-split/optee-client/usr/bin/tee-supplicant'
+  No GNU_HASH in the elf binary: 'optee-client/2.4.0+gitAUTOINC+1df4046bd7-r0/packages-split/optee-client/usr/lib/libteec.so.1.0' [ldflags]
+  ERROR: optee-client-2.4.0+gitAUTOINC+1df4046bd7-r0 do_package_qa: QA run found fatal errors. Please consider fixing them.
+  ERROR: optee-client-2.4.0+gitAUTOINC+1df4046bd7-r0 do_package_qa: Function failed: do_package_qa
+  ERROR: Logfile of failure stored in: optee-client/2.4.0+gitAUTOINC+1df4046bd7-r0/temp/log.do_package_qa.31246
+
+Upstream-Status: Pending
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+
+---
+ libteec/Makefile        | 2 +-
+ tee-supplicant/Makefile | 8 ++++----
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/libteec/Makefile b/libteec/Makefile
+index 568a2cd..a406237 100644
+--- a/libteec/Makefile
++++ b/libteec/Makefile
+@@ -36,7 +36,7 @@ ifeq ($(CFG_TEE_BENCHMARK),y)
+ TEEC_CFLAGS	+= -DCFG_TEE_BENCHMARK
+ endif
+ 
+-TEEC_LFLAGS    := -lpthread
++TEEC_LFLAGS    := $(LDFLAGS) -lpthread
+ TEEC_LIBRARY	:= $(OUT_DIR)/$(LIB_MAJ_MIN)
+ 
+ libteec: $(TEEC_LIBRARY)
+diff --git a/tee-supplicant/Makefile b/tee-supplicant/Makefile
+index 737d39a..4b423fb 100644
+--- a/tee-supplicant/Makefile
++++ b/tee-supplicant/Makefile
+@@ -55,21 +55,21 @@ ifeq ($(CFG_TA_TEST_PATH),y)
+ TEES_CFLAGS	+= -DCFG_TA_TEST_PATH=1
+ endif
+ TEES_FILE	:= $(OUT_DIR)/$(PACKAGE_NAME)
+-TEES_LDFLAGS    := -L$(OUT_DIR)/../libteec -lteec
++TEES_LFLAGS    := $(LDFLAGS) -L$(OUT_DIR)/../libteec -lteec
+ 
+ ifeq ($(CFG_TA_GPROF_SUPPORT),y)
+ TEES_CFLAGS	+= -DCFG_TA_GPROF_SUPPORT
+ endif
+ 
+-TEES_LDFLAGS	+= -lpthread
++TEES_LFLAGS	+= -lpthread
+ # Needed to get clock_gettime() for for glibc versions before 2.17
+-TEES_LDFLAGS	+= -lrt
++TEES_LFLAGS	+= -lrt
+ 
+ tee-supplicant: $(TEES_FILE)
+ 
+ $(TEES_FILE): $(TEES_OBJS)
+ 	@echo "  LINK    $@"
+-	$(VPREFIX)$(CC) -o $@ $+ $(TEES_LDFLAGS)
++	$(VPREFIX)$(CC) -o $@ $+ $(TEES_LFLAGS)
+ 	@echo ""
+ 
+ $(TEES_OBJ_DIR)/%.o: $(TEES_SRC_DIR)/%.c
+-- 
+2.15.0.rc2
+
-- 
1.9.0



^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH v2 04/13] optee-test: add recipes
  2018-01-30  9:09 [PATCH v2 01/13] rcw-bin: add recipes Chunrong Guo
  2018-01-30  9:09 ` [PATCH v2 02/13] optee-os: " Chunrong Guo
  2018-01-30  9:09 ` [PATCH v2 03/13] optee-client: " Chunrong Guo
@ 2018-01-30  9:09 ` Chunrong Guo
  2018-01-30  9:09 ` [PATCH v2 05/13] mc-utils: " Chunrong Guo
                   ` (8 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: Chunrong Guo @ 2018-01-30  9:09 UTC (permalink / raw)
  To: meta-freescale; +Cc: chunrong.guo

From: Chunrong Guo <chunrong.guo@nxp.com>

*include the following changes:

a54952b - xtest storage: add a test case of creation of already existing object
c3af0c2 - xtest: deprecated bass_return_code
1109316 - xtest: regression 1xxx: at least warn if test pseudo TA not found
a319852 - xtest 1014: minor beautification
3b2da64 - Adds AES-GCM performance test in aes-perf
cc72dd2 - xtest:sdp: fix a xtest crash if TEE is built without test pTA
3a34b98 - xtest:sdp: support old ION API if new API fails
8bc3142 - xtest/sdp: sync with ION udpates from linux kernel 4.12
1d70a11 - regression: add case 1002
087f204 - xtest: add -DTA_DIR to meet different requirement
24ce5ab - aes_perf: add missing #include <trace.h>
96d3952 - crypt: Support 64-bit TA address space.
47f7e3b - remove deprecated ta/prebuilt/faked_armv7_uta_signed_header.bin
e0ab180 - xtest: fix buffer setup in AES benchmark tests
e916b10 - Add regression_1016: TA to TA buffer manipulations
7601c03 - ta/os_test: remove unused code
d2d94b4 - Make sure AES CTR does not buffer data
c13fafa - Make sure AES GCM does not buffer data
5f86daa - regression 6018: reduce the number of blocks written
fbbc48d - xtest: fix 32bit/64bit build directive when GP suite is enabled
de0c443 - regression_5000.c: use size_t instead of uint32_t
cefbe02 - regression_5006: use 32KB buffer
e134252 - --sdp-basic: fix misleading messages
20949ea - regression 6018: reduce the number of blocks written
0b8342d - SDP basic test TA: get SDP configuration from TA devkit
d851fc7 - xtest/perfs: fix option for random initialization of input buffers
b85a5f9 - xtest: add SDP performance tests in aes-perf
b9a9582 - xtest: fix SDP basic to nicely export allocate_ion_buffer()
057129b - aes-perf: AES buffer size must be a multiple of 16 bytes
d0b3ee2 - aes-perf, sha-perf: add long options
2f18cc4 - aes-perf, sha-perf: trace TEE error origin when applicable
7203db0 - Remove SQL-FS
d232f17 - regression: add case 9524
e5f9a5d - regression: 6015: remove special case for REE FS
4fd31f7 - Adjust the 9xxx cases for FS updates
170a1ee - Android.mk: Rename C source files to its test suite
f84e996 - adbg_run.c: Define TAILQ_CONCAT() for aosp
cc923db - Adjust the 9xxx cases for FS updates

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
---
 recipes-security/optee/optee-test_git.bb | 47 ++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 recipes-security/optee/optee-test_git.bb

diff --git a/recipes-security/optee/optee-test_git.bb b/recipes-security/optee/optee-test_git.bb
new file mode 100644
index 0000000..8c38d72
--- /dev/null
+++ b/recipes-security/optee/optee-test_git.bb
@@ -0,0 +1,47 @@
+SUMMARY = "OP-TEE sanity testsuite"
+HOMEPAGE = "https://github.com/qoriq-open-source/optee_test"
+
+LICENSE = "BSD & GPLv2"
+LIC_FILES_CHKSUM = "file://${S}/LICENSE.md;md5=daa2bcccc666345ab8940aab1315a4fa"
+
+DEPENDS = "optee-client optee-os python-pycrypto-native"
+
+inherit pythonnative
+
+SRC_URI = "git://github.com/qoriq-open-source/optee_test.git;nobranch=1 \
+          "
+S = "${WORKDIR}/git"
+
+SRCREV = "a54952babb83d801148867bd639a24ff6cd36f00"
+
+OPTEE_CLIENT_EXPORT = "${STAGING_DIR_HOST}${prefix}"
+TEEC_EXPORT         = "${STAGING_DIR_HOST}${prefix}"
+TA_DEV_KIT_DIR      = "${STAGING_INCDIR}/optee/export-user_ta"
+
+EXTRA_OEMAKE = " TA_DEV_KIT_DIR=${TA_DEV_KIT_DIR} \
+                 OPTEE_CLIENT_EXPORT=${OPTEE_CLIENT_EXPORT} \
+                 TEEC_EXPORT=${TEEC_EXPORT} \
+                 CROSS_COMPILE_HOST=${TARGET_PREFIX} \
+                 CROSS_COMPILE_TA=${TARGET_PREFIX} \
+                 V=1 \
+               "
+
+do_compile() {
+    # Top level makefile doesn't seem to handle parallel make gracefully
+    oe_runmake xtest
+    oe_runmake ta
+}
+
+do_install () {
+    install -D -p -m0755 ${S}/out/xtest/xtest ${D}${bindir}/xtest
+
+    # install path should match the value set in optee-client/tee-supplicant
+    # default TEEC_LOAD_PATH is /lib
+    mkdir -p ${D}/lib/optee_armtz/
+    install -D -p -m0444 ${S}/out/ta/*/*.ta ${D}/lib/optee_armtz/
+}
+
+FILES_${PN} += "/lib/optee_armtz/"
+
+# Imports machine specific configs from staging to build
+PACKAGE_ARCH = "${MACHINE_ARCH}"
-- 
1.9.0



^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH v2 05/13] mc-utils: add recipes
  2018-01-30  9:09 [PATCH v2 01/13] rcw-bin: add recipes Chunrong Guo
                   ` (2 preceding siblings ...)
  2018-01-30  9:09 ` [PATCH v2 04/13] optee-test: " Chunrong Guo
@ 2018-01-30  9:09 ` Chunrong Guo
  2018-01-30  9:09 ` [PATCH v2 06/13] ls1088ardb: mc-utils instead of dpl-examples Chunrong Guo
                   ` (7 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: Chunrong Guo @ 2018-01-30  9:09 UTC (permalink / raw)
  To: meta-freescale; +Cc: chunrong.guo

From: Chunrong Guo <chunrong.guo@nxp.com>

*include the following changes:
b79fe4b - config: add descriptions to DPCs and DPLs
cc37a9c - config: convert files from dos format to unix
8b3fe8c - config: update source files to match release LSDK-17.09
5b25be0 - config: update source files to match release LSDK-17.06
01a71bb - config: update source files to match LSDK-17.06-EAR
06dda1d - config: add source files for DPLs and DPCs
86da1cf - initial commit

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
---
 recipes-bsp/mc-utils/mc-utils_git.bb | 39 ++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 recipes-bsp/mc-utils/mc-utils_git.bb

diff --git a/recipes-bsp/mc-utils/mc-utils_git.bb b/recipes-bsp/mc-utils/mc-utils_git.bb
new file mode 100644
index 0000000..221c9e2
--- /dev/null
+++ b/recipes-bsp/mc-utils/mc-utils_git.bb
@@ -0,0 +1,39 @@
+DESCRIPTION = "The Management Complex (MC) is a key component of DPAA"
+SECTION = "mc-utils"
+LICENSE = "BSD"
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=386a6287daa6504b7e7e5014ddfb3987 \
+"
+
+DEPENDS += "dtc-native"
+
+inherit deploy
+
+SRC_URI = "git://github.com/qoriq-open-source/mc-utils.git;nobranch=1"
+SRCREV = "b79fe4b47364dfd2fe263f701ad6b818a75b036b"
+
+S = "${WORKDIR}/git"
+
+MC_CFG ?= ""
+MC_CFG_ls1088a = "ls1088a"
+MC_CFG_ls2088a = "ls2088a"
+
+do_install () {
+	oe_runmake -C config 
+
+	install -d ${D}/boot/mc-utils/custom
+	cp -r ${S}/config/${MC_CFG}/RDB/*.dtb ${D}/boot/mc-utils
+        cp -r ${S}/config/${MC_CFG}/RDB/custom/*.dtb ${D}/boot/mc-utils/custom
+}
+
+do_deploy () {
+	install -d ${DEPLOYDIR}/mc-utils/custom
+	cp -r ${S}/config/${MC_CFG}/RDB/*.dtb ${DEPLOYDIR}/mc-utils
+        cp -r ${S}/config/${MC_CFG}/RDB/custom/*.dtb ${DEPLOYDIR}/mc-utils/custom
+        
+}
+addtask deploy after do_install
+
+PACKAGES += "${PN}-image"
+FILES_${PN}-image += "/boot"
+COMPATIBLE_MACHINE = "(ls1088a|ls2088a)"
-- 
1.9.0



^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH v2 06/13] ls1088ardb: mc-utils instead of dpl-examples
  2018-01-30  9:09 [PATCH v2 01/13] rcw-bin: add recipes Chunrong Guo
                   ` (3 preceding siblings ...)
  2018-01-30  9:09 ` [PATCH v2 05/13] mc-utils: " Chunrong Guo
@ 2018-01-30  9:09 ` Chunrong Guo
  2018-01-30  9:09 ` [PATCH v2 07/13] ls2088ardb: " Chunrong Guo
                   ` (6 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: Chunrong Guo @ 2018-01-30  9:09 UTC (permalink / raw)
  To: meta-freescale; +Cc: chunrong.guo

From: Chunrong Guo <chunrong.guo@nxp.com>

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
---
 conf/machine/ls1088ardb.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/machine/ls1088ardb.conf b/conf/machine/ls1088ardb.conf
index 18e7913..3cb8784 100644
--- a/conf/machine/ls1088ardb.conf
+++ b/conf/machine/ls1088ardb.conf
@@ -26,5 +26,5 @@ KERNEL_DEFCONFIG ?= "defconfig"
 SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyAMA0"
 SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
 
-EXTRA_IMAGEDEPENDS += "dpl-examples rcw management-complex ppa"
+EXTRA_IMAGEDEPENDS += "mc-utils rcw management-complex ppa"
 USE_VT = "0"
-- 
1.9.0



^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH v2 07/13] ls2088ardb: mc-utils instead of dpl-examples
  2018-01-30  9:09 [PATCH v2 01/13] rcw-bin: add recipes Chunrong Guo
                   ` (4 preceding siblings ...)
  2018-01-30  9:09 ` [PATCH v2 06/13] ls1088ardb: mc-utils instead of dpl-examples Chunrong Guo
@ 2018-01-30  9:09 ` Chunrong Guo
  2018-01-30  9:09 ` [PATCH v2 08/13] ls1088ardb: rcw-bin instead of rcw Chunrong Guo
                   ` (5 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: Chunrong Guo @ 2018-01-30  9:09 UTC (permalink / raw)
  To: meta-freescale; +Cc: chunrong.guo

From: Chunrong Guo <chunrong.guo@nxp.com>

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
---
 conf/machine/ls2088ardb.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/machine/ls2088ardb.conf b/conf/machine/ls2088ardb.conf
index 4d18c13..a23f762 100644
--- a/conf/machine/ls2088ardb.conf
+++ b/conf/machine/ls2088ardb.conf
@@ -27,5 +27,5 @@ KERNEL_DEFCONFIG ?= "defconfig"
 SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyAMA0"
 SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
 
-EXTRA_IMAGEDEPENDS += "dpl-examples ls2-phy rcw management-complex ppa uefi"
+EXTRA_IMAGEDEPENDS += "mc-utils ls2-phy rcw management-complex ppa uefi"
 USE_VT = "0"
-- 
1.9.0



^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH v2 08/13] ls1088ardb: rcw-bin instead of rcw
  2018-01-30  9:09 [PATCH v2 01/13] rcw-bin: add recipes Chunrong Guo
                   ` (5 preceding siblings ...)
  2018-01-30  9:09 ` [PATCH v2 07/13] ls2088ardb: " Chunrong Guo
@ 2018-01-30  9:09 ` Chunrong Guo
  2018-01-30  9:09 ` [PATCH v2 09/13] ls2088ardb: " Chunrong Guo
                   ` (4 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: Chunrong Guo @ 2018-01-30  9:09 UTC (permalink / raw)
  To: meta-freescale; +Cc: chunrong.guo

From: Chunrong Guo <chunrong.guo@nxp.com>

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>>
---
 conf/machine/ls1088ardb.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/machine/ls1088ardb.conf b/conf/machine/ls1088ardb.conf
index 3cb8784..325bcc4 100644
--- a/conf/machine/ls1088ardb.conf
+++ b/conf/machine/ls1088ardb.conf
@@ -26,5 +26,5 @@ KERNEL_DEFCONFIG ?= "defconfig"
 SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyAMA0"
 SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
 
-EXTRA_IMAGEDEPENDS += "mc-utils rcw management-complex ppa"
+EXTRA_IMAGEDEPENDS += "mc-utils rcw-bin management-complex ppa"
 USE_VT = "0"
-- 
1.9.0



^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH v2 09/13] ls2088ardb: rcw-bin instead of rcw
  2018-01-30  9:09 [PATCH v2 01/13] rcw-bin: add recipes Chunrong Guo
                   ` (6 preceding siblings ...)
  2018-01-30  9:09 ` [PATCH v2 08/13] ls1088ardb: rcw-bin instead of rcw Chunrong Guo
@ 2018-01-30  9:09 ` Chunrong Guo
  2018-01-30  9:10 ` [PATCH v2 10/13] ls1012ardb: " Chunrong Guo
                   ` (3 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: Chunrong Guo @ 2018-01-30  9:09 UTC (permalink / raw)
  To: meta-freescale; +Cc: chunrong.guo

From: Chunrong Guo <chunrong.guo@nxp.com>

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
---
 conf/machine/ls2088ardb.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/machine/ls2088ardb.conf b/conf/machine/ls2088ardb.conf
index a23f762..39a87aa 100644
--- a/conf/machine/ls2088ardb.conf
+++ b/conf/machine/ls2088ardb.conf
@@ -27,5 +27,5 @@ KERNEL_DEFCONFIG ?= "defconfig"
 SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyAMA0"
 SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
 
-EXTRA_IMAGEDEPENDS += "mc-utils ls2-phy rcw management-complex ppa uefi"
+EXTRA_IMAGEDEPENDS += "mc-utils ls2-phy rcw-bin management-complex ppa uefi"
 USE_VT = "0"
-- 
1.9.0



^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH v2 10/13] ls1012ardb: rcw-bin instead of rcw
  2018-01-30  9:09 [PATCH v2 01/13] rcw-bin: add recipes Chunrong Guo
                   ` (7 preceding siblings ...)
  2018-01-30  9:09 ` [PATCH v2 09/13] ls2088ardb: " Chunrong Guo
@ 2018-01-30  9:10 ` Chunrong Guo
  2018-01-30  9:10 ` [PATCH v2 11/13] dpdk: update recipe Chunrong Guo
                   ` (2 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: Chunrong Guo @ 2018-01-30  9:10 UTC (permalink / raw)
  To: meta-freescale; +Cc: chunrong.guo

From: Chunrong Guo <chunrong.guo@nxp.com>

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
---
 conf/machine/ls1012ardb.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/machine/ls1012ardb.conf b/conf/machine/ls1012ardb.conf
index 37132d3..22dc1b5 100644
--- a/conf/machine/ls1012ardb.conf
+++ b/conf/machine/ls1012ardb.conf
@@ -23,5 +23,5 @@ UBOOT_CONFIG[qspi-secure-boot] = "ls1012ardb_qspi_SECURE_BOOT_defconfig,,u-boot-
 KERNEL_DEVICETREE ?= "freescale/fsl-ls1012a-rdb.dtb"
 KERNEL_DEFCONFIG ?= "defconfig"
 
-EXTRA_IMAGEDEPENDS += "ppa ppfe-firmware rcw"
+EXTRA_IMAGEDEPENDS += "ppa ppfe-firmware rcw-bin"
 USE_VT = "0"
-- 
1.9.0



^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH v2 11/13] dpdk: update recipe
  2018-01-30  9:09 [PATCH v2 01/13] rcw-bin: add recipes Chunrong Guo
                   ` (8 preceding siblings ...)
  2018-01-30  9:10 ` [PATCH v2 10/13] ls1012ardb: " Chunrong Guo
@ 2018-01-30  9:10 ` Chunrong Guo
  2018-01-30  9:10 ` [PATCH v2 12/13] dpdk-extras: remove Chunrong Guo
  2018-01-30  9:10 ` [PATCH v2 13/13] ppa: Recipe Reogranization Chunrong Guo
  11 siblings, 0 replies; 13+ messages in thread
From: Chunrong Guo @ 2018-01-30  9:10 UTC (permalink / raw)
  To: meta-freescale; +Cc: chunrong.guo

From: Chunrong Guo <chunrong.guo@nxp.com>

update to 076aa8e
*include the following changes:
076aa8e - bus/fslmc: change the eqcr stashing threshold to 1
adc0955 - net/dpaa: Change default tail drop size to 256.
a3921f8 - net/dpaa2 : Revert "enable fetching hash result from hardware"
e901680 - net/dpaa2:Setting correct frame size in dev_mtu_set
d61cd8f - net/dpaa:Setting correct frame size in dev_mtu_set
8bff395 - Merge branch '17.05-next-qoriq' into 17.05-qoriq
14f2b6f - Merge remote-tracking branch 'stable/17.05' into hotfix/DPDK-1036_stable_17.05-to_qoriq
5afa218 - Merge pull request #482 in GITAM/dpdk from DPDK-178-BE to 17.05-next-qoriq
0192452 - net/dpaa: add frame count based tail drop with CGR
d5026f6 - net/dpaa2: removing double env variable for Tail drop setting
7468d34 - net/ixgbe: fix compilation on ARM BE
c493e1f - net/i40e: fix compilation on ARM BE
f502ece - bus/dpaa: fix compilation on ARM BE
bfa94d6 - lpm: fix compilation on ARM BE
815ea7d - pmdinfogen: fix cross compilation for ARM BE
14c81be - Merge pull request #478 in GITAM/dpdk from DPDK-806-phyaddr to 17.05-next-qoriq
b31eb4d - Merge pull request #472 in GITAM/dpdk from DPDK-1010-misc to 17.05-next-qoriq
11c1c9e - bus/dpaa: fix missing symbol for shared build
07e60bd - net/dpaa2: set queues if reconfiguration is done
1918d8c - test/test: improve dequeue logic for crypto operation
b0c1ecb - net/dpaa2: support to configure taildrop size
223fe63 - net/dpaa2: support rx query count api
3333924 - net/dpaa2: enable parse error packet to driver by default
4eec0f0 - net/dpaa: optimize phy to virt for push mode queue
8b3e1c9 - net/dpaa: removing the data prefetch from driver
7505585 - net/dpaa: increase the tail drop length
23505e0 - net/dpaa: optional support for push mode queues
cad1ddb - crypto/dpaa: optimizing the virt to phy conversion
4c84009 - net/dpaa: optimize the phy to virt conversion
d44f70f - mempool: indicate if mempool elements are allocated from muliple memzones
77e5fd8 - errata: dpaa - change the block size flag name in alignment with upstream
305c71a - errata: mbuf - dpaa errata to use family mask
cd6f661 - bus/dpaa: adding fq as a parameter for portal get
2daf985 - Merge pull request #474 in GITAM/dpdk from bugfix/DPDK-845-correction to 17.05-next-qoriq
3a2ea0d - examples/ipsec-secgw: add protocol offload cfg files for 64x64 tunne

*install nxp config files

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
---
 recipes-extended/dpdk/dpdk_16.07.bb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/recipes-extended/dpdk/dpdk_16.07.bb b/recipes-extended/dpdk/dpdk_16.07.bb
index c825c3b..9805af3 100644
--- a/recipes-extended/dpdk/dpdk_16.07.bb
+++ b/recipes-extended/dpdk/dpdk_16.07.bb
@@ -13,7 +13,7 @@ SRC_URI = "git://github.com/qoriq-open-source/dpdk.git;nobranch=1 \
     file://add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch \
     file://0001-include-sys-sysmacros.h-for-major-minor-defintions.patch \
 "
-SRCREV = "3d7a6ae1745a2f60f76afd3ad3ca57329388168c"
+SRCREV = "076aa8e2f9a4ad7e0a020f5c574371d92afe4a60"
 
 S = "${WORKDIR}/git"
 
@@ -52,7 +52,8 @@ do_install() {
     rm -fr ${D}/lib/modules/*
     install -d ${D}/lib/modules/${KERNEL_VERSION}/dpdk
     install -m 0755 ${S}/${RTE_TARGET}/kmod/rte_kni.ko ${D}/lib/modules/${KERNEL_VERSION}/dpdk/
-
+    install -d ${D}/${bindir}/dpdk-example/extras
+    cp -rf  ${S}/nxp/* ${D}/${bindir}/dpdk-example/extras/
     rm ${D}/${datadir}/${RTE_TARGET}/app/dpdk-pmdinfogen
 
     chown root:root -R ${D}
-- 
1.9.0



^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH v2 12/13] dpdk-extras: remove
  2018-01-30  9:09 [PATCH v2 01/13] rcw-bin: add recipes Chunrong Guo
                   ` (9 preceding siblings ...)
  2018-01-30  9:10 ` [PATCH v2 11/13] dpdk: update recipe Chunrong Guo
@ 2018-01-30  9:10 ` Chunrong Guo
  2018-01-30  9:10 ` [PATCH v2 13/13] ppa: Recipe Reogranization Chunrong Guo
  11 siblings, 0 replies; 13+ messages in thread
From: Chunrong Guo @ 2018-01-30  9:10 UTC (permalink / raw)
  To: meta-freescale; +Cc: chunrong.guo

From: Chunrong Guo <chunrong.guo@nxp.com>

*dpdk includes dpdk-extras

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
---
 recipes-extended/dpdk/dpdk-extras_git.bb | 27 ---------------------------
 1 file changed, 27 deletions(-)
 delete mode 100644 recipes-extended/dpdk/dpdk-extras_git.bb

diff --git a/recipes-extended/dpdk/dpdk-extras_git.bb b/recipes-extended/dpdk/dpdk-extras_git.bb
deleted file mode 100644
index 15aec95..0000000
--- a/recipes-extended/dpdk/dpdk-extras_git.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION = "Data Plane Development Kit Extended utilities"
-HOMEPAGE = "http://dpdk.org"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=4ac6ab4e4bcf4c79cb9257f3c61934f6"
-
-RDEPENDS_${PN} = "dpdk"
-
-SRC_URI = "git://github.com/qoriq-open-source/dpdk-extras.git;nobranch=1"
-SRCREV = "d17f3e065474a41e314ff73b9035e5b3dc021a28"
-
-S = "${WORKDIR}/git"
-
-DPAA_VER ?= "dpaa2"
-DPAA_VER_fsl-lsch2 = "dpaa"
-
-do_install() {
-    install -d ${D}/${bindir}/dpdk-example/extras
-
-    for file_suffix in xml sh; do
-        if [ "`ls ${S}/${DPAA_VER}/*.${file_suffix}`" != "" ]; then
-            install -m 755 ${S}/${DPAA_VER}/*.${file_suffix} ${D}/${bindir}/dpdk-example/extras
-        fi
-    done
-}
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "(ls2080ardb|ls2084ardb|ls2088a|ls1043a|ls1046a|ls1088a)"
-- 
1.9.0



^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH v2 13/13] ppa: Recipe Reogranization
  2018-01-30  9:09 [PATCH v2 01/13] rcw-bin: add recipes Chunrong Guo
                   ` (10 preceding siblings ...)
  2018-01-30  9:10 ` [PATCH v2 12/13] dpdk-extras: remove Chunrong Guo
@ 2018-01-30  9:10 ` Chunrong Guo
  11 siblings, 0 replies; 13+ messages in thread
From: Chunrong Guo @ 2018-01-30  9:10 UTC (permalink / raw)
  To: meta-freescale; +Cc: chunrong.guo

From: Chunrong Guo <chunrong.guo@nxp.com>

*ppa build support OPTEE-OS parameter.

*Building PPA source with OPTEE-OS

*add ppa-optee recipes

*update to e564143
e564143 - Adding 'execute' bit to gen_spd_its file mode
a0e0479 - QPPA-34 Fix to resolve the 4.4 Kernel 32bit bootup issue.
3107360 - Initializing TZASC after EL3 cache maint ops; Setting OCRAM to secure access only when EL3 stacks are in OCRAM.
db509c5 - Initializing smc global data region;Making data-in-ocram the default.
48ccba3 - Cleaning up code fix for QLINUX-8590.
c1e2177 - Bringing TZASC Enablement under CONFIG_SPD compile time flag.
fac778a - Enable LPM20 on LS2088A
5be38ad - Fix for ls1026ardb/ls1023ardb board boot up issue on dash-lts 4.9 kernel. JIRA Ticket QLINUX-8590
eb40915 - Adding support for LS1012 Freedom board.
833f749 - Fix for launching 32-bit kernel when OpTee is loaded.
75e9909 - Added TZC-380 & TZC-400 drivers for LS1043 and LS1046.
f2eecde - Add proper checking for Trusted-OS vector-table.
24ecac4 - Enable PSCI-CPU-ON notification for trusted-OS.
a9a6f4d - Fix in SPD for Coverity issues in TX1.0 release.
b2979b5 - Disabling and re-enabling SEC on entry/exit to LPM20 on LS1088.
b31c991 - Fix defect inserted into _zeroize_bss() during last commit.
3f83fd1 - Changed name of ddr/spd.c to spd_ddr.c to prevent filename collision with spd/spd.c.
59acbe2 - Fixing LSCH macro usage in timer.c.
030a2d7 - Adding SD/eMMC driver.
46016e6 - Added functions _getGICC_BaseAddr() and _getGICD_BaseAddr() to ls1012.
1f804e6 - Fixed handling of ls1043/ls1046 gic base address.
7e8df4f - Supplying the start address to _relocate_rela() and _zeroize_bss() functions.
dc36a4e - Resequencing the startup code for ddr and non-ddr builds. Fixed handling of input parameters to _ppa_main().
52f6c8b - Cleanup monitor code.
bdd2e61 - Adding temporary stack to bootcore before ppa_main() is called.

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
---
 recipes-bsp/ppa/ppa-optee_git.bb              | 18 ++++++
 recipes-bsp/ppa/ppa.inc                       | 54 ++++++++++++++++++
 recipes-bsp/ppa/ppa/0001-fix-path-error.patch | 79 ---------------------------
 recipes-bsp/ppa/ppa_git.bb                    | 76 +++++---------------------
 4 files changed, 86 insertions(+), 141 deletions(-)
 create mode 100644 recipes-bsp/ppa/ppa-optee_git.bb
 create mode 100644 recipes-bsp/ppa/ppa.inc
 delete mode 100644 recipes-bsp/ppa/ppa/0001-fix-path-error.patch

diff --git a/recipes-bsp/ppa/ppa-optee_git.bb b/recipes-bsp/ppa/ppa-optee_git.bb
new file mode 100644
index 0000000..844de40
--- /dev/null
+++ b/recipes-bsp/ppa/ppa-optee_git.bb
@@ -0,0 +1,18 @@
+require ppa.inc
+
+DEPENDS += "optee-os"
+
+PPA_PATH_ls1046a = "ls1046"
+PPA_PATH_ls1043a = "ls2088"
+
+do_compile() {
+    export ARMV8_TOOLS_DIR="${STAGING_BINDIR_TOOLCHAIN}"
+    export ARMV8_TOOLS_PREFIX="${TARGET_PREFIX}"
+    export CROSS_COMPILE="${WRAP_TARGET_PREFIX}"
+    cp ${RECIPE_SYSROOT}/lib/firmware/tee_${MACHINE}.bin ${S}/ppa/soc-${PPA_PATH}/tee.bin
+    cd ${S}/ppa
+    ./build rdb-fit spd=on ${PPA_PATH}
+    cd ${S}
+}
+
+COMPATIBLE_MACHINE = "(ls1043a|ls1046a)"
diff --git a/recipes-bsp/ppa/ppa.inc b/recipes-bsp/ppa/ppa.inc
new file mode 100644
index 0000000..5258c68
--- /dev/null
+++ b/recipes-bsp/ppa/ppa.inc
@@ -0,0 +1,54 @@
+SUMMARY = "Primary Protected Application"
+LICENSE = "Freescale-EULA"
+LIC_FILES_CHKSUM = "file://license.txt;md5=2ecf925c01a48f61c88f78c30fe2ee3b"
+
+DEPENDS += "u-boot-mkimage-native dtc-native"
+
+inherit deploy
+
+SRC_URI = "git://github.com/qoriq-open-source/ppa-generic.git;nobranch=1 \
+"
+SRCREV = "e5641434f00d75634a285341d810df4261daf5de"
+
+S = "${WORKDIR}/git"
+
+python () {
+    ml = d.getVar("MULTILIB_VARIANTS", True)
+    arch = d.getVar("OVERRIDES", True)
+    if "fsl-lsch2-32b:" in arch:
+        if not "lib64" in ml:
+            raise bb.parse.SkipPackage("Building the u-boot for this arch requires multilib to be enabled")
+        sys_multilib = d.getVar('TARGET_VENDOR') + 'mllib64-linux'
+        sys_original = d.getVar('TARGET_VENDOR') + '-' + d.getVar('TARGET_OS')
+        workdir = d.getVar('WORKDIR').replace(sys_original,sys_multilib)
+        d.setVar('DEPENDS_append', ' lib64-gcc-cross-aarch64 lib64-libgcc')
+        d.setVar('PATH_append', ':' + d.getVar('STAGING_BINDIR_NATIVE') + '/aarch64' + sys_multilib)
+        d.setVar('TOOLCHAIN_OPTIONS', '--sysroot=' + workdir + '/lib64-recipe-sysroot')
+        d.setVar("WRAP_TARGET_PREFIX", 'aarch64' + sys_multilib + '-')
+}
+
+WRAP_TARGET_PREFIX ?= "${TARGET_PREFIX}"
+EXTRA_OEMAKE = 'CC64="${WRAP_TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}" LD64="${WRAP_TARGET_PREFIX}ld ${TOOLCHAIN_OPTIONS}"  OBJ64="${WRAP_TARGET_PREFIX}objcopy"'
+
+PPA_NAME = "${PN}-${MACHINE}-${DATETIME}"
+PPA_NAME[vardepsexclude] = "DATETIME"
+
+do_install() {
+    install -d ${D}/boot/
+    install ${S}/ppa/soc-${PPA_PATH}/build/obj/ppa.itb ${D}/boot/${PPA_NAME}.itb
+    ln -sfT ${PPA_NAME}.itb ${D}/boot/${PN}.itb
+}
+
+do_deploy(){
+    install -d ${DEPLOYDIR}
+    install ${S}/ppa/soc-${PPA_PATH}/build/obj/ppa.itb ${DEPLOYDIR}/${PPA_NAME}.itb
+    ln -sfT ${PPA_NAME}.itb ${DEPLOYDIR}/${PN}.itb
+}
+addtask deploy before do_build after do_install
+
+PACKAGES += "${PN}-image"
+FILES_${PN}-image += "/boot"   
+
+CLEANBROKEN = "1"
+PARALLEL_MAKE = ""
+PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/recipes-bsp/ppa/ppa/0001-fix-path-error.patch b/recipes-bsp/ppa/ppa/0001-fix-path-error.patch
deleted file mode 100644
index 891a6e7..0000000
--- a/recipes-bsp/ppa/ppa/0001-fix-path-error.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From aa3b419876af9c2a9265fba7c7264130e1bc4926 Mon Sep 17 00:00:00 2001
-From: Chunrong Guo <chunrong.guo@nxp.com>
-Date: Wed, 27 Sep 2017 10:45:04 +0800
-Subject: [PATCH] fix path error
-
-fix the below error:
-|Makefile:58: ../armv8/gic.mk: No such file or directory
-
-Upstream-Status: Submitted
-
-Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
----
- ppa/soc-ls1046/Makefile | 4 ++--
- ppa/soc-ls1088/Makefile | 4 ++--
- ppa/soc-ls2088/Makefile | 5 +++--
- 3 files changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/ppa/soc-ls1046/Makefile b/ppa/soc-ls1046/Makefile
-index 34ffe2d..6a06514 100644
---- a/ppa/soc-ls1046/Makefile
-+++ b/ppa/soc-ls1046/Makefile
-@@ -55,12 +55,12 @@ include $(PRE_PATH)soc.def
- # -----------------------------------------------------------------------------
- 
-  # include the gic architecture file
--include ../armv8/gic.mk
-+include $(PRE_PATH)../armv8/gic.mk
- 
- # -----------------------------------------------------------------------------
- 
-  # include the interconnect architecture file
--include ../armv8/inter.mk
-+include $(PRE_PATH)../armv8/inter.mk
- 
- # -----------------------------------------------------------------------------
- 
-diff --git a/ppa/soc-ls1088/Makefile b/ppa/soc-ls1088/Makefile
-index 7fc5db9..6472408 100644
---- a/ppa/soc-ls1088/Makefile
-+++ b/ppa/soc-ls1088/Makefile
-@@ -55,12 +55,12 @@ include $(PRE_PATH)soc.def
- # -----------------------------------------------------------------------------
- 
-  # include the gic architecture file
--include ../armv8/gic.mk
-+include $(PRE_PATH)../armv8/gic.mk
- 
- # -----------------------------------------------------------------------------
- 
-  # include the interconnect architecture file
--include ../armv8/inter.mk
-+include $(PRE_PATH)../armv8/inter.mk
- 
- # -----------------------------------------------------------------------------
- 
-diff --git a/ppa/soc-ls2088/Makefile b/ppa/soc-ls2088/Makefile
-index de3a06c..2fe23e2 100644
---- a/ppa/soc-ls2088/Makefile
-+++ b/ppa/soc-ls2088/Makefile
-@@ -54,13 +54,14 @@ include $(PRE_PATH)soc.def
- 
- # -----------------------------------------------------------------------------
- 
-+include $(PRE_PATH)../armv8/gic.mk
-  # include the gic architecture file
--include ../armv8/gic.mk
-+include $(PRE_PATH)../armv8/gic.mk
- 
- # -----------------------------------------------------------------------------
- 
-  # include the interconnect architecture file
--include ../armv8/inter.mk
-+include $(PRE_PATH)../armv8/inter.mk
- 
- # -----------------------------------------------------------------------------
- 
--- 
-2.7.4
-
diff --git a/recipes-bsp/ppa/ppa_git.bb b/recipes-bsp/ppa/ppa_git.bb
index c4f81bc..b1cbde4 100644
--- a/recipes-bsp/ppa/ppa_git.bb
+++ b/recipes-bsp/ppa/ppa_git.bb
@@ -1,70 +1,22 @@
-SUMMARY = "Primary Protected Application"
-LICENSE = "Freescale-EULA"
-LIC_FILES_CHKSUM = "file://license.txt;md5=2ecf925c01a48f61c88f78c30fe2ee3b"
+require ppa.inc
 
-DEPENDS += "u-boot-mkimage-native dtc-native"
+PPA_PATH_ls1012a = "ls1012"
+PPA_PATH_ls1043a = "ls1043"
+PPA_PATH_ls1046a = "ls1046"
+PPA_PATH_ls2088a = "ls2088"
+PPA_PATH_ls1088a = "ls1088"
 
-inherit deploy
-
-SRC_URI = "git://github.com/qoriq-open-source/ppa-generic.git;nobranch=1 \
-    file://0001-fix-path-error.patch \
-"
-SRCREV = "92b208b0dbb5a47b06627ec62824cb5790b3f482"
-
-S = "${WORKDIR}/git"
-
-python () {
-    ml = d.getVar("MULTILIB_VARIANTS", True)
-    arch = d.getVar("OVERRIDES", True)
-    if "fsl-lsch2-32b:" in arch:
-        if not "lib64" in ml:
-            raise bb.parse.SkipPackage("Building the u-boot for this arch requires multilib to be enabled")
-        sys_multilib = d.getVar('TARGET_VENDOR') + 'mllib64-linux'
-        sys_original = d.getVar('TARGET_VENDOR') + '-' + d.getVar('TARGET_OS')
-        workdir = d.getVar('WORKDIR').replace(sys_original,sys_multilib)
-        d.setVar('DEPENDS_append', ' lib64-gcc-cross-aarch64 lib64-libgcc')
-        d.setVar('PATH_append', ':' + d.getVar('STAGING_BINDIR_NATIVE') + '/aarch64' + sys_multilib)
-        d.setVar('TOOLCHAIN_OPTIONS', '--sysroot=' + workdir + '/lib64-recipe-sysroot')
-        d.setVar("WRAP_TARGET_PREFIX", 'aarch64' + sys_multilib + '-')
-}
-
-WRAP_TARGET_PREFIX ?= "${TARGET_PREFIX}"
-EXTRA_OEMAKE = 'CC64="${WRAP_TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}" LD64="${WRAP_TARGET_PREFIX}ld ${TOOLCHAIN_OPTIONS}"  OBJ64="${WRAP_TARGET_PREFIX}objcopy"'
-
-PPA_PATH ?= "ppa/soc-ls1043/platform-rdb"
-PPA_PATH_ls1046a = "ppa/soc-ls1046/platform-rdb"
-PPA_PATH_ls2088a = "ppa/soc-ls2088/platform-rdb"
-PPA_PATH_ls1088a = "ppa/soc-ls1088/platform-rdb"
-PPA_PATH_ls1012a = "ppa/soc-ls1012/platform-rdb"
-PPA_NAME ?= "ppa-${MACHINE}-${DATETIME}"
-PPA_NAME[vardepsexclude] = "DATETIME"
-
-do_compile() {
+do_compile () {
     export ARMV8_TOOLS_DIR="${STAGING_BINDIR_TOOLCHAIN}"
     export ARMV8_TOOLS_PREFIX="${TARGET_PREFIX}"
     export CROSS_COMPILE="${WRAP_TARGET_PREFIX}"
-    cd ${S}/${PPA_PATH}
-    oe_runmake rdb-fit
+    cd ${S}/ppa
+    if [ ${MACHINE} = ls1012afrdm ];then
+        ./build  frdm-fit ${PPA_PATH}
+    else
+        ./build  rdb-fit ${PPA_PATH}
+    fi
     cd ${S}
 }
 
-do_install() {
-    install -d ${D}/boot/
-    install ${S}/${PPA_PATH}/build/obj/ppa.itb ${D}/boot/${PPA_NAME}.itb
-    ln -sfT ${PPA_NAME}.itb ${D}/boot/ppa.itb
-}
-
-do_deploy(){
-    install -d ${DEPLOYDIR}
-    install ${S}/${PPA_PATH}/build/obj/ppa.itb ${DEPLOYDIR}/${PPA_NAME}.itb
-    ln -sfT ${PPA_NAME}.itb ${DEPLOYDIR}/ppa.itb
-}
-addtask deploy before do_build after do_install
-
-PACKAGES += "${PN}-image"
-FILES_${PN}-image += "/boot"   
-
-CLEANBROKEN = "1"
-PARALLEL_MAKE = ""
-COMPATIBLE_MACHINE = "(ls1043a|ls1046a|ls2088a|ls1012a|ls1088a)"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
+COMPATIBLE_MACHINE = "(ls1043a|ls1046a|ls2088a|ls1012afrdm|ls1088a)"
-- 
1.9.0



^ permalink raw reply related	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2018-01-30  9:10 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-01-30  9:09 [PATCH v2 01/13] rcw-bin: add recipes Chunrong Guo
2018-01-30  9:09 ` [PATCH v2 02/13] optee-os: " Chunrong Guo
2018-01-30  9:09 ` [PATCH v2 03/13] optee-client: " Chunrong Guo
2018-01-30  9:09 ` [PATCH v2 04/13] optee-test: " Chunrong Guo
2018-01-30  9:09 ` [PATCH v2 05/13] mc-utils: " Chunrong Guo
2018-01-30  9:09 ` [PATCH v2 06/13] ls1088ardb: mc-utils instead of dpl-examples Chunrong Guo
2018-01-30  9:09 ` [PATCH v2 07/13] ls2088ardb: " Chunrong Guo
2018-01-30  9:09 ` [PATCH v2 08/13] ls1088ardb: rcw-bin instead of rcw Chunrong Guo
2018-01-30  9:09 ` [PATCH v2 09/13] ls2088ardb: " Chunrong Guo
2018-01-30  9:10 ` [PATCH v2 10/13] ls1012ardb: " Chunrong Guo
2018-01-30  9:10 ` [PATCH v2 11/13] dpdk: update recipe Chunrong Guo
2018-01-30  9:10 ` [PATCH v2 12/13] dpdk-extras: remove Chunrong Guo
2018-01-30  9:10 ` [PATCH v2 13/13] ppa: Recipe Reogranization Chunrong Guo

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.