From patchwork Wed May 8 18:14:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 1097181 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; 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="xieM+TpK"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44zl8g4j4vz9s9T for ; Thu, 9 May 2019 04:18:27 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 64217C21E3B; Wed, 8 May 2019 18:16:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 08B9BC21DF3; Wed, 8 May 2019 18:15:39 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 824C5C21D74; Wed, 8 May 2019 18:15:21 +0000 (UTC) Received: from mail-ed1-f66.google.com (mail-ed1-f66.google.com [209.85.208.66]) by lists.denx.de (Postfix) with ESMTPS id DDEE4C21E35 for ; Wed, 8 May 2019 18:15:17 +0000 (UTC) Received: by mail-ed1-f66.google.com with SMTP id e24so22926088edq.6 for ; Wed, 08 May 2019 11:15:17 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=1A1yIwxwNx004Jg+/Gk985/oaYFSrCw1yNAJEEK0IUI=; b=xieM+TpKA8Rg7TiZqt6T/B5ZGCIWDCQZaAPmVq3PDU6ItYeCK//NPDTjTKyE7+/9e7 r0K1QpwTn4nEUuwg+YuUFU3LwoG0IKamXQsDVxFGpzfwHShMfRsi9Wyw97mPJmMHsr34 m2/U3OfeKSLAhOSB3QWwQWi3+0oANbn8IPc2jsDgWyoNdTbMRd/JSQWMB6Fq37wzNc2x iGkYoVqAw8vxvB2yNZ5/Hhaxz9LlWu+qcbNzfBzpUjdIRvXcHo9PrGOPqJ9lihUs82QS C03hxGV9CdJj7SOMnaiS/Ko8/sW6mFLRfAoF74smFKjN2bmcdf3wquUiLGDfFm5FNpJx PZ5g== 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:mime-version:content-transfer-encoding; bh=1A1yIwxwNx004Jg+/Gk985/oaYFSrCw1yNAJEEK0IUI=; b=JGlyxBrrbvpzq5DPU99zKe2Zpt5LZKuI6u0cUjCjWrzHPlgoTGaJzf8dpa1+ioWUoY RSLLdIp3UPy/7yWJevK8zZloTaqBWEI0ydRz6HIhG4EZLxW9qYddZLO7VWKkjQc/L2Vd iUv7gL1GYGMEUZTr50Kgdz4EPQs2Fd+G1ybWFNqV2pg5s9Uba43QFEgil/B6QAcdWObz whC2kcT4q9ivZE+zZNz6eogG4xIW2gD5qPXgu0IN9ZERv33ujPp+G+akdnHDE/5Mwsxd Mk0m3epnODHKwwU7BhFcEJ4ZqvJHsdcAYKah6DV+jYF8tWXrjm5cOnCcPXfK9cGWU44b /fcw== X-Gm-Message-State: APjAAAXOUXtLcmfZ0mx9cv7VdheYYidGyozkPP1TRgW3ArEvH+qMdWAc fOD/30ZwyIgFc244Ri9qeH4dqK9wXMQ= X-Google-Smtp-Source: APXvYqwx3Z1OHnBCkgZaCT+Yusdh8GpXsj2iicWw9doxAlXEB6KpmDVhP/BM1lipFexr/0+tSTdpoA== X-Received: by 2002:a50:95f8:: with SMTP id x53mr40732528eda.204.1557339317271; Wed, 08 May 2019 11:15:17 -0700 (PDT) Received: from event-horizon.net ([80.111.179.123]) by smtp.gmail.com with ESMTPSA id r2sm2809106ejp.76.2019.05.08.11.15.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 May 2019 11:15:16 -0700 (PDT) From: Bryan O'Donoghue To: u-boot@lists.denx.de, fabio.estevam@nxp.com, maxime.ripard@free-electrons.com, breno.lima@nxp.com, pjtexier@koncepto.io, trini@konsulko.com, peng.fan@nxp.com Date: Wed, 8 May 2019 19:14:48 +0100 Message-Id: <20190508181448.20452-8-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190508181448.20452-1-bryan.odonoghue@linaro.org> References: <20190508181448.20452-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 Subject: [U-Boot] [PATCH 7/7] warp7: Specify a default CONFIG_OPTEE_LOAD_ADDR if non provided X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" If no CONFIG_OPTEE_LOAD_ADDR is provided i.e. you are not loading OPTEE into memory in u-boot, then just set the non-existent CONFIG option to zero, elsewise stringify(CONFIG_OPTEE_LOAD_ADDR) will return "CONFIG_OPTEE_LOAD_ADDR" - which looks weird in the u-boot environment. Signed-off-by: Bryan O'Donoghue --- include/configs/warp7.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/configs/warp7.h b/include/configs/warp7.h index bab23cfdca..8c31d72205 100644 --- a/include/configs/warp7.h +++ b/include/configs/warp7.h @@ -45,6 +45,10 @@ #define BOOT_SCR_STRING "source ${bootscriptaddr}\0" #endif +#ifndef CONFIG_OPTEE_LOAD_ADDR +#define CONFIG_OPTEE_LOAD_ADDR 0 +#endif + #define CONFIG_EXTRA_ENV_SETTINGS \ CONFIG_DFU_ENV_SETTINGS \ "script=boot.scr\0" \