From patchwork Fri Mar 1 16:47:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Etienne Carriere X-Patchwork-Id: 1050300 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="QwqmwI7W"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 449wMB0js4z9s7h for ; Sat, 2 Mar 2019 03:47:31 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 1E5CD2D8AB; Fri, 1 Mar 2019 16:47:27 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id auKhBaW5bYoX; Fri, 1 Mar 2019 16:47:24 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id EB5EE26FB8; Fri, 1 Mar 2019 16:47:23 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 9E1441BF2B6 for ; Fri, 1 Mar 2019 16:47:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 9B36C86371 for ; Fri, 1 Mar 2019 16:47:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zkjg8HWClBQ3 for ; Fri, 1 Mar 2019 16:47:20 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 033EC86366 for ; Fri, 1 Mar 2019 16:47:19 +0000 (UTC) Received: by mail-wr1-f53.google.com with SMTP id l5so26595591wrw.6 for ; Fri, 01 Mar 2019 08:47:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=ZcIAaRpNBWrn/EyFZSHUDy/EyB/pPT1nwnEEvqG1WZU=; b=QwqmwI7WOiRE3lWi2AJY0DjhWLl094gtvS4AdrIPUMnbfIG5QRkuvCGV7lGEAtrxJr nQm2XVQfTB3WLB4oK0D6l6LlDsQ2mWjDyOfI+ATmgPWp3iQHdM82AbF0d8AvG3touv3f XO1w4UXMNaPgxNhOexQ+Jy8+0R8JO8mmh6fiRI4sRMfCahV+6WKYqpnste4ITuzbAjVi DkMX90kJ5gRmFDEGYabO5wCs9IdRYcsakp7iHPXI5/36c2lQ7x9E9PU9ZkAGxNQVvTYs FNUMdFcy8pBhKHN8O12la2lNX8/2j3F1r11leOmPrAC1gqC8JJwwWupFSZgnpyJLnP3w uDUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=ZcIAaRpNBWrn/EyFZSHUDy/EyB/pPT1nwnEEvqG1WZU=; b=MISoRMM/jEiwT7j+z0T6kibkNJwoM2p0fhQMx76QZM9jLCZyY+o0RZ0vi/kK/TefZw LWU6LLdUn5JLnx3FeZ4yWz7lQnq2AITTV90Zf/QDzpTXx65XPRy8pVhUCU63+6TCW8tE 462XahA9/eKpaCi/6hcfKVlbYMgYeRmEb57rEQpbuj/XR/FDGPYPh0GE/qDwmBdmpk8J Aj4cCvbyUZePx0Ybiv3KFFuFLHiLqng2oCO5p69i59GJfkkgVS1r2Fms/bQyZXOdjMcC BtCKlCfgW0w0BEeMit/ZU3/z6r9/r4M0bO05DIVrb7n6lP4/AY4A480fz8p0JuryaeM1 8Rgg== X-Gm-Message-State: APjAAAU0AwF0rf7pEnZyLXuN5gAotzxj76tQTE8t6IUXz8cWmDqqFheA hO23z1hv510gep+RsEPSm/M5BIMw4pw= X-Google-Smtp-Source: APXvYqzfAx8kWNYetAcVp8zWRktMcaj+WmOtfmXTup30HvvLcMpmWtpHY2d4FZUVLKKtimUTbIiNEg== X-Received: by 2002:adf:e90b:: with SMTP id f11mr668998wrm.36.1551458838122; Fri, 01 Mar 2019 08:47:18 -0800 (PST) Received: from lmenx29q.lme.st.com. ([80.215.103.67]) by smtp.gmail.com with ESMTPSA id l18sm20826744wrv.20.2019.03.01.08.47.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 01 Mar 2019 08:47:17 -0800 (PST) From: Etienne Carriere To: buildroot@buildroot.org Date: Fri, 1 Mar 2019 17:47:05 +0100 Message-Id: X-Mailer: git-send-email 1.9.1 Subject: [Buildroot] [PATCH/next 1/9] boot/optee-os: package sets TA SDK location X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Etienne Carriere MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Makefile script for boot package optee-os produces make variable OPTEE_OS_STAGING_SDK to locate the Trusted Application SDK expected by other packages when building OP-TEE trusted applications. Signed-off-by: Etienne Carriere --- boot/optee-os/optee-os.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk index aeac067..df481c9 100644 --- a/boot/optee-os/optee-os.mk +++ b/boot/optee-os/optee-os.mk @@ -55,9 +55,11 @@ OPTEE_OS_MAKE_OPTS += $(call qstrip,$(BR2_TARGET_OPTEE_OS_ADDITIONAL_VARIABLES)) OPTEE_OS_BUILDDIR_OUT = out ifeq ($(BR2_aarch64),y) OPTEE_OS_LOCAL_SDK = $(OPTEE_OS_BUILDDIR_OUT)/export-ta_arm64 +OPTEE_OS_STAGING_SDK = $(STAGING_DIR)/lib/optee/export-ta_arm64 endif ifeq ($(BR2_arm),y) OPTEE_OS_LOCAL_SDK = $(OPTEE_OS_BUILDDIR_OUT)/export-ta_arm32 +OPTEE_OS_STAGING_SDK = $(STAGING_DIR)/lib/optee/export-ta_arm32 endif ifeq ($(BR2_TARGET_OPTEE_OS_CORE),y) @@ -86,8 +88,8 @@ define OPTEE_OS_BUILD_SDK $(TARGET_CONFIGURE_OPTS) $(OPTEE_OS_MAKE_OPTS) ta_dev_kit endef define OPTEE_OS_INSTALL_STAGING_CMDS - mkdir -p $(STAGING_DIR)/lib/optee - cp -ardpf $(@D)/$(OPTEE_OS_LOCAL_SDK) $(STAGING_DIR)/lib/optee + mkdir -p $(OPTEE_OS_STAGING_SDK) + cp -ardpf $(@D)/$(OPTEE_OS_LOCAL_SDK)/* $(OPTEE_OS_STAGING_SDK) endef endif # BR2_TARGET_OPTEE_OS_SDK From patchwork Fri Mar 1 16:47:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Etienne Carriere X-Patchwork-Id: 1050303 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="AQxznsuv"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 449wMB3Qbrz9sN1 for ; Sat, 2 Mar 2019 03:47:32 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id C1AF286FFF; Fri, 1 Mar 2019 16:47:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id TVETyoWOnz0y; Fri, 1 Mar 2019 16:47:25 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id E1C4386FC1; Fri, 1 Mar 2019 16:47:24 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 1A30A1BF2B6 for ; Fri, 1 Mar 2019 16:47:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 17BDB86366 for ; Fri, 1 Mar 2019 16:47:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9a-DwwLHKPC6 for ; Fri, 1 Mar 2019 16:47:22 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 95FF28636D for ; Fri, 1 Mar 2019 16:47:20 +0000 (UTC) Received: by mail-wr1-f46.google.com with SMTP id w6so23346227wrs.4 for ; Fri, 01 Mar 2019 08:47:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=mj5to3ZHMGUxGT5BqGT/ErbfC3PM19o/hncLeJ1hcdc=; b=AQxznsuvV4GeXn99Ms1xe8tv6xlXKJS6insMWopqGQMrvHy95UwesBxII5g8xpxitP ZMRKcPGBd7AEe6KtHx4bTzaFAVrPKCa5+jSC01Yyli36xO/6CL3utP9m00og0Hn5hC5N bs1za/FxMy7JY+yuDsTYxuUs3NZv4nRASfEoukYvCPiEgVqkAAiy9gL7dLOFkBXB2Jf1 9kXEcvszIc8UJclCRDX1NEFvzB4NQT7jvA9n6im5K18PA8dQqz0ZW4iJSyGn+/sL1Kau e2HpvCyRWbaL9PysbKM1pGsu5dfKz+DIGxeefjnRLcuolzuff1mo98JOwhC9iOXVAaVb /QxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=mj5to3ZHMGUxGT5BqGT/ErbfC3PM19o/hncLeJ1hcdc=; b=invhB3Q7QYZN0XY5v+snvFPd1zlGWjHBVXg01ZEdkbyk8twObG/oiqk5AfgZcLlkbC pEtIp2lCiGhC5k7cbcxRK2hRrwt47F2ThsV5MXy9R0rXSr4s8kgK8Al599LxcaqKF3en mExZvKQ0jHD8rxar7GZXzgDtSQu4uYwravv5Q4QPn/68kvNWlu7gwVr5c8P+ua2rHAcO FCHIZ7EOyApd6zIcaPo3LWfspdURtKva+d5NQ7pJcQ5P4OyAm++uq4t7RTsHLl5fDYiD PxtjzK525nbxykxWWBFygCaioNIiVtTqQ9nTOqxKm4UHSX/mTImFXAwBxUaWTbjNeQL1 gUww== X-Gm-Message-State: APjAAAX32eBaExYVdWb5vzaFWgLY41OOfRosEAs/k0b65AZxgmgItMxp 1+rwoCaYDJWHpPui9hydOhEjT9clIUY= X-Google-Smtp-Source: APXvYqw+fEA8SN+j3pBI3zwfEJ0gMt3GdLH58XC0b5T5wO471mbyMDod7em7YgdVdmk5LL/dS8q1Aw== X-Received: by 2002:a5d:4e44:: with SMTP id r4mr3883907wrt.228.1551458838925; Fri, 01 Mar 2019 08:47:18 -0800 (PST) Received: from lmenx29q.lme.st.com. ([80.215.103.67]) by smtp.gmail.com with ESMTPSA id l18sm20826744wrv.20.2019.03.01.08.47.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 01 Mar 2019 08:47:18 -0800 (PST) From: Etienne Carriere To: buildroot@buildroot.org Date: Fri, 1 Mar 2019 17:47:06 +0100 Message-Id: <283c62a3d5784f1b5635aa18a19a0e34940e692e.1551458062.git.etienne.carriere@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: References: In-Reply-To: References: Subject: [Buildroot] [PATCH/next 2/9] package/optee-test: locate TA SDK though optee-os package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Etienne Carriere MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Package optee-os was recently changed to produce variable OPTEE_OS_STAGING_SDK to other packages to locate the OP-TEE Trusted Application SDK generated from optee-os package and installed in the Buildroot output staging directory. Signed-off-by: Etienne Carriere --- package/optee-test/optee-test.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/package/optee-test/optee-test.mk b/package/optee-test/optee-test.mk index 1ab6bf4..687347d 100644 --- a/package/optee-test/optee-test.mk +++ b/package/optee-test/optee-test.mk @@ -11,12 +11,7 @@ OPTEE_TEST_LICENSE_FILES = LICENSE.md OPTEE_TEST_DEPENDENCIES = optee-client optee-os -ifeq ($(BR2_aarch64),y) -OPTEE_TEST_SDK = $(STAGING_DIR)/lib/optee/export-ta_arm64 -else ifeq ($(BR2_arm),y) -OPTEE_TEST_SDK = $(STAGING_DIR)/lib/optee/export-ta_arm32 -endif -OPTEE_TEST_CONF_OPTS = -DOPTEE_TEST_SDK=$(OPTEE_TEST_SDK) +OPTEE_TEST_CONF_OPTS = -DOPTEE_TEST_SDK=$(OPTEE_OS_STAGING_SDK) # Trusted Application are not built from CMake due to ta_dev_kit # dependencies. We must build and install them on target. @@ -24,7 +19,7 @@ define OPTEE_TEST_BUILD_TAS $(foreach f,$(wildcard $(@D)/ta/*/Makefile), \ $(TARGET_CONFIGURE_OPTS) \ $(MAKE) CROSS_COMPILE=$(TARGET_CROSS) \ - TA_DEV_KIT_DIR=$(OPTEE_TEST_SDK) \ + TA_DEV_KIT_DIR=$(OPTEE_OS_STAGING_SDK) \ -C $(dir $f) all ) endef From patchwork Fri Mar 1 16:47:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Etienne Carriere X-Patchwork-Id: 1050306 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="J/Vgl29n"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 449wML21nWz9s7h for ; Sat, 2 Mar 2019 03:47:41 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 48D2F87E76; Fri, 1 Mar 2019 16:47:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id XFN-8kn6rsyb; Fri, 1 Mar 2019 16:47:30 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 4033387E7D; Fri, 1 Mar 2019 16:47:30 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 3E21A1BF2B6 for ; Fri, 1 Mar 2019 16:47:29 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 3BC3A87E7D for ; Fri, 1 Mar 2019 16:47:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YfGjR8aJht3v for ; Fri, 1 Mar 2019 16:47:22 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by hemlock.osuosl.org (Postfix) with ESMTPS id DDDB787E76 for ; Fri, 1 Mar 2019 16:47:21 +0000 (UTC) Received: by mail-wr1-f52.google.com with SMTP id l5so26595694wrw.6 for ; Fri, 01 Mar 2019 08:47:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=mCgf3O5V7/mGcoE4LbwP855W6gwfducyAYhklhc3owg=; b=J/Vgl29nU5+pbYsRJPbn5m3B5eCWxj1zI+32U+UvNXW2OWI+kQowlcngTA0R5uUUkS AcCgCe9ybVbvb6T66N+VkvlcBf/hIB+wQtqagLNE2ewidiEwVQ/uVxM2HtzWmJqqnEJW FqLMJ6hKimLpBeDTTzecwDA/8tGFOQ2r1iutBLXiQ7NI/TAEKeuiorImXbH6WYymcTdp UOKlzjY26JcouYrx3MKlQpolVxUWrvpnUFH6O3+mX6/J4zB86k8TOHSfb5/SQtpbFYaL QHV1nfF49EL5d5vO1xaJ/c5IeiKoEy87L6KWmPmwTFkj/MLDDkmRwFwAq3uL/CZb32Ey KHCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=mCgf3O5V7/mGcoE4LbwP855W6gwfducyAYhklhc3owg=; b=sym1w5ICiod+yZpfZ2XJww4gHrMUSLrn6AdtDbVU0119X8JTw9kdMdlLmRbYsgZhko RnQ5RlPG9f7kS67m6Lz6QgNJ+1eRvTr+iDXMo8tRzqB8EMOjy4njnXL5he06MCakMHky IL+ph/qx0P1G/mG6dhTBc7FGUSl7tFW51P2ihaPJthQGIVK8LLaS2gfaRO1Vzj32MA0S X/RA919QHQ5vB3EptPIIUbyQnWH6SoCyd4sb+/Z4zUJNMBab9N/epj0dKdi/N38u0uGF t46G3Djw2h1DtR5/67H6zXnbguawVEnbRGLrdqmhNGNV4SsAnsLdBw3TXlKS4RNN88gk /L1Q== X-Gm-Message-State: APjAAAU18aNRYLQpa9SNgqWsZ8che4DdN89I2t4JRb262eQwQLhJIMbZ MuHhCVw9BmrA2wOz2ONM7lNFEZZhfQA= X-Google-Smtp-Source: APXvYqwcpKzqfT6Q0qOj4kRBXcjLVY/FxZ9TyPJYP0p05t7eG3+x/peU2z2RJh3U0GykfMQKnTh1nQ== X-Received: by 2002:a5d:4e50:: with SMTP id r16mr3861770wrt.8.1551458840051; Fri, 01 Mar 2019 08:47:20 -0800 (PST) Received: from lmenx29q.lme.st.com. ([80.215.103.67]) by smtp.gmail.com with ESMTPSA id l18sm20826744wrv.20.2019.03.01.08.47.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 01 Mar 2019 08:47:19 -0800 (PST) From: Etienne Carriere To: buildroot@buildroot.org Date: Fri, 1 Mar 2019 17:47:07 +0100 Message-Id: <7b26af8b76a3c9e67ac6ce6b1c48a683641e98a4.1551458062.git.etienne.carriere@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: References: In-Reply-To: References: Subject: [Buildroot] [PATCH/next 3/9] package/optee-examples: locate TA SDK though optee-os package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Etienne Carriere MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Package optee-os was recently changed to produce variable OPTEE_OS_STAGING_SDK to other packages to locate the OP-TEE Trusted Application SDK generated from optee-os package and installed in the Buildroot output staging directory. Signed-off-by: Etienne Carriere --- package/optee-examples/optee-examples.mk | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/package/optee-examples/optee-examples.mk b/package/optee-examples/optee-examples.mk index 10fe62b..1f5548d 100644 --- a/package/optee-examples/optee-examples.mk +++ b/package/optee-examples/optee-examples.mk @@ -11,19 +11,13 @@ OPTEE_EXAMPLES_LICENSE_FILES = LICENSE OPTEE_EXAMPLES_DEPENDENCIES = optee-client optee-os -ifeq ($(BR2_aarch64),y) -OPTEE_EXAMPLES_SDK = $(STAGING_DIR)/lib/optee/export-ta_arm64 -else ifeq ($(BR2_arm),y) -OPTEE_EXAMPLES_SDK = $(STAGING_DIR)/lib/optee/export-ta_arm32 -endif - # Trusted Application are not built from CMake due to ta_dev_kit dependencies. # We must build and install them on target. define OPTEE_EXAMPLES_BUILD_TAS $(foreach f,$(wildcard $(@D)/*/ta/Makefile), \ $(TARGET_CONFIGURE_OPTS) \ $(MAKE) CROSS_COMPILE=$(TARGET_CROSS) \ - TA_DEV_KIT_DIR=$(OPTEE_EXAMPLES_SDK) \ + TA_DEV_KIT_DIR=$(OPTEE_OS_STAGING_SDK) \ O=out -C $(dir $f) all ) endef From patchwork Fri Mar 1 16:47:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Etienne Carriere X-Patchwork-Id: 1050305 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="uZckmPeq"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 449wMF4zZRz9sMQ for ; Sat, 2 Mar 2019 03:47:37 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id DEC28283E2; Fri, 1 Mar 2019 16:47:35 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id h8RtxRfM1zux; Fri, 1 Mar 2019 16:47:27 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id BC1F628BFA; Fri, 1 Mar 2019 16:47:25 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 2A5FC1BF2B6 for ; Fri, 1 Mar 2019 16:47:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 277CC86FD3 for ; Fri, 1 Mar 2019 16:47:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id yVM3BEmvCxgz for ; Fri, 1 Mar 2019 16:47:23 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by whitealder.osuosl.org (Postfix) with ESMTPS id 21FED86EB2 for ; Fri, 1 Mar 2019 16:47:23 +0000 (UTC) Received: by mail-wr1-f50.google.com with SMTP id i12so26645869wrw.0 for ; Fri, 01 Mar 2019 08:47:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references:mime-version:content-transfer-encoding; bh=YTAqwiTMGyOvgJjQAWu+9ogNfJCenm+qugKwSCMoAag=; b=uZckmPeqsquVbQF40cVnV59zEZ/h8dFRlSedSGvxpv5SgQ9HH7pj8yVhSuddeor5Kd hcaVREirtf2kGRGDxw3sVock3ieJ0mJUHSy/JM442MmSNwalaJZvvpJxNPgzoeptXMoq pW3CEY198U+tgF1OBr3SpxFaHg9P9dOiR9lVA3vw54XskJlXx8/6DYHK+CvkqFAwcNdf MwmSDt09jb6Gy/gl5qeLRfYDoQGbjNWKJdmeqg9bIYA6szNKc32eK5sb4Dfwn4/DE2Or 3tViWAlaG117GuapeQBWYwg6XiRzD8WWpCssD8YqFivFyBSmgHF20WIJLqnbFQGh7Hqh pnWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references:mime-version :content-transfer-encoding; bh=YTAqwiTMGyOvgJjQAWu+9ogNfJCenm+qugKwSCMoAag=; b=GRfdVBEvyigJ/TwiTg9aDLtADTouV7PjFuOaHy2mx48buo4GbLfoOVEYkzVSl/Br3C vAZUn5SfP9VuoZ0VKYwhXJpMIty6ajqcWAVLSX1c6xpyAEzVJZELGW9WuK36knbINber 4htPH1Fjg3pdbPVhpHabtEPeZu+Neffwuy7gKYZKddgFThhT0NsGAk01WLa5D1yd7bxf hIQgofTHXqkfEoB0kkHKw0xZ6Q18h6MwYdvB6b/OH1ulVHOHxYh73ut5TxW6SOc6Hl80 xTlKh1P0NdyJE0cuUJBOi03Qnxyy9L80D2a/wNm+Zl1NwXxQYE2HMmaRmrCfG3ej0Xmb Z/gQ== X-Gm-Message-State: APjAAAVoCOntVTZnzCbUtKKILnEdITmntwKsR4I5B66j2yQWSpwUuQ5L BwnahSbx3jiosNAhehm5JqNBZ2MUNXk= X-Google-Smtp-Source: APXvYqzuhgqryQpj7Gk0sPozrQBEWiAj2m19olAY19ybM3aRp4VXSnAXVr18KEPPjnCrSI+JOJW8rA== X-Received: by 2002:adf:a147:: with SMTP id r7mr3957797wrr.5.1551458841217; Fri, 01 Mar 2019 08:47:21 -0800 (PST) Received: from lmenx29q.lme.st.com. ([80.215.103.67]) by smtp.gmail.com with ESMTPSA id l18sm20826744wrv.20.2019.03.01.08.47.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 01 Mar 2019 08:47:20 -0800 (PST) From: Etienne Carriere To: buildroot@buildroot.org Date: Fri, 1 Mar 2019 17:47:08 +0100 Message-Id: X-Mailer: git-send-email 1.9.1 In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 Subject: [Buildroot] [PATCH/next 4/9] package/optee-client: fix build warnings 3.4.0 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Etienne Carriere Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" And a patch for optee-client package currently synced with tag 3.4.0 which contains source issues to be fixed. Signed-off-by: Etienne Carriere --- .../0001-libteec-fix-build-warnings.patch | 65 ++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 package/optee-client/0001-libteec-fix-build-warnings.patch diff --git a/package/optee-client/0001-libteec-fix-build-warnings.patch b/package/optee-client/0001-libteec-fix-build-warnings.patch new file mode 100644 index 0000000..21f47ec --- /dev/null +++ b/package/optee-client/0001-libteec-fix-build-warnings.patch @@ -0,0 +1,65 @@ +From 657414ccd20b4fb2985efd83b0679964fec923c2 Mon Sep 17 00:00:00 2001 +From: Etienne Carriere +Date: Fri, 1 Mar 2019 09:36:46 +0100 +Subject: [PATCH] libteec: fix build warnings +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fix build warnings reported by the Buildroot team [1]: + +/home/thomas/projets/outputs/armv5-ctng-linux-gnueabi/build/optee-client-3.4.0/libteec/src/tee_client_api.c: In function 'TEEC_InitializeContext': +/home/thomas/projets/outputs/armv5-ctng-linux-gnueabi/build/optee-client-3.4.0/libteec/src/tee_client_api.c:149:28: error: 'gen_caps' may be used uninitialized in this function [-Werror=maybe-uninitialized] + ctx->reg_mem = gen_caps & TEE_GEN_CAP_REG_MEM; + ^ +/home/thomas/projets/buildroot/output/build/optee-client-3.4.0/libteec/src/tee_client_api.c: In function ‘TEEC_OpenSession’: +/home/thomas/projets/buildroot/output/build/optee-client-3.4.0/libteec/src/tee_client_api.c:507:8: error: cast increases required alignment of target type [-Werror=cast-align] + arg = (struct tee_ioctl_open_session_arg *)buf; + ^ +/home/thomas/projets/buildroot/output/build/optee-client-3.4.0/libteec/src/tee_client_api.c: In function ‘TEEC_InvokeCommand’: +/home/thomas/projets/buildroot/output/build/optee-client-3.4.0/libteec/src/tee_client_api.c:581:8: error: cast increases required alignment of target type [-Werror=cast-align] + arg = (struct tee_ioctl_invoke_arg *)buf; + ^ + +[1] http://lists.busybox.net/pipermail/buildroot/2019-February/243437.html + +Reported-by: Thomas Petazzoni +Signed-off-by: Etienne Carriere +--- + libteec/src/tee_client_api.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/libteec/src/tee_client_api.c b/libteec/src/tee_client_api.c +index 698092b..a8683fd 100644 +--- a/libteec/src/tee_client_api.c ++++ b/libteec/src/tee_client_api.c +@@ -140,7 +140,7 @@ TEEC_Result TEEC_InitializeContext(const char *name, TEEC_Context *ctx) + return TEEC_ERROR_BAD_PARAMETERS; + + for (n = 0; n < TEEC_MAX_DEV_SEQ; n++) { +- uint32_t gen_caps; ++ uint32_t gen_caps = 0; + + snprintf(devname, sizeof(devname), "/dev/tee%zu", n); + fd = teec_open_dev(devname, name, &gen_caps); +@@ -504,7 +504,7 @@ TEEC_Result TEEC_OpenSession(TEEC_Context *ctx, TEEC_Session *session, + buf_data.buf_ptr = (uintptr_t)buf; + buf_data.buf_len = sizeof(buf); + +- arg = (struct tee_ioctl_open_session_arg *)buf; ++ arg = (struct tee_ioctl_open_session_arg *)(void *)buf; + arg->num_params = TEEC_CONFIG_PAYLOAD_REF_COUNT; + params = (struct tee_ioctl_param *)(arg + 1); + +@@ -578,7 +578,7 @@ TEEC_Result TEEC_InvokeCommand(TEEC_Session *session, uint32_t cmd_id, + buf_data.buf_ptr = (uintptr_t)buf; + buf_data.buf_len = sizeof(buf); + +- arg = (struct tee_ioctl_invoke_arg *)buf; ++ arg = (struct tee_ioctl_invoke_arg *)(void *)buf; + arg->num_params = TEEC_CONFIG_PAYLOAD_REF_COUNT; + params = (struct tee_ioctl_param *)(arg + 1); + +-- +1.9.1 + From patchwork Fri Mar 1 16:47:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Etienne Carriere X-Patchwork-Id: 1050302 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="oMWT5pIg"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 449wMB2fCpz9s8m for ; Sat, 2 Mar 2019 03:47:33 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id E40DF86FE5; Fri, 1 Mar 2019 16:47:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id TV4hyiDl6Mm4; Fri, 1 Mar 2019 16:47:27 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id A98BF8701C; Fri, 1 Mar 2019 16:47:27 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 739771BF2B6 for ; Fri, 1 Mar 2019 16:47:25 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 7063686FDD for ; Fri, 1 Mar 2019 16:47:25 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KgCfboJ2cNI2 for ; Fri, 1 Mar 2019 16:47:24 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by whitealder.osuosl.org (Postfix) with ESMTPS id EA33086ED3 for ; Fri, 1 Mar 2019 16:47:23 +0000 (UTC) Received: by mail-wr1-f48.google.com with SMTP id r5so26568707wrg.9 for ; Fri, 01 Mar 2019 08:47:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=gDqaxORBWby784dwptIV2Axyw5WpPCjykabDG+dMAFA=; b=oMWT5pIgGkWe587feW9GjBcC1nbS3he/YMO9gPRw6ECEuu02acEnU/4QBoDDmKdjY2 Ewc6Z/vfsvfM/bCM0o55OR/IcTsuKffecnM+SljXdKA2eqPLBExqhz5lqTN0zZPpfS7w eV1CWcRIGrHyKoI6J7P2TrQMizVRfxWhnPTb68/89A5dXrpJTcCDsTRtjqCLMBX7XudV rPzsy72k4GB1P4GxqPXgHk6bduY50xI7n86uQBjOncwrdr/opAm0vofOsf2o+BXy+OvY FVl+zNivk7wHQkVZ0Tmj5a8UmNX1zM3JE+RMACxlCl+rJPmXjh0Y1gXpgkkDk/a5XgBj uAqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=gDqaxORBWby784dwptIV2Axyw5WpPCjykabDG+dMAFA=; b=p7OA3pStxphkbUEcToEIbwHhYhIktkUAXLgAFVjQDcFzbtgpWPtcq5Pe4si1yCSUix d4FQVgIRYgU/grysgv1peZIzL/B6zBGlxhPvDq1NKWLTPJEvrRR9uRp5ffkfYsNHKmCo E/KHdt955e7l7ng69dvy4HqvZlisxaQgu4F0bDeFFqJ3zEBc1v4nevbIr1Dg76b97RtR GBn/AUoXI5ilfoAxbYOwcKKTtprvHd9M6xSR6Z/09Vmkh2k4e0o30NQpXFobKB4ePw33 YacBAArvT+l9MZIbRGMZorgvNYRsPF2iXeDOEWq8gjRDmxNvJH2Wb49XMW+ePuLOxYKQ VIzA== X-Gm-Message-State: APjAAAUHe231UKAPG+VPVXAlsC9DKPBjYInGrCndJpOvsamqEiWzYB4K s19Mix0KqcKB8lapa+/HD4gXFZqFm2s= X-Google-Smtp-Source: APXvYqyOllxNB+YDNsj1wuzR6RJZVBaYBAFDiRcitNQIjNFTAP+q4cVt0KIBYX8O/htYfBDpLcBBaw== X-Received: by 2002:adf:e641:: with SMTP id b1mr4014743wrn.213.1551458842278; Fri, 01 Mar 2019 08:47:22 -0800 (PST) Received: from lmenx29q.lme.st.com. ([80.215.103.67]) by smtp.gmail.com with ESMTPSA id l18sm20826744wrv.20.2019.03.01.08.47.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 01 Mar 2019 08:47:21 -0800 (PST) From: Etienne Carriere To: buildroot@buildroot.org Date: Fri, 1 Mar 2019 17:47:09 +0100 Message-Id: X-Mailer: git-send-email 1.9.1 In-Reply-To: References: In-Reply-To: References: Subject: [Buildroot] [PATCH/next 5/9] package/optee-client: support BUILD_STATIC_LIBS X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Etienne Carriere MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Patch optee-client from release 3.4.0 to support building resources with static linkage of executable binaries with the user libraries. The optee-client patch is under review in the OP-TEE project [1] and should be merged in the next OP-TEE release 3.5.0. This change drops !BR2_STATIC_LIBS constraint on package optee-client. [1] https://github.com/OP-TEE/optee_client/pull/147 Signed-off-by: Etienne Carriere --- .../0001-libteec-fix-build-warnings.patch | 4 +- ...pport-BUILD_STATIC_LIBS-BUILD_SHARED_LIBS.patch | 51 ++++++++++++++++++++++ package/optee-client/Config.in | 4 -- 3 files changed, 53 insertions(+), 6 deletions(-) create mode 100644 package/optee-client/0002-cmake-support-BUILD_STATIC_LIBS-BUILD_SHARED_LIBS.patch diff --git a/package/optee-client/0001-libteec-fix-build-warnings.patch b/package/optee-client/0001-libteec-fix-build-warnings.patch index 21f47ec..aec07b4 100644 --- a/package/optee-client/0001-libteec-fix-build-warnings.patch +++ b/package/optee-client/0001-libteec-fix-build-warnings.patch @@ -1,7 +1,7 @@ -From 657414ccd20b4fb2985efd83b0679964fec923c2 Mon Sep 17 00:00:00 2001 +From 2f5ab18b4886b31a33850ee51f33fb753e9c7b7f Mon Sep 17 00:00:00 2001 From: Etienne Carriere Date: Fri, 1 Mar 2019 09:36:46 +0100 -Subject: [PATCH] libteec: fix build warnings +Subject: [PATCH 1/2] libteec: fix build warnings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/package/optee-client/0002-cmake-support-BUILD_STATIC_LIBS-BUILD_SHARED_LIBS.patch b/package/optee-client/0002-cmake-support-BUILD_STATIC_LIBS-BUILD_SHARED_LIBS.patch new file mode 100644 index 0000000..f63f1a3 --- /dev/null +++ b/package/optee-client/0002-cmake-support-BUILD_STATIC_LIBS-BUILD_SHARED_LIBS.patch @@ -0,0 +1,51 @@ +From 857ed6a900e2f16035a88e73e47d79e9251f6544 Mon Sep 17 00:00:00 2001 +From: Etienne Carriere +Date: Fri, 1 Mar 2019 12:31:48 +0100 +Subject: [PATCH 2/2] cmake: support BUILD_STATIC_LIBS/BUILD_SHARED_LIBS + +CMake variables BUILD_STATIC_LIBS and BUILD_SHARED_LIBS +set constraints on libraries and executable linkage. + +With this change OP-TEE client CMake script builds and installs the +embedded files with the expected linkage configuration. + +Reported-by: Thomas Petazzoni +Signed-off-by: Etienne Carriere +--- + libteec/CMakeLists.txt | 5 +++-- + tee-supplicant/CMakeLists.txt | 2 +- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/libteec/CMakeLists.txt b/libteec/CMakeLists.txt +index 3ec8f66..e3495fb 100644 +--- a/libteec/CMakeLists.txt ++++ b/libteec/CMakeLists.txt +@@ -33,7 +33,7 @@ endif() + ################################################################################ + # Built library + ################################################################################ +-add_library (teec SHARED ${SRC}) ++add_library (teec ${SRC}) + + set_target_properties (teec PROPERTIES + VERSION ${PROJECT_VERSION} +@@ -71,4 +71,5 @@ target_link_libraries (teec + ################################################################################ + # FIXME: This should in someway harmonize with CFG_TEE_CLIENT_LOAD_PATH + # FIXME: Should we change this to /usr/local/lib? +-install (TARGETS teec DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++install (TARGETS teec LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}") +diff --git a/tee-supplicant/CMakeLists.txt b/tee-supplicant/CMakeLists.txt +index d2d3afd..e663be9 100644 +--- a/tee-supplicant/CMakeLists.txt ++++ b/tee-supplicant/CMakeLists.txt +@@ -85,4 +85,4 @@ target_link_libraries (${PROJECT_NAME} + ################################################################################ + # Install targets + ################################################################################ +-install (TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_SBINDIR}) ++install (TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR}) +-- +1.9.1 + diff --git a/package/optee-client/Config.in b/package/optee-client/Config.in index db0b7b7..0de136c 100644 --- a/package/optee-client/Config.in +++ b/package/optee-client/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_OPTEE_CLIENT bool "optee-client" - depends on !BR2_STATIC_LIBS help Enable the OP-TEE client package that brings non-secure client application resources for OP-TEE support. OP-TEE @@ -12,6 +11,3 @@ config BR2_PACKAGE_OPTEE_CLIENT and invoked by the secure world. https://github.com/OP-TEE/optee_client - -comment "optee-client needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS From patchwork Fri Mar 1 16:47:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Etienne Carriere X-Patchwork-Id: 1050304 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="dP/HAQmJ"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 449wMF2c8jz9s8m for ; Sat, 2 Mar 2019 03:47:37 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 435AC86374; Fri, 1 Mar 2019 16:47:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id FMxcVVmptJ9V; Fri, 1 Mar 2019 16:47:33 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0A2DD86388; Fri, 1 Mar 2019 16:47:33 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id B8FD31BF2B6 for ; Fri, 1 Mar 2019 16:47:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id AACA12A293 for ; Fri, 1 Mar 2019 16:47:31 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wJDuBYaW+k3c for ; Fri, 1 Mar 2019 16:47:27 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by silver.osuosl.org (Postfix) with ESMTPS id 0FF0727FA1 for ; Fri, 1 Mar 2019 16:47:25 +0000 (UTC) Received: by mail-wr1-f42.google.com with SMTP id i16so26550699wrs.13 for ; Fri, 01 Mar 2019 08:47:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=berZBz0AIB38SS6SSYpa7ZbpXkI6aKL1/qO16xaYiAU=; b=dP/HAQmJrlPgfE59+iihwSeq7mJpsiERT3H9gWV4Nziy+lDTvxojuGnwtRG4lcdY6g YY1p2PD6rfNJfTCPJiKJaQY9tSqij9O3n0gDFmjMLaRFWnUgJt3McHnJTXtc+MJ09/Sf 3Ar4Ql8UMFxhaPG+SlsvgUc+LEf7Z70yb9fDWxoxBshq+W5RSoKPLVxk/cCTvnYsBssR gH3fnEfuUqjHrvOJUfYNZzoZfqaWQcJ1CSFkipAJFwYnJ0uQ1skj2+wAlKIt4z05ZpYM bR5thIN3gKIkjOTLC3BLRsBWujnS5QRWJdJY2YhzvQqxnAc2XMHkIGDGxS5X/VI5dXny l1Nw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=berZBz0AIB38SS6SSYpa7ZbpXkI6aKL1/qO16xaYiAU=; b=WsocSG0jaBwxZ3FcDeuG/RDtCcpehLAQRYS+cUgHtJk9mhqoUz9N566N8x3UP8Ncir L7NdXyEMRF9ptcUXOw8wUa6WnGKm7IXbS3+kRl+Afk5gqBcVDRsdW7FYVPWV0hnyA4lm 4NlPmlvKmZx7yTDNykK7aXnfYTGCHgQfb4AjFUDd8Db4fvP+o85rTi6TdqC0cKTr9LU2 yQMM8M2qkkZuKi48fYytBsoF7R+iJwGFI60wck07t2JC8Bp2jcpEDGuGYaWHQWnA0ZrO dTx2liy7Gl76MIxaC4CX3o4Q0yfqQnYAkfd1LaCZC7OpGRWpRAIl6crWka2WrW71R+Bv ZKDQ== X-Gm-Message-State: APjAAAUKabRHD/AnT5aK8YnYD54xheY0Wj0czrW28i4LFKmteMrkqP5j d0EkPbRoGauT9NHd085318MbN5fgqt0= X-Google-Smtp-Source: APXvYqxlJjy5B7G+QvH2W9LFBjbjauh9odFQYLLPl5sTWgAqWynBhZ//0c7xCWEun33zhFCl1N06uQ== X-Received: by 2002:adf:d08e:: with SMTP id y14mr4086005wrh.306.1551458843278; Fri, 01 Mar 2019 08:47:23 -0800 (PST) Received: from lmenx29q.lme.st.com. ([80.215.103.67]) by smtp.gmail.com with ESMTPSA id l18sm20826744wrv.20.2019.03.01.08.47.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 01 Mar 2019 08:47:22 -0800 (PST) From: Etienne Carriere To: buildroot@buildroot.org Date: Fri, 1 Mar 2019 17:47:10 +0100 Message-Id: X-Mailer: git-send-email 1.9.1 In-Reply-To: References: In-Reply-To: References: Subject: [Buildroot] [PATCH/next 6/9] package/optee-test: drop constraint on !BR2_STATIC_LIBS X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Etienne Carriere MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Optee-client recently supports BR2_STATIC_LIBS and BR2_SHARED_LIBS directives. This change removes the constraint on package optee-test that now supports static linking of embedded binaries. Signed-off-by: Etienne Carriere --- package/optee-test/Config.in | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package/optee-test/Config.in b/package/optee-test/Config.in index 575790b..2bccc76 100644 --- a/package/optee-test/Config.in +++ b/package/optee-test/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_OPTEE_TEST bool "optee-test" depends on BR2_TARGET_OPTEE_OS - depends on !BR2_STATIC_LIBS # optee-client select BR2_PACKAGE_OPTEE_CLIENT select BR2_TARGET_OPTEE_OS_SDK help @@ -21,7 +20,3 @@ config BR2_PACKAGE_OPTEE_TEST execution. http://github.com/OP-TEE/optee_test - -comment "optee-test needs a toolchain w/ dynamic library" - depends on BR2_TARGET_OPTEE_OS - depends on BR2_STATIC_LIBS From patchwork Fri Mar 1 16:47:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Etienne Carriere X-Patchwork-Id: 1050308 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="wswELPCB"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 449wMS0kPSz9s7h for ; Sat, 2 Mar 2019 03:47:48 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 7322A87E91; Fri, 1 Mar 2019 16:47:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HoysS94bUxTL; Fri, 1 Mar 2019 16:47:36 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id B0C9C87E81; Fri, 1 Mar 2019 16:47:36 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 435351BF2B6 for ; Fri, 1 Mar 2019 16:47:35 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 9BC5E87E7A for ; Fri, 1 Mar 2019 16:47:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id UuEv5NwyDp-8 for ; Fri, 1 Mar 2019 16:47:26 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by hemlock.osuosl.org (Postfix) with ESMTPS id B9EBC87E79 for ; Fri, 1 Mar 2019 16:47:25 +0000 (UTC) Received: by mail-wr1-f49.google.com with SMTP id t18so26606449wrx.2 for ; Fri, 01 Mar 2019 08:47:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=PW8pBKLX9v+RCs1gY/+/HiEMqy8uq89cNb7CLc9nG58=; b=wswELPCB8UZ/yx7/allYBUmIH3/TKraJOgWHiuiMQskFidDRI5qcgh9fJXnVKaKMpp n57tEj8xdJKOH5drMGLud9j2xzpz0P+Y9qWfGLWRSMvTckUbVni9XbL9TOO6XZNe3YNq MMWLzIFLlU+GPblGIxLNTwmFxU4EJqBXhiIfuClUbHyxOYXvU+p/W6TGC56D9IW991R3 BIqmNvhGzBMcTpjevU8GEpUdR0MavPLQWIW6GCCUcilNl7OkUeR7WkdbVsRWp15LHNl8 bk3rPyqKqLxsn/vRVwJay6CUGK0HR3FXzLvv39g9l4SmErbJ7SyCzD2mBM6Er5RmG2Wo Kh0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=PW8pBKLX9v+RCs1gY/+/HiEMqy8uq89cNb7CLc9nG58=; b=uXS39s9gipzY3yTtjMTNByhDgAp2AwLEmsnyP3KU/sFC5+/CVZBdrHfK9LYjxNEtPT Jt6+hR2O6rqQ5mjXpypG9R+br/wUtTs2SLwI0OgbnuwBt6+uCmTK+DxDTMaJHG0UBvON Xj6+kz/koCdEM8PUYFx2mjs3lkTF3srWa0RWFa+luXjYzy+9gtWEIJd11/IMhhGFSVfb G5g+BUjUBD5SE0K5j624tGz33zzk+PHJ0aLPD7UQcV346S4EDV+nyYU+pufnoDMcp4af tqQVTh4x2VmKm3xgCSCW409V8Yddt+Lo8psFDcnHScD1eTH6kdLjPrXpeVpV+PnRJd24 rVcg== X-Gm-Message-State: APjAAAWTGOTQRLzaj8p2pAQEwTele7xClSfWX4MfGmYNK+ufGZ6+0GWc pJrqSm8LjfUTuU8h3PYKvJ3pn1kNhGo= X-Google-Smtp-Source: APXvYqxAgPMHhrwItaEKRN/WUsbz1x20Lab80Q7O8hZmny9sNi1lYXqZ4hOCWo0Dp1G+SJ2XI2bQow== X-Received: by 2002:a5d:464b:: with SMTP id j11mr3950212wrs.307.1551458844061; Fri, 01 Mar 2019 08:47:24 -0800 (PST) Received: from lmenx29q.lme.st.com. ([80.215.103.67]) by smtp.gmail.com with ESMTPSA id l18sm20826744wrv.20.2019.03.01.08.47.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 01 Mar 2019 08:47:23 -0800 (PST) From: Etienne Carriere To: buildroot@buildroot.org Date: Fri, 1 Mar 2019 17:47:11 +0100 Message-Id: X-Mailer: git-send-email 1.9.1 In-Reply-To: References: In-Reply-To: References: Subject: [Buildroot] [PATCH/next 7/9] package/optee-examples: drop constraint on !BR2_STATIC_LIBS X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Etienne Carriere MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Optee-client recently supports BR2_STATIC_LIBS and BR2_SHARED_LIBS directives. This change removes the constraint on package optee-examples that now supports static linking of embedded binaries. Signed-off-by: Etienne Carriere --- package/optee-examples/Config.in | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package/optee-examples/Config.in b/package/optee-examples/Config.in index 479f920..3f730ca 100644 --- a/package/optee-examples/Config.in +++ b/package/optee-examples/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_OPTEE_EXAMPLES bool "optee-examples" depends on BR2_TARGET_OPTEE_OS - depends on !BR2_STATIC_LIBS # optee-client select BR2_PACKAGE_OPTEE_CLIENT select BR2_TARGET_OPTEE_OS_SDK help @@ -17,7 +16,3 @@ config BR2_PACKAGE_OPTEE_EXAMPLES execution. https://github.com/linaro-swg/optee_examples - -comment "optee-examples needs a toolchain w/ dynamic library" - depends on BR2_TARGET_OPTEE_OS - depends on BR2_STATIC_LIBS From patchwork Fri Mar 1 16:47:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Etienne Carriere X-Patchwork-Id: 1050301 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="WgWfM3Gv"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 449wMB3Jgtz9sMQ for ; Sat, 2 Mar 2019 03:47:33 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 03DEC8636D; Fri, 1 Mar 2019 16:47:30 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id MmlDWqnc_qdP; Fri, 1 Mar 2019 16:47:29 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 3BEB486371; Fri, 1 Mar 2019 16:47:29 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 3DEAF1BF2B6 for ; Fri, 1 Mar 2019 16:47:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 3B8DF8636D for ; Fri, 1 Mar 2019 16:47:27 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YjpjQ--1qu9g for ; Fri, 1 Mar 2019 16:47:26 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 8654786366 for ; Fri, 1 Mar 2019 16:47:26 +0000 (UTC) Received: by mail-wr1-f50.google.com with SMTP id w2so26569224wrt.11 for ; Fri, 01 Mar 2019 08:47:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=lRBsKRPIqB6h4MKHSv334bG/7T85by/+dTLW0zZ5GLk=; b=WgWfM3Gvu4NzgmPuxQN5qMwx86WbtYcgLIQgV/QutbTIGhiZ4mpCiZTDpg74s5Azy6 Yfl5oYIdK1yVh9qQnoeE1ZLc1lheR6sxUZZDULrQEd0dhHnTq4Z661SkSux4ufFO6K8a fA51DX4ZbrnHsxgpOUIPLjLROWJsvc+wCeh4IxrdRDwQUB+3BGRvPrKbSAkk4IBTpdEm EVJOQPhUSR9F+6PuMTBb1ND433urncCncPmqJModBqdQ7huo06yt2ixMIm2V7gX8Awyb 0lLXH43bfr/54q/DkHwlhmoiI7I1hrYD4WEVzT5HKUU7gX+5sXQQdAZoLMCP9hWXbGXP orkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=lRBsKRPIqB6h4MKHSv334bG/7T85by/+dTLW0zZ5GLk=; b=tGaTT8vMcTE8Zd3wlj1elEH83bIczb1/Qzid+yA4kCWcYeDbqQwEOaXWcL5I6mQ2iI /gDDjdgaxDtjAJsuNxj3YdUTKhijZHGo9nVxdZcL3q/gZLP9L7pHG8myI6AW5MMga2zB BckyGRNWRC1eGvnLCMfCpwN1sz+IswLVzcVgyR8Nqkb6UBqFYJDQ4XSfjYuX6/3yaJEM msR/FvEHIoAhXJHUpfHLqIVHGdHLkd3LHHaRha0Z4aigqy5eiv9YNxSb6fadj4jZ7NYr i+vofPECcjzYS8Pf6/QSFn8D5t7htyYW4TUQ4dKZ0OVCPwDp59HmjMM17mgOghOI8nlM WyGw== X-Gm-Message-State: APjAAAXiyU8sJ0jzjXmqP4yn4fI7OdK/kLgiYWkyCXJXMPmN0EFg27eO juRjDkdyBPybbNeYkfnGgrrjeeQgiUw= X-Google-Smtp-Source: APXvYqyHu5aSy82v/+q/+nXQ4WAPQ61VBdvVVHjdmF9zREfPsb4+ipaJYthBOVF3Hs4lE7kAtG+pkQ== X-Received: by 2002:a5d:4843:: with SMTP id n3mr3953749wrs.209.1551458844922; Fri, 01 Mar 2019 08:47:24 -0800 (PST) Received: from lmenx29q.lme.st.com. ([80.215.103.67]) by smtp.gmail.com with ESMTPSA id l18sm20826744wrv.20.2019.03.01.08.47.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 01 Mar 2019 08:47:24 -0800 (PST) From: Etienne Carriere To: buildroot@buildroot.org Date: Fri, 1 Mar 2019 17:47:12 +0100 Message-Id: <27ab55286213ad91fe440c0596f6c3866ce86ab6.1551458062.git.etienne.carriere@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: References: In-Reply-To: References: Subject: [Buildroot] [PATCH/next 8/9] package/optee-benchmark: drop constraint on !BR2_STATIC_LIBS X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Etienne Carriere MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Optee-client recently supports BR2_STATIC_LIBS and BR2_SHARED_LIBS directives. This change removes the constraint on package optee-benchmarktest that now supports static linking of embedded binaries. Signed-off-by: Etienne Carriere --- package/optee-benchmark/Config.in | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package/optee-benchmark/Config.in b/package/optee-benchmark/Config.in index 0e36549..a4af645 100644 --- a/package/optee-benchmark/Config.in +++ b/package/optee-benchmark/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_OPTEE_BENCHMARK bool "optee-benchmark" - depends on !BR2_STATIC_LIBS # optee-client select BR2_PACKAGE_OPTEE_CLIENT select BR2_PACKAGE_LIBYAML help @@ -10,6 +9,3 @@ config BR2_PACKAGE_OPTEE_BENCHMARK by the OP-TEE project. http://github.com/linaro-swg/optee_benchmark - -comment "optee-benchmark needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS From patchwork Fri Mar 1 16:47:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Etienne Carriere X-Patchwork-Id: 1050307 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="XlbrIjFn"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 449wMM3Z42z9s8m for ; Sat, 2 Mar 2019 03:47:43 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 96D9587E9C; Fri, 1 Mar 2019 16:47:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id oYcL3Q+2Fw26; Fri, 1 Mar 2019 16:47:38 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id C2B9A87E94; Fri, 1 Mar 2019 16:47:37 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 2B51F1BF2B6 for ; Fri, 1 Mar 2019 16:47:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 27BFD87E81 for ; Fri, 1 Mar 2019 16:47:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Td2GHq+rCW9b for ; Fri, 1 Mar 2019 16:47:27 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by hemlock.osuosl.org (Postfix) with ESMTPS id 6977687E7B for ; Fri, 1 Mar 2019 16:47:27 +0000 (UTC) Received: by mail-wr1-f47.google.com with SMTP id d17so26536556wre.10 for ; Fri, 01 Mar 2019 08:47:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=Ocmz4eGbZ2StpDBSWGEaqOrRx/cWRovQUPrutvW3laA=; b=XlbrIjFnYsJwpw+wykWBABZwOgo/s1vx5QwS8VwJBezRnZnf2MiYbxmjgtwMSPQN8Y egno5fWtuyNcOmoSqySwJFGd6v41/iJSK+jXvlO2zJbFhWA1rwAcDNCIK4k1569ygVa9 n93Wdzi+152RMVNqiKJBNZjFgqXL5wctNyW5lwKZgNLMZlFdw7GKbLU00UBBz+X9fpTl T0dt6SHOScfIuV0EWAaSvz7neiPrlSM6GJeFEg/sTPRSL3SgbHmAROT9GIKOxX68oS8a TpgzVoRD3ArBIzXTAOZ1CooAAJ3XhCWx1KfUYtckGY5E5hucNoWt2n1jz9BYHtgdUvxl w6Dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=Ocmz4eGbZ2StpDBSWGEaqOrRx/cWRovQUPrutvW3laA=; b=VbXlb4jI5vTZTXM3Y6d5K8B/D3KeBesWwNEUG75Xmp4Pd+BhYpaDbMtgpQxTsXkY3x FkQ4hlgUCtOBcU/KAqtJkHb6soTzw58pecDZTR5Stf9/1LUQUqA6JwTsJVpG8Vt+y9lX tFcTUO1FlaojdxA4sedrUX4rP4+2KoIqdAFhVsoHcVtN7ncVZ4Me1EFc/ejYWrIF1mQS 0YnuODeA16FSpVwlHnZhYlSnH5RWWSgNGgWazYA8S6Uk6MGQs/3M4XMyWiE/Lwj3Je2D W9AWGFdJueIJ5MwFnVzTVbilPODQNtqOVmysbCu036k+vUhFT9VCxYc7n8VvzaGe76Wh egcA== X-Gm-Message-State: APjAAAXkQp5yN+YekzqP//wd0ik4oOrHr6uDJfb8EanTW92k+9S7mzBp GO60wdIlHZdeY4Z3f+Vz9zPIbPZxngo= X-Google-Smtp-Source: APXvYqxyAz7BLfruLBxXqRWZUQRwrPoQAbG2+5o/mT609/dqo2bQ583FNPj7PIBj/I3BWPoebhu85g== X-Received: by 2002:a5d:570a:: with SMTP id a10mr465433wrv.85.1551458845760; Fri, 01 Mar 2019 08:47:25 -0800 (PST) Received: from lmenx29q.lme.st.com. ([80.215.103.67]) by smtp.gmail.com with ESMTPSA id l18sm20826744wrv.20.2019.03.01.08.47.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 01 Mar 2019 08:47:25 -0800 (PST) From: Etienne Carriere To: buildroot@buildroot.org Date: Fri, 1 Mar 2019 17:47:13 +0100 Message-Id: <6d46c9a3c321d623029f2670f4ab98393825da98.1551458062.git.etienne.carriere@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: References: In-Reply-To: References: Subject: [Buildroot] [PATCH/next 9/9] boot/optee-os: support alternate image files X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Etienne Carriere MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Some platform may generate specific boot image files instead of the generic files tee.bin and tee-*_v2.bin when building OP-TEE OS package. This change introduces optee-os configuration directive BR2_TARGET_OPTEE_OS_CORE_IMAGES that allows board configuration to specify its expected boot image file names. Signed-off-by: Etienne Carriere --- boot/optee-os/Config.in | 13 +++++++++++++ boot/optee-os/optee-os.mk | 7 +++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in index a1f1b91..0f2df27 100644 --- a/boot/optee-os/Config.in +++ b/boot/optee-os/Config.in @@ -99,4 +99,17 @@ config BR2_TARGET_OPTEE_OS_ADDITIONAL_VARIABLES Additional parameters for the OP-TEE OS build E.g. 'CFG_TEE_CORE_LOG_LEVEL=3 CFG_UNWIND=y' +config BR2_TARGET_OPTEE_OS_CORE_IMAGES + string "Binary boot image filenames" + default "tee-header_v2.bin tee-pager_v2.bin" + help + Names of generated image files that are installed in the + output images/ directory. + + With OP-TEE pager disabled, defaults are tee-header_v2.bin + and tee-pager_v2.bin. + + With OP-TEE pager enabled, one would select the 3 files + tee-header_v2.bin, tee-pager_v2.bin and tee-pageable_v2.bin. + endif # BR2_TARGET_OPTEE_OS diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk index df481c9..e445e72 100644 --- a/boot/optee-os/optee-os.mk +++ b/boot/optee-os/optee-os.mk @@ -62,6 +62,8 @@ OPTEE_OS_LOCAL_SDK = $(OPTEE_OS_BUILDDIR_OUT)/export-ta_arm32 OPTEE_OS_STAGING_SDK = $(STAGING_DIR)/lib/optee/export-ta_arm32 endif +OPTEE_OS_IMAGE_FILES = $(call qstrip,$(BR2_TARGET_OPTEE_OS_CORE_IMAGES)) + ifeq ($(BR2_TARGET_OPTEE_OS_CORE),y) define OPTEE_OS_BUILD_CORE $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) O=$(OPTEE_OS_BUILDDIR_OUT) \ @@ -69,8 +71,9 @@ define OPTEE_OS_BUILD_CORE endef define OPTEE_OS_INSTALL_IMAGES_CORE mkdir -p $(BINARIES_DIR) - cp -dpf $(@D)/$(OPTEE_OS_BUILDDIR_OUT)/core/tee.bin $(BINARIES_DIR) - cp -dpf $(@D)/$(OPTEE_OS_BUILDDIR_OUT)/core/tee-*_v2.bin $(BINARIES_DIR) + $(foreach f,$(OPTEE_OS_IMAGE_FILES), \ + cp -dpf $(@D)/$(OPTEE_OS_BUILDDIR_OUT)/core/$(f) $(BINARIES_DIR)/ + ) endef endif # BR2_TARGET_OPTEE_OS_CORE