From patchwork Sat May 4 00:08:24 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: 1095089 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="ae593g+s"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44wqBT5mSbz9s7T for ; Sat, 4 May 2019 10:09:53 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 7992FC21DFA; Sat, 4 May 2019 00:09:00 +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 960FAC21E26; Sat, 4 May 2019 00:08:40 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 5E923C21D9A; Sat, 4 May 2019 00:08:36 +0000 (UTC) Received: from mail-ed1-f68.google.com (mail-ed1-f68.google.com [209.85.208.68]) by lists.denx.de (Postfix) with ESMTPS id 1CA82C21D72 for ; Sat, 4 May 2019 00:08:32 +0000 (UTC) Received: by mail-ed1-f68.google.com with SMTP id p26so8028427edr.2 for ; Fri, 03 May 2019 17:08:32 -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=u3eR3eKtVUysw50ic3Vo9iS/qJZY3eEtVw6q+FUBy8w=; b=ae593g+shQcVQxQVQY4OI37zKnmllzytYv4yD0x0sKlDOdUsBxxr0UOawqX4JitP2U o0hk95NJMkA6ubK1tLn4miqByF8/L5NdSU/CEBjhki/7UDaokZi/xr0pxTarzEd6KY3B x38pQQCDh8gUJe3L3bLJqBCy+PPjCYl1VIUu8CE6GSSUwmvs7JO+btMFYoa9t56lF6Zg xOZ6AkFCZ+wFsf4Y5ti28mCtC1kqpj8lu2625yUEG3o8IQWMjp7fgmtO52mO+vkYwqbL dVdQv9ytCq/5hbQWluQ0xgMuV7q4CAM1igBz9Ru5oJut1M0e1HMPBmbQn/gGyly+5mu7 n+Pg== 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=u3eR3eKtVUysw50ic3Vo9iS/qJZY3eEtVw6q+FUBy8w=; b=HvxRjDQUc5l7o7RdMn6u553HADkHKl5HteZa3RbmezBJsNaAlFw9DIq4FzO1NIpr+l 9Tph3kjkwb4bUEUPGWKrk/I31zWyaDHFozuYX+EFQmQjPQse5AnVkz+Lan0fFXNzXs9/ YZJx8+a+Y/LJ7ZsZfqJ+0p2rlzLbkLHZRM+2k1wzv90HJJkcQda7xW/YO9SGyqhsJLSp Vez8fq3aP2IAo0+e8bl24hAhSeShYaoOpOxu/sM0EnJScMp1ZTPHj9J9kaxS04LSwkiC HELI0smtVUHEy/reN1TgzmabaApcC7TI0Iu7I1qj9Sx5Y17LJwb9LIxnXUmYAt8qMr9L +jWw== X-Gm-Message-State: APjAAAXTJ5SbIha5oYDcx+DRQCEcEUMhi2sUlzdEPRT6ezObMxxM27oR CruZw0OdGFFKk/YO3tc2fYhw2g== X-Google-Smtp-Source: APXvYqy7PUyY6RndE0KmpuOJmMWFAi7hJpUtbrYjdiRtB+tMHD8K9mrnpp+I6DV765ZJzwErrOuu2Q== X-Received: by 2002:a17:906:5e10:: with SMTP id n16mr7349405eju.143.1556928511782; Fri, 03 May 2019 17:08:31 -0700 (PDT) Received: from event-horizon.net ([80.111.179.123]) by smtp.gmail.com with ESMTPSA id z4sm509815ejm.8.2019.05.03.17.08.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 May 2019 17:08:30 -0700 (PDT) From: Bryan O'Donoghue To: trini@konsulko.com, sbabic@denx.de, jens.wiklander@linaro.org, rpjday@crashcourse.ca, fabio.estevam@nxp.com, rui.silva@linaro.org, u-boot@lists.denx.de Date: Sat, 4 May 2019 01:08:24 +0100 Message-Id: <20190504000826.3618-3-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190504000826.3618-1-bryan.odonoghue@linaro.org> References: <20190504000826.3618-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 Cc: Breno Lima Subject: [U-Boot] [PATCH v2 2/4] warp7: include: configs: Skip low-level init if BOOTM_OPTEE false 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" Commit c7b3a7ee5351 ("optee: adjust dependencies and default values for dram") wants to skip low-level init of i.MX7 hardware in the case where OP-TEE has already run and u-boot is being run as BL33 in normal world. Currently we check for both #ifdef CONFIG_OPTEE_TZDRAM_SIZE and #ifndef CONFIG_OPTEE to determine if lowlevel init should be skipped, however, in order to ensure non-OPTEE users never see OPTEE related defines we cannot rely on this method. Fortunately we can use CONFIG_BOOTM_OPTEE for the same purpose. CONFIG_BOOTM_OPTEE is only relevant if you want u-boot to load OP-TEE not if u-boot has already been loaded by OP-TEE. Signed-off-by: Bryan O'Donoghue Cc: Fabio Estevam Cc: Breno Lima Cc: Rui Miguel Silva Acked-by: Rui Miguel Silva --- include/configs/warp7.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/include/configs/warp7.h b/include/configs/warp7.h index 37649cf2c5..06e2e97d5e 100644 --- a/include/configs/warp7.h +++ b/include/configs/warp7.h @@ -18,11 +18,9 @@ * launched by OPTEE, because of that we shall skip all the low level * initialization since it was already done by ATF or OPTEE */ -#ifdef CONFIG_OPTEE_TZDRAM_SIZE -#ifndef CONFIG_OPTEE +#ifndef CONFIG_BOOTM_OPTEE #define CONFIG_SKIP_LOWLEVEL_INIT #endif -#endif /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (35 * SZ_1M)