From patchwork Wed Apr 24 00:43: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: 1089837 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="uA2u0pqK"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44phRZ5VHgz9s55 for ; Wed, 24 Apr 2019 10:44:58 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 52CF0C21DD9; Wed, 24 Apr 2019 00:44: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 CB395C21DFD; Wed, 24 Apr 2019 00:44:00 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D4A56C21DA2; Wed, 24 Apr 2019 00:43:58 +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 98812C21C27 for ; Wed, 24 Apr 2019 00:43:57 +0000 (UTC) Received: by mail-ed1-f68.google.com with SMTP id f53so14344662ede.4 for ; Tue, 23 Apr 2019 17:43:57 -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=72lEex7OpAVX7HJkCG/tIwupNe2Mt9BjyGA6FTWOBE8=; b=uA2u0pqKWCyXg/Tp84eZrYvgN7d9eZV+1IO5JGjrfx3UzYwgSAdoqSoTpZT+uYNyV1 Sbq4tiXNFiawBTbUdi0+91llafgUPX4N0DA9rrOsoKiQ7eHt2GqBaX1pypWgPFa2Y74+ 9s3NcCFZV6mjY1/wNUKguTWphNOk26MlxGvuy3puDhn2kBmBsyxul5RQb0PR0flynbqp hyZrg/YqJ/5gwtq2wIICT/L3ZwcU9cdlM93r5U5OqTbXLlvF0T8TNlLRetP7vMqkwMi8 iaqQ8uZqzw3l0bD+BA8YpNetHCst//7RkkWgta1AkzS84m0CrXLsuseDv1pt3aH1jepy fKhg== 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=72lEex7OpAVX7HJkCG/tIwupNe2Mt9BjyGA6FTWOBE8=; b=ArZSCnSqmgSKsQBkh1JKM8roa3VcmhHPF8F7jbczX0JeWyuf4sadGsiHYnJJnVcWzW CM+10cBBuoSMW4ftADY2qvR7qSTUkpXUYVlkMNqXNXL654nmkOjR5o4A/JXOe3NcrgZb Y+8TsFjl/EV4SFU6QcWyyVmLDohs01/ge6gr7KWl1b6+WURUOR0aUqTZcwiKkgfb7Zrv CVS9oZ2Uw5ff5m4l6BDmblNOZ0ebCfkUviCk5cPpTSC26vzLeNH3e00pPBil7RcsKyiN rfPwbR7scmsQ7YayCJlikWZeuoEwWVU1dFHZmcVzS1WtWLrGhd+lxFmqFiXLQ7YuEn5c d9QQ== X-Gm-Message-State: APjAAAVrOBUuKHzjIDIqwPAwTLNRwB7WTJBYqBbvBhDwUUaUi5EMmNFy MWmj5GP3W5zlc4lSPkpyPrkmmg== X-Google-Smtp-Source: APXvYqwC8h1fewZWr3Gk0AbAFcim9pE1GdMhpwU+g6hhft0uprZCGqBsj8ypkGKGwX/HcQkooc+ajQ== X-Received: by 2002:a50:ba8e:: with SMTP id x14mr17821513ede.211.1556066636498; Tue, 23 Apr 2019 17:43:56 -0700 (PDT) Received: from event-horizon.net ([80.111.179.123]) by smtp.gmail.com with ESMTPSA id d59sm616217edc.34.2019.04.23.17.43.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 Apr 2019 17:43:55 -0700 (PDT) From: Bryan O'Donoghue To: trini@konsulko.com, sbabic@denx.de, jens.wiklander@linaro.org, rpjday@crashcourse.ca, fabio.estevam@nxp.com, u-boot@lists.denx.de Date: Wed, 24 Apr 2019 01:43:48 +0100 Message-Id: <20190424004350.31028-3-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190424004350.31028-1-bryan.odonoghue@linaro.org> References: <20190424004350.31028-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 Cc: Breno Lima , Rui Miguel Silva Subject: [U-Boot] [PATCH 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 --- 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 043f2861b6..458cb8fe10 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 #define CONFIG_MXC_UART_BASE UART1_IPS_BASE_ADDR