From patchwork Thu Mar 28 08:29:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Nie X-Patchwork-Id: 1067885 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="rQVMpVq5"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44VJ471rMfz9sPp for ; Thu, 28 Mar 2019 19:31:19 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id E395AC21E85; Thu, 28 Mar 2019 08:31:16 +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 521C6C21EBB; Thu, 28 Mar 2019 08:30:48 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 8D3BAC21E38; Thu, 28 Mar 2019 08:30:39 +0000 (UTC) Received: from mail-ot1-f65.google.com (mail-ot1-f65.google.com [209.85.210.65]) by lists.denx.de (Postfix) with ESMTPS id B89D1C21E1D for ; Thu, 28 Mar 2019 08:30:32 +0000 (UTC) Received: by mail-ot1-f65.google.com with SMTP id f10so17526473otb.6 for ; Thu, 28 Mar 2019 01:30: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; bh=9rjM+atYur+6FSpM4AF/2P3WrBJgpOmMpUitrHkDMhs=; b=rQVMpVq51QXUoiF1FUmqhAdMrpduWl3gOE8aJfGy4LB88sT6xKsxhljyYFCHGE36Bl 45kg1KLenSWfoLwwiybKUj9o24D2PhLMej+8whJKuTUEaJnEjktegr7Knn9Tj+mz2tg1 IQlBxU440C4vZyer1UdZQfFcfFVS92fyloVjLKDIsfSggQN8zGBcOy/mUgGH4NH6gvEN RCzRu+bUQQ/bwSnIxT8PL4No+Tc2C2KSgQp8ETHvsrn4g8ZJo4w2H1BhhIeU+A52djsp I3/8wyjdtPcRPCiD+xUi2znl0q1ff2tzzKVdv2Kk7c6LcuRI9luNo+HHIQ/LGhw7UaRs PwkQ== 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; bh=9rjM+atYur+6FSpM4AF/2P3WrBJgpOmMpUitrHkDMhs=; b=RnADtMiz/sVB3PJ+hJOMupUupLkSy1Hxh8Eza0h05+elFXNq5LiZ7ArPY0MZwHTB71 Na3d3lxePhljubrJA91T5OMbi2yNN84vTU4O9hRGi6438m6IuQo3h3UvG0lOYWqci6W5 ZN9iD8o9cBGAnR3roZdfYmdXva42osfAH1vSw+CByNjSeClB7AElXLlmTsCK/QoUs2US Pokuc1iRnAtcRD6LR+NlRz0Mk0O0V6VrM5/kT26UJjHFPc3zmeQXGTDtsUEW0b87hhTv Id9SXZ+kTwtkhtNOVnji9A8ID6JKSdgl6O5gQKL0JXlUb/6JMSjOArikojsGLCW+JhW6 i5JQ== X-Gm-Message-State: APjAAAVzWRK/pzew3rafYWBgsAhmOia7GaE2PHWuaUWIQjdx4rwLrPxc 78SQW4sPgmJJvPvUQCuXwcjANQ== X-Google-Smtp-Source: APXvYqxZn5Q33BkAUPrbiFudUZuJ7l/lakJkE2UmNvhOOoTFhg7izfxrIMW+8uxjLvjlbkMZbs1o/A== X-Received: by 2002:a9d:7306:: with SMTP id e6mr28560448otk.79.1553761831693; Thu, 28 Mar 2019 01:30:31 -0700 (PDT) Received: from localhost.localdomain (li808-42.members.linode.com. [104.237.132.42]) by smtp.gmail.com with ESMTPSA id 96sm7290778otf.17.2019.03.28.01.30.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 28 Mar 2019 01:30:31 -0700 (PDT) From: Jun Nie To: festevam@gmail.com, otavio@ossystems.com.br, peng.fan@nxp.com, vanessa.maegima@nxp.com, bryan.odonoghue@linaro.org, u-boot@lists.denx.de Date: Thu, 28 Mar 2019 16:29:56 +0800 Message-Id: <1553761801-2489-2-git-send-email-jun.nie@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1553761801-2489-1-git-send-email-jun.nie@linaro.org> References: <1553761801-2489-1-git-send-email-jun.nie@linaro.org> Subject: [U-Boot] [PATCH v2 1/6] mx7_common: Share configs to skip low level init 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Share configs in mx7 to skip low level init if we are in the case where OPTEE is loaded already (maybe by ARM Trusted Firmware) and that most of the low level initialization is already done and that we may/should skip it doing them here. Fix the definition detection with size detection to decide whether to skip it. Signed-off-by: Jun Nie --- include/configs/mx7_common.h | 11 +++++++++++ include/configs/warp7.h | 11 ----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h index a895c93..912fb06 100644 --- a/include/configs/mx7_common.h +++ b/include/configs/mx7_common.h @@ -57,4 +57,15 @@ #endif #endif +/* + * If we have defined the OPTEE ram size and not OPTEE it means that we were + * launched by OPTEE, because of that we shall skip all the low level + * initialization since it was already done by ATF or OPTEE + */ +#if (CONFIG_OPTEE_TZDRAM_SIZE != 0) +#ifndef CONFIG_OPTEE +#define CONFIG_SKIP_LOWLEVEL_INIT +#endif +#endif + #endif diff --git a/include/configs/warp7.h b/include/configs/warp7.h index 043f286..80ddd72 100644 --- a/include/configs/warp7.h +++ b/include/configs/warp7.h @@ -13,17 +13,6 @@ #define PHYS_SDRAM_SIZE SZ_512M -/* - * If we have defined the OPTEE ram size and not OPTEE it means that we were - * 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 -#define CONFIG_SKIP_LOWLEVEL_INIT -#endif -#endif - #define CONFIG_MXC_UART_BASE UART1_IPS_BASE_ADDR /* Size of malloc() pool */ From patchwork Thu Mar 28 08:29:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Nie X-Patchwork-Id: 1067895 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="ytKvqaID"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44VJ754gbxz9sPg for ; Thu, 28 Mar 2019 19:33:53 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 596BBC21DA1; Thu, 28 Mar 2019 08:32:18 +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 D4A4AC21DF8; Thu, 28 Mar 2019 08:31:01 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D813CC21C4A; Thu, 28 Mar 2019 08:30:43 +0000 (UTC) Received: from mail-ot1-f65.google.com (mail-ot1-f65.google.com [209.85.210.65]) by lists.denx.de (Postfix) with ESMTPS id D2876C21E60 for ; Thu, 28 Mar 2019 08:30:35 +0000 (UTC) Received: by mail-ot1-f65.google.com with SMTP id o74so17538233ota.3 for ; Thu, 28 Mar 2019 01:30:35 -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; bh=nHvYCmZbA1HGtecMnmEyjjYbEPQ4+kzgda18L3QNFX4=; b=ytKvqaIDJvEvOs1UT2KJGZl/RTIdySMWoifzA5cUZWhu9NR7WnqvqnFeuhKP4Gy6xj zbLWO4Zz7tVOFagusvLiFnIpxMITR/FQJ4aYEP1th1fqdxz8FvrvlNRMp6gP9h9ube7p xAKKEGQEsyVK5j67Q5kBuwOhSxWiEYTI/XHSVfwEhgs4nKrwMcvOrgU/WY1kXiqyuVcl JhnwTBd1tT1qyYHZEgojJgtya10q5ZCpRgsJke/AF1zw4KyZODgEBRh4Y4e7DmO7M/w0 koOkCIulP4Di7OcITj9KiC/3hlRdh/BZ0xMCalYMPlK57bghOpKmWPJw2hCpkHaF+Kpc GQbQ== 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; bh=nHvYCmZbA1HGtecMnmEyjjYbEPQ4+kzgda18L3QNFX4=; b=Lgrm9cmoh7C9LbjzLRqTA2HAI6jsKcDyT+NIcHcSjpOKBYtSE+afN7R5B8RcHVrXyu se9UdA9RIClTP7K/KJ3jUgANHxkvZTZlZM06sfpsABlIRaKrgcfH92kE7tLpSKuyjh8O b5p7fjFtdRah5V2VWV09Cf2Eu2/+fzBGSB0FfSuaZC4W2oywepANV2DAXybxnCJ3LDJP vyj+CLL5E0NbIyAaA6ARo82rZIfrtmm1D3kYTxVkubylfKsQqxtC7FqBr4nScXmLAbUo qc/naoQCe6pbyaFCalt8MwbHsfg3ihvcVraopFtNu8CV0RrPnmo1tPTtkK5ohPfvNEEe Y8XQ== X-Gm-Message-State: APjAAAXoQroeIxguhgWRc8926jHab/jvWyHk+Zh05SQ5aPkjOIa5Xdwo 1RkeGkzAlsKo3RPBCu3qyndmeg== X-Google-Smtp-Source: APXvYqwUXj//l26UZy0qJZbaaHsfnWIYqbZdZmmgnDCJ5sjrS/QAK2m39f/I64+MKzDaP2rJQ5GG+A== X-Received: by 2002:a9d:560e:: with SMTP id e14mr8428587oti.31.1553761834807; Thu, 28 Mar 2019 01:30:34 -0700 (PDT) Received: from localhost.localdomain (li808-42.members.linode.com. [104.237.132.42]) by smtp.gmail.com with ESMTPSA id 96sm7290778otf.17.2019.03.28.01.30.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 28 Mar 2019 01:30:34 -0700 (PDT) From: Jun Nie To: festevam@gmail.com, otavio@ossystems.com.br, peng.fan@nxp.com, vanessa.maegima@nxp.com, bryan.odonoghue@linaro.org, u-boot@lists.denx.de Date: Thu, 28 Mar 2019 16:29:57 +0800 Message-Id: <1553761801-2489-3-git-send-email-jun.nie@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1553761801-2489-1-git-send-email-jun.nie@linaro.org> References: <1553761801-2489-1-git-send-email-jun.nie@linaro.org> Subject: [U-Boot] [PATCH v2 2/6] imx: mx7: Add empty arch_cpu_init if skipped 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Add empty arch_cpu_init if low level init is skipped. So that it does not break spl compile though spl is not needed in the skipped case actually. Signed-off-by: Jun Nie --- arch/arm/mach-imx/mx7/soc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm/mach-imx/mx7/soc.c b/arch/arm/mach-imx/mx7/soc.c index 7cfdff0..9b04013 100644 --- a/arch/arm/mach-imx/mx7/soc.c +++ b/arch/arm/mach-imx/mx7/soc.c @@ -286,6 +286,11 @@ int arch_cpu_init(void) return 0; } +#else +int arch_cpu_init(void) +{ + return 0; +} #endif #ifdef CONFIG_ARCH_MISC_INIT From patchwork Thu Mar 28 08:29:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Nie X-Patchwork-Id: 1067893 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="w1G33Lki"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44VJ634Zv4z9sPg for ; Thu, 28 Mar 2019 19:32:58 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 70A64C21E53; Thu, 28 Mar 2019 08:31:56 +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=RCVD_IN_MSPIKE_H2, 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 41FA6C21E52; Thu, 28 Mar 2019 08:30:58 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 55C7DC21E52; Thu, 28 Mar 2019 08:30:46 +0000 (UTC) Received: from mail-oi1-f193.google.com (mail-oi1-f193.google.com [209.85.167.193]) by lists.denx.de (Postfix) with ESMTPS id 3033DC21E38 for ; Thu, 28 Mar 2019 08:30:41 +0000 (UTC) Received: by mail-oi1-f193.google.com with SMTP id e5so3527473oii.0 for ; Thu, 28 Mar 2019 01:30:41 -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; bh=eBo9SoCQOhhEwgHqF4Uh0NfZ8ouiRBr62/Y4tVYLMfk=; b=w1G33Lki0fSOE2T1ACypFENafip8IP1xnQiVjOr1MNys8khCs87ZFasKCzqgam5wcz 8cfFf7rmRansfS5cJ9oLqeZCnygK0PG0ODbpta/yKvIDoeoSIx6xfZsi4Rlgpty9zxEw AOHiKsRZFtCivJLHRNWuzhxeMk4AiLlIEUwRvkZM3G3OKtjZ1vGI9640zMDfSAQAf/P1 qEa4O9YHOBt6R+XXDDvxQHJP59xrG0TT5o77UQ4gxfbJ3XijoBY8DfQQaH48Ka8BOLtA MqIL0vg4d2Vmk/8SXkzc5no6Jdpd4AbTg7IAk21ByRqsDvZRJmYuqKtDAxSUgL/TXW9P Ginw== 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; bh=eBo9SoCQOhhEwgHqF4Uh0NfZ8ouiRBr62/Y4tVYLMfk=; b=qEoeohYG/foA0WAcjqtScYO3WAA6jQg6bsIwhV5/ObYDhaOkUKgGi9fWQ3U0DBZ7Nt 2f3fLLCB+qPDGu8kcF117Mr1d1+TfKRztdzmReVi6ZgAVu+NSTwmC+sel22CoebC2GmM WXkgi+hqBz+v2b+iFAEKmmLSnm5k5eI9YSm6sBJipWE6dnFmn1jweOtPZaqqT1I/gHR/ 0tZxu1xTIuT09y5fnp7qSx8bzpqF68NldmiZmXbHGtI3pkp4vLcm9HlgWX2hrIHuvrAt 2kAJC5cVN9BUFQo/fPqs71QplquyMNMhXs61D6JYdcmQb49nNr5RvtWmG5srz+Jq7B7g 734w== X-Gm-Message-State: APjAAAV/rYaAoygay8RUwLUw7tEl/8X5apM8AU/xgT3A6FILmWI3Br59 K/0UxjTXpjx3fVT87+TKFza5Mw== X-Google-Smtp-Source: APXvYqzc106nrHfgaWKhjD5lh2R0WlA2GEOcvy/tllk2Tk+KODEfRuN2IX9PGj4L7fugn3WmbWeQ/A== X-Received: by 2002:aca:e84c:: with SMTP id f73mr22466948oih.163.1553761837928; Thu, 28 Mar 2019 01:30:37 -0700 (PDT) Received: from localhost.localdomain (li808-42.members.linode.com. [104.237.132.42]) by smtp.gmail.com with ESMTPSA id 96sm7290778otf.17.2019.03.28.01.30.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 28 Mar 2019 01:30:37 -0700 (PDT) From: Jun Nie To: festevam@gmail.com, otavio@ossystems.com.br, peng.fan@nxp.com, vanessa.maegima@nxp.com, bryan.odonoghue@linaro.org, u-boot@lists.denx.de Date: Thu, 28 Mar 2019 16:29:58 +0800 Message-Id: <1553761801-2489-4-git-send-email-jun.nie@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1553761801-2489-1-git-send-email-jun.nie@linaro.org> References: <1553761801-2489-1-git-send-email-jun.nie@linaro.org> Subject: [U-Boot] [PATCH v2 3/6] pico-imx7d: Reserve region of memory to OPTEE 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Subtracts CONFIG_OPTEE_TZDRAM_SIZE from the available DRAM size so that the OPTEE memory is not override during u-boot relocation. Note the OPTEE boot process will itself subtract the DRAM region it lives in from the memory map passed to Linux. Signed-off-by: Jun Nie --- board/technexion/pico-imx7d/pico-imx7d.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/board/technexion/pico-imx7d/pico-imx7d.c b/board/technexion/pico-imx7d/pico-imx7d.c index 53e1469..7c9e145 100644 --- a/board/technexion/pico-imx7d/pico-imx7d.c +++ b/board/technexion/pico-imx7d/pico-imx7d.c @@ -60,6 +60,11 @@ int dram_init(void) { gd->ram_size = imx_ddr_size(); + /* Subtract the defined OPTEE runtime firmware length */ +#ifdef CONFIG_OPTEE_TZDRAM_SIZE + gd->ram_size -= CONFIG_OPTEE_TZDRAM_SIZE; +#endif + return 0; } From patchwork Thu Mar 28 08:29:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Nie X-Patchwork-Id: 1067891 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="dB9vqeM0"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44VJ504lQrz9sPj for ; Thu, 28 Mar 2019 19:32:02 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 7E737C21E5B; Thu, 28 Mar 2019 08:31:30 +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=RCVD_IN_MSPIKE_H2, 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 2ACADC21E31; Thu, 28 Mar 2019 08:30:53 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 59863C21E1D; Thu, 28 Mar 2019 08:30:46 +0000 (UTC) Received: from mail-oi1-f196.google.com (mail-oi1-f196.google.com [209.85.167.196]) by lists.denx.de (Postfix) with ESMTPS id 1A6B3C21E35 for ; Thu, 28 Mar 2019 08:30:42 +0000 (UTC) Received: by mail-oi1-f196.google.com with SMTP id j132so15130555oib.2 for ; Thu, 28 Mar 2019 01:30:42 -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; bh=HiL9Swht3sy9H3RnMHt239KJcMqMrzbGw0dz9Q9sJ+I=; b=dB9vqeM0793TMecHCzjASXVuPEYKG3GFKkK2QSw9xM6xvW6+agWQCP4ZhKV4MtiNHt ktxSSE0nG9lxWYDJ/FcAp9NbNYg8dlDLjIm3Tpf15poO+UaGqIb1SOv+A5Nur0jYRJxC G0BJVsofS4rLIwMpHuun3cgRp5m01s/JBQWShxOo4d0Mlchhu+OI+ltNsTpjWIoAYwlX zDlKXgXdeVK3HCyjNSP9fJcYV846SPNfQJ0mb2heL0t29BFzgG3CV562L0fWPTxknwKn asXiEw8RNumDvjJGZn+LKzDW0GAO/NRAApQ1kthziyZGyAkuJebmeqzGBsyHjMpHJPKs 7x/A== 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; bh=HiL9Swht3sy9H3RnMHt239KJcMqMrzbGw0dz9Q9sJ+I=; b=NuGreIYXFU+7oF1PEKiBIzFpZkMZvlV0zOz9ZBIGx3rR/6xVQtIkM9p7PZGpe2Hi/+ WqoPVnwb9aeMXx8kt0X6X2OtLUbNjRIooIsmGeL42gR9aQgJaJ2sBoSOuI8ccLzP+G76 oQ6+HoUsSnMypCblakm2Kr7xbm8ad5EGi1eP+4xep50q2z38Bdzzj20UHy3VRZe27Wr/ BGPtJBQDxuAYBOwxIxUC5u/MAmlHAp01p3eFte1zwCANY57a0asLH1+FQ16RsHXFphvG /RRDYkquHj4ZrxNSq7mg/WRwK4F/9TB7ooDXBvLRCZ+5elc2hEQJmHd21H9NekiSrBLZ IctA== X-Gm-Message-State: APjAAAVyFw/Uv5oPh5qmzRID9S/4AU+qiILKNKToRGqMOeYo/2D61Vn1 xT2gBBI+PB4lP7WORAUHDh5SPg== X-Google-Smtp-Source: APXvYqwE5XGZLobBV6RM8Wrg9a4IwPBn22LTXQifcVKeqxOAPuuIYthatOTnCU77AyuTQfCr+VLsXw== X-Received: by 2002:aca:bdc4:: with SMTP id n187mr517733oif.140.1553761840995; Thu, 28 Mar 2019 01:30:40 -0700 (PDT) Received: from localhost.localdomain (li808-42.members.linode.com. [104.237.132.42]) by smtp.gmail.com with ESMTPSA id 96sm7290778otf.17.2019.03.28.01.30.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 28 Mar 2019 01:30:40 -0700 (PDT) From: Jun Nie To: festevam@gmail.com, otavio@ossystems.com.br, peng.fan@nxp.com, vanessa.maegima@nxp.com, bryan.odonoghue@linaro.org, u-boot@lists.denx.de Date: Thu, 28 Mar 2019 16:29:59 +0800 Message-Id: <1553761801-2489-5-git-send-email-jun.nie@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1553761801-2489-1-git-send-email-jun.nie@linaro.org> References: <1553761801-2489-1-git-send-email-jun.nie@linaro.org> Subject: [U-Boot] [PATCH v2 4/6] pico-imx7d: Add boot option for verified boot 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Add boot option to boot from fitimage to support verified boot. The boot script plain text file should be packed into fit blob as image with name of bootscr. Signed-off-by: Jun Nie --- include/configs/pico-imx7d.h | 38 +++++++++++++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h index 1884c58..8eb9064 100644 --- a/include/configs/pico-imx7d.h +++ b/include/configs/pico-imx7d.h @@ -52,11 +52,29 @@ "/boot/imx7d-pico-pi.dtb ext4 0 1;" \ "rootfs part 0 1\0" \ -#define BOOTMENU_ENV \ +/* When booting with FIT specify the node entry containing boot.scr */ +#if defined(CONFIG_FIT) +#define PICO_BOOT_ENV \ + "bootscr_fitimage_name=bootscr\0" \ + "bootscriptaddr=0x83200000\0" \ + "fdtovaddr=0x83100000\0" \ + "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \ + "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \ + "mmcargs=setenv bootargs console=${console},${baudrate} " \ + "rootwait rw;\0" \ + "loadbootscript=" \ + "load mmc ${mmcdev}:${mmcpart} ${bootscriptaddr} ${script};\0" \ + "bootscript=echo Running bootscript from mmc ...; " \ + "source ${bootscriptaddr}:${bootscr_fitimage_name}\0" +#else +#define PICO_BOOT_ENV \ "bootmenu_0=Boot using PICO-Hobbit baseboard=" \ "setenv fdtfile imx7d-pico-hobbit.dtb\0" \ "bootmenu_1=Boot using PICO-Pi baseboard=" \ "setenv fdtfile imx7d-pico-pi.dtb\0" \ + BOOTENV +#endif + #define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */ #define CONFIG_SYS_MMC_IMG_LOAD_PART 1 @@ -68,7 +86,6 @@ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ - BOOTMENU_ENV \ "fdt_addr=0x83000000\0" \ "fdt_addr_r=0x83000000\0" \ "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ @@ -88,7 +105,22 @@ "name=rootfs,size=0,uuid=${uuid_gpt_rootfs}\0" \ "fastboot_partition_alias_system=rootfs\0" \ "setup_emmc=mmc dev 0; gpt write mmc 0 $partitions; reset;\0" \ - BOOTENV + PICO_BOOT_ENV + +#if defined(CONFIG_FIT) +#define CONFIG_BOOTCOMMAND \ + "mmc dev ${mmcdev};" \ + "mmc dev ${mmcdev}; if mmc rescan; then " \ + "if run loadbootscript; then " \ + "iminfo ${bootscriptaddr};" \ + "if test $? -eq 1; then hab_failsafe; fi;" \ + "run bootscript; " \ + "else " \ + "echo Fail to load fitImage with boot script;" \ + "hab_failsafe;" \ + "fi; " \ + "fi" +#endif #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0) \ From patchwork Thu Mar 28 08:30:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Nie X-Patchwork-Id: 1067892 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="pn6X/5sB"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44VJ5K6BV3z9sPj for ; Thu, 28 Mar 2019 19:32:21 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 52F0CC21E60; Thu, 28 Mar 2019 08:31:43 +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.8 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID, UPPERCASE_50_75 autolearn=no autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id C262EC21E2C; Thu, 28 Mar 2019 08:30:56 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 07F01C21E52; Thu, 28 Mar 2019 08:30:49 +0000 (UTC) Received: from mail-oi1-f196.google.com (mail-oi1-f196.google.com [209.85.167.196]) by lists.denx.de (Postfix) with ESMTPS id 405BEC21DF8 for ; Thu, 28 Mar 2019 08:30:45 +0000 (UTC) Received: by mail-oi1-f196.google.com with SMTP id e5so3527638oii.0 for ; Thu, 28 Mar 2019 01:30:45 -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; bh=L/lZMSpkPtolscE3TEWnP0ik9uMRCfbu9sGkQZdDQ74=; b=pn6X/5sBM8fTOJ5tj0Lyz1b3hFxBEIxXoKrl64as5qWW8yUcpb2/3BS7vd6JU9I5Yf 40cfpRiITNGsd74e1/0bOwFIW64qjPUMwSJD5mAPgI4y7OVgHVOu6qEskdUhha5krWSq zKNk4crqwpuTEW2TlhbzJiuuYEaRYnaH+dI0SweATV6+UvAfrNOtTceMddJ3e8BEdhO4 jR4Xht3A4E7RjYZImoUMM/nrCuxHa+ux20XV0qFMtDSScFGZze8R4pTgBaYSOw0pOdtg X7sAsyLRpgIw6eZpqEf1wzmbwmjNRYeg9wDJ2EnKmsZ7x17aDcBBv5eM9RglvHLVTxmj esrw== 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; bh=L/lZMSpkPtolscE3TEWnP0ik9uMRCfbu9sGkQZdDQ74=; b=L4YvMHEWTLtNh/H1MQXrYL775zjLzkOZcd1sv3cRq+OeiiYQyXeJzgyulazCJWUZIr CcWTFpxg6aC/7ieDrgUC56kWaN0X1kkE8w6q5EEp6rpzF41yzaqbL1DtUIiZKbTAiHih WBS/2dCixmN/pyjqUPwbxQaql31AqTgWvbqU3Of/RUBbsprLhDhKXmsfhCGQ3ZjIBfaJ O1vuTV9QJ0hLKSGg637ZvBvcG6LcVRX12utg7Bz0k9pVLA1wa5wIXlcJk7BcnH7MGSm7 7Zyk5Prs03ump4fiCMQxkprRYtTBsvRAogQ+TCiDSL2HQQZ17AkYDiDB2Y10QvR7FaKd BWqg== X-Gm-Message-State: APjAAAU0MlPrJTYcKyGOjvbEUc40/J0R5CVQr9aB8XM7bxYJPRVeoNjJ BWoZPvq0OYTzopgkqz0EnLCO1A== X-Google-Smtp-Source: APXvYqwbcM/7zOiVV557CbZPMbvzwapg/72q72WhKtZvqeK8GfqFaqKjQIREyYnl4DU8SXQeuzuPBA== X-Received: by 2002:aca:cf96:: with SMTP id f144mr22305048oig.19.1553761844150; Thu, 28 Mar 2019 01:30:44 -0700 (PDT) Received: from localhost.localdomain (li808-42.members.linode.com. [104.237.132.42]) by smtp.gmail.com with ESMTPSA id 96sm7290778otf.17.2019.03.28.01.30.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 28 Mar 2019 01:30:43 -0700 (PDT) From: Jun Nie To: festevam@gmail.com, otavio@ossystems.com.br, peng.fan@nxp.com, vanessa.maegima@nxp.com, bryan.odonoghue@linaro.org, u-boot@lists.denx.de Date: Thu, 28 Mar 2019 16:30:00 +0800 Message-Id: <1553761801-2489-6-git-send-email-jun.nie@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1553761801-2489-1-git-send-email-jun.nie@linaro.org> References: <1553761801-2489-1-git-send-email-jun.nie@linaro.org> Subject: [U-Boot] [PATCH v2 5/6] pico-imx7d: Add bl33 config 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Add default configuration to run u-boot as BL33 in the boot flow case of ATF(ARM Trusted Firmware) -> OPTEE -> U-boot. Signed-off-by: Jun Nie --- configs/pico-imx7d_bl33_defconfig | 61 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 configs/pico-imx7d_bl33_defconfig diff --git a/configs/pico-imx7d_bl33_defconfig b/configs/pico-imx7d_bl33_defconfig new file mode 100644 index 0000000..77e46d5 --- /dev/null +++ b/configs/pico-imx7d_bl33_defconfig @@ -0,0 +1,61 @@ +CONFIG_ARM=y +CONFIG_ARCH_MX7=y +CONFIG_SYS_TEXT_BASE=0x87800000 +CONFIG_SPL_GPIO_SUPPORT=y +CONFIG_SPL_LIBCOMMON_SUPPORT=y +CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_SECURE_BOOT=y +CONFIG_TARGET_PICO_IMX7D=y +CONFIG_SPL_MMC_SUPPORT=y +CONFIG_SPL_SERIAL_SUPPORT=y +CONFIG_SPL=y +CONFIG_ARMV7_BOOT_SEC_DEFAULT=y +CONFIG_FIT=y +CONFIG_FIT_SIGNATURE=y +CONFIG_FIT_VERBOSE=y +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" +CONFIG_DEFAULT_FDT_FILE="imx7d-pico-pi.dtb" +CONFIG_BOUNCE_BUFFER=y +CONFIG_SPL_I2C_SUPPORT=y +CONFIG_SPL_USB_HOST_SUPPORT=y +CONFIG_SPL_USB_GADGET=y +CONFIG_SPL_USB_SDP_SUPPORT=y +CONFIG_HUSH_PARSER=y +# CONFIG_CMD_BOOTD is not set +CONFIG_CMD_BOOTZ=y +CONFIG_CMD_SPL=y +CONFIG_CMD_SPL_WRITE_SIZE=0x20000 +CONFIG_CMD_MEMTEST=y +CONFIG_CMD_DFU=y +CONFIG_CMD_GPIO=y +CONFIG_CMD_GPT=y +CONFIG_CMD_I2C=y +CONFIG_CMD_MMC=y +CONFIG_CMD_USB=y +CONFIG_CMD_USB_SDP=y +CONFIG_CMD_USB_MASS_STORAGE=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_PXE=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_FAT=y +CONFIG_CMD_FS_GENERIC=y +CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_DFU_MMC=y +CONFIG_FSL_ESDHC=y +CONFIG_PHYLIB=y +CONFIG_MII=y +CONFIG_USB=y +CONFIG_USB_EHCI_HCD=y +CONFIG_MXC_USB_OTG_HACTIVE=y +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_MANUFACTURER="FSL" +CONFIG_USB_GADGET_VENDOR_NUM=0x0525 +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 +CONFIG_CI_UDC=y +CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_USB_ETHER=y +CONFIG_USB_ETH_CDC=y +CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00" +CONFIG_OF_LIBFDT=y +CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_OPTEE_TZDRAM_SIZE=0x2000000 From patchwork Thu Mar 28 08:30:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Nie X-Patchwork-Id: 1067894 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="uWcqUWgJ"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44VJ6T4870z9sPg for ; Thu, 28 Mar 2019 19:33:21 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 446CBC21E18; Thu, 28 Mar 2019 08:32:32 +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 6A242C21E47; Thu, 28 Mar 2019 08:31:19 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id AC67BC21E7E; Thu, 28 Mar 2019 08:31:17 +0000 (UTC) Received: from mail-ot1-f65.google.com (mail-ot1-f65.google.com [209.85.210.65]) by lists.denx.de (Postfix) with ESMTPS id 4834BC21EBA for ; Thu, 28 Mar 2019 08:30:48 +0000 (UTC) Received: by mail-ot1-f65.google.com with SMTP id o74so17538697ota.3 for ; Thu, 28 Mar 2019 01:30:48 -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; bh=maHR4+keW1aQruO0KkUWMPGnNU8PhbdSU8cY/uLvIUY=; b=uWcqUWgJlFyzdv8s3PUu9H90Xb0eHL7tfWVTx5N1vrIZESju8U5RwoSmH96Q+Vg04V kISkSQP5G6IAAT21jGWsg51cPDfl27EOrdPqQc0mzAOSkLnyGwC1rQFyrz4pAPbjIYvU gPzsK8gW6uJB7blrdNiiNr3VYTJ/Clr7+okhV+o6PqUu2t325jg3xFB5QVTCrowViO1v 2VU0Uapm77a98hkI+8ffuoID/9YvU7yFKCENbAOQ0PQTSg/SHysc8YEVthFMe3PUokLq 1qneQHwaW6mITue4Q2gLMb/KBl/X4QrwdT9a8jvXAbKYmZomfm1d25rILASEKtsfpIx2 Uvlw== 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; bh=maHR4+keW1aQruO0KkUWMPGnNU8PhbdSU8cY/uLvIUY=; b=TqLLITdbR6X+Cz7cG5VN7++PNXF6iT0Hu+6BXCptlkEkSO5ATyQLLhmb6p9PdmI6Vf b+D8wWuzZB0Ji9DdK/Uizjsr+0DXmqe2FmWqVpcf20IW14motHTpqFcpCX/gkW6w5pET qYDeI79ADYxqSFRtnUXihUSFoohJT6j+ljGonDAvgGlhw9NZBfS7BxBhxdl0X77bNt+2 rMj9OCLDfKW7VNTlmkqbBnceiMRna3oKDVWqyVGQVyzL0r6liDTicStHa2FZJI4aXuK7 lbg1++WaqINQ3PplJYOVU5Z72N3xqGHU9UI9mzyaz7eSflvkl9NOaatQ153/xhoEMW5Z ul2A== X-Gm-Message-State: APjAAAWVITEXlH2uW40HgwiugyvcOPWu3eE22DVUyAvrG3ms2y9tbG65 FNl9u2tvV/agS5tJXY5YD30hYA== X-Google-Smtp-Source: APXvYqzq3Q/EzKmXguqJCUnxj2MG3jKxslCJiEd7ruv1VDBBWSa9BOfp3UlQoW//YqbegUImTvKWhQ== X-Received: by 2002:a9d:7342:: with SMTP id l2mr30163011otk.56.1553761847213; Thu, 28 Mar 2019 01:30:47 -0700 (PDT) Received: from localhost.localdomain (li808-42.members.linode.com. [104.237.132.42]) by smtp.gmail.com with ESMTPSA id 96sm7290778otf.17.2019.03.28.01.30.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 28 Mar 2019 01:30:46 -0700 (PDT) From: Jun Nie To: festevam@gmail.com, otavio@ossystems.com.br, peng.fan@nxp.com, vanessa.maegima@nxp.com, bryan.odonoghue@linaro.org, u-boot@lists.denx.de Date: Thu, 28 Mar 2019 16:30:01 +0800 Message-Id: <1553761801-2489-7-git-send-email-jun.nie@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1553761801-2489-1-git-send-email-jun.nie@linaro.org> References: <1553761801-2489-1-git-send-email-jun.nie@linaro.org> Subject: [U-Boot] [PATCH v2 6/6] pico-imx7d: Correct uart clock root 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Correct uart clock root ID. Incorrect ID may result the clock is gated because rate value 0 is returned in imx_get_uartclk() Signed-off-by: Jun Nie --- arch/arm/include/asm/arch-mx7/clock.h | 5 +++++ arch/arm/mach-imx/mx7/clock.c | 2 +- include/configs/pico-imx7d.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/arch/arm/include/asm/arch-mx7/clock.h b/arch/arm/include/asm/arch-mx7/clock.h index f56564e..b6a1768 100644 --- a/arch/arm/include/asm/arch-mx7/clock.h +++ b/arch/arm/include/asm/arch-mx7/clock.h @@ -175,6 +175,11 @@ enum clk_root_index { CLK_ROOT_MAX, }; +/* Use UART1_CLK_ROOT as default root clk if platform does define it */ +#ifndef UART_CLK_ROOT +#define UART_CLK_ROOT UART1_CLK_ROOT +#endif + struct clk_root_setting { enum clk_root_index root; u32 setting; diff --git a/arch/arm/mach-imx/mx7/clock.c b/arch/arm/mach-imx/mx7/clock.c index 8cda71c..e364b16 100644 --- a/arch/arm/mach-imx/mx7/clock.c +++ b/arch/arm/mach-imx/mx7/clock.c @@ -53,7 +53,7 @@ static u32 get_ipg_clk(void) u32 imx_get_uartclk(void) { - return get_root_clk(UART1_CLK_ROOT); + return get_root_clk(UART_CLK_ROOT); } u32 imx_get_fecclk(void) diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h index 8eb9064..9806348 100644 --- a/include/configs/pico-imx7d.h +++ b/include/configs/pico-imx7d.h @@ -28,6 +28,7 @@ #define CONFIG_SYS_MALLOC_LEN (32 * SZ_1M) #define CONFIG_MXC_UART_BASE UART5_IPS_BASE_ADDR +#define UART_CLK_ROOT UART5_CLK_ROOT /* Network */ #define CONFIG_FEC_MXC