From patchwork Thu Jun 20 10:07:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1119351 X-Patchwork-Delegate: philipp.tomsich@theobroma-systems.com 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=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="meFemPTW"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45TyFS4qlCz9s3C for ; Thu, 20 Jun 2019 20:08:28 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 4ECD6C21C8B; Thu, 20 Jun 2019 10:08:21 +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_H3, RCVD_IN_MSPIKE_WL, 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 E7C47C21DEC; Thu, 20 Jun 2019 10:08:06 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id E6900C21C29; Thu, 20 Jun 2019 10:08:04 +0000 (UTC) Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by lists.denx.de (Postfix) with ESMTPS id 5598AC21C38 for ; Thu, 20 Jun 2019 10:08:04 +0000 (UTC) Received: by mail-pf1-f194.google.com with SMTP id c85so1404404pfc.1 for ; Thu, 20 Jun 2019 03:08:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=P1Q+D4NexqNNTDIbmFASjLUyHZ2UwrDRPpa+KPUsiiw=; b=meFemPTW3+o+P3faWDllfWx2EJmTHQ/Gu/Wp/bmHWmmyODC4NL061vv8GtUqyiPOnz j3jiCcevjRf8b3K7qdsZU5g72VG0HH2PnmhdeccMohgdfOhjJ8sQSOO3ridIHOLF9FaG yRPhYua8AszFhbWzCKIiD5clyu1oZ/pz9JUS8= 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=P1Q+D4NexqNNTDIbmFASjLUyHZ2UwrDRPpa+KPUsiiw=; b=mo8EUKTeDqZrYyzkrhfRb3gEI9H8a+O5ZHJt0lSkSJJd1xqcX0qWLtrcA9DtwLqWOn 1F8AWedBkG/3nlaYAJQRNtA+cH8wSUA/XlnUWq6CrYr5JZ7A7weMS6pFuBKnvz1evdQh bXaXTHSMX+Q4jgjf2c00+sK3fL9NF89S9kQL5foi1T9ypN/q7XQyUZ4RK55Hf/ulypck 89Z/GqZnJWI01Lu8VI8Dlkgeg3pASAd1Qm2MXJFtQ/YbmCxbaBDHpWfHrBQ6SZd/jpHZ bnTDoyTCbW4eFVIEgbZuT34EP9u0Q8Vsn+5yzkM9l5UBW3KKqW2dKAPqxkF1IgYdyDHM h6fQ== X-Gm-Message-State: APjAAAVFXTmUQcFlQTuQSH2+8mtRAdcZXvfdZTMD4ohfur8SwH6wASem 0aLgNpiEh79M8Xj9yLDZhJbtaQ== X-Google-Smtp-Source: APXvYqz2ZoOogjQzx+kUvFaP0axxLJD7aLz4+Sq3Dkr3eECeWCx1qLO42DusiHmQ/ykI5C6Uq1paaQ== X-Received: by 2002:a17:90a:4803:: with SMTP id a3mr2333160pjh.58.1561025282908; Thu, 20 Jun 2019 03:08:02 -0700 (PDT) Received: from localhost.localdomain ([183.82.229.140]) by smtp.gmail.com with ESMTPSA id x129sm21731387pfb.29.2019.06.20.03.08.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Jun 2019 03:08:02 -0700 (PDT) From: Jagan Teki To: Simon Glass , Philipp Tomsich , Kever Yang , u-boot@lists.denx.de Date: Thu, 20 Jun 2019 15:37:35 +0530 Message-Id: <20190620100740.6560-2-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190620100740.6560-1-jagan@amarulasolutions.com> References: <20190620100740.6560-1-jagan@amarulasolutions.com> MIME-Version: 1.0 Cc: linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com Subject: [U-Boot] [PATCH v4 1/6] Makefile: clean image.map 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" binman tools for creating single image build will create image.map at the end, which has information about binman image node details. current u-boot, is unable to clean this image.map so add a command entry in clean target in Makefile. Signed-off-by: Jagan Teki Reviewed-by: Kever Yang --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9fba74d3ed..804eb2c652 100644 --- a/Makefile +++ b/Makefile @@ -1847,7 +1847,8 @@ clean: $(clean-dirs) -o -name modules.builtin -o -name '.tmp_*.o.*' \ -o -name 'dsdt.aml' -o -name 'dsdt.asl.tmp' -o -name 'dsdt.c' \ -o -name '*.efi' -o -name '*.gcno' -o -name '*.so' \) \ - -type f -print | xargs rm -f + -type f -print | xargs rm -f \ + image.map # mrproper - Delete all generated files, including .config # From patchwork Thu Jun 20 10:07:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1119354 X-Patchwork-Delegate: philipp.tomsich@theobroma-systems.com 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=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="bqblp5Xd"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45TyGq1klzz9s3C for ; Thu, 20 Jun 2019 20:09:39 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id B8A68C21DDC; Thu, 20 Jun 2019 10:08: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=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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 8A2B0C21DCA; Thu, 20 Jun 2019 10:08:18 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 84D7DC21E13; Thu, 20 Jun 2019 10:08:10 +0000 (UTC) Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by lists.denx.de (Postfix) with ESMTPS id 3AC1EC21DFB for ; Thu, 20 Jun 2019 10:08:07 +0000 (UTC) Received: by mail-pg1-f194.google.com with SMTP id y72so1321011pgd.8 for ; Thu, 20 Jun 2019 03:08:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SVhuJQYXib9M0BWgaROsi1M8QbxK1XXxoZLiJe0nmMI=; b=bqblp5XdKpEm58CRKOjyW43YReDEEoIBcck15yKQqbuyj8tFXhFdFm+3f9G3oAsbl+ pGGJFRkoNi3LpX4Nk+J88BNvie9CQ//XzUfOmCkvz43D7iVAyIMPEkMNe6NiaUXRsbgw Sq4COl3KDjXtwiNRx8CvBu3mkIVxwwE3JyK0o= 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=SVhuJQYXib9M0BWgaROsi1M8QbxK1XXxoZLiJe0nmMI=; b=IHGy2Gayr9jo6Ey37VrxNfY1ZcAbyCacWbgcTWKMoEhBVD5xaWXTSqbQP/xvTV+fdN hS9eDLDzvTwFGxbGF/gVnQ7gE7vA9ulji7kM1od7IVjXoyE1aPcUkGvhR1cQgd4eoMnz +Onnp0Qjmu/uuFV/Rzpm4ji8xVu7ns++GJLlUjXDOLXccOTiLbBkw8xrsjJRShSmb7Le lUF3EqmGu4B4bjrOwTAL5A3Vh94jaZ8816P40B930lnjh2RGGoW7t/Fyd9t5yGJq3Ffl Ff+UxVUpG88f1l4Qp+aqK/wBdMz77QT2KguZirJC6vNMp7wKgs24uw6SLWotFgv7XpdS fVcg== X-Gm-Message-State: APjAAAXv2/q+OCqfLdV2a3VANH7A0S8YQAs5rSlameYfIf0V9hNLskaD PRE0hzS3jJOe0loso3WfVNW4vQ== X-Google-Smtp-Source: APXvYqwaDqCm6sEb2yabc/uVf2Z8f5Tk1ImK3IPXkSMOSWg4c95UyeThjZoj/x48tdTW4Zp9ixZJLA== X-Received: by 2002:a17:90a:208e:: with SMTP id f14mr2277560pjg.57.1561025285535; Thu, 20 Jun 2019 03:08:05 -0700 (PDT) Received: from localhost.localdomain ([183.82.229.140]) by smtp.gmail.com with ESMTPSA id x129sm21731387pfb.29.2019.06.20.03.08.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Jun 2019 03:08:05 -0700 (PDT) From: Jagan Teki To: Simon Glass , Philipp Tomsich , Kever Yang , u-boot@lists.denx.de Date: Thu, 20 Jun 2019 15:37:36 +0530 Message-Id: <20190620100740.6560-3-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190620100740.6560-1-jagan@amarulasolutions.com> References: <20190620100740.6560-1-jagan@amarulasolutions.com> MIME-Version: 1.0 Cc: linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com Subject: [U-Boot] [PATCH v4 2/6] Makefile: clean bl31_*.bin 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" Rockchip platform has its python script that would generate various bl31_*bin for creating u-boot.itb file by taking bl31.elf as input. These bl31_*.bin files are generated in u-boot root directory and have no rule to clean it up. so add support for it by adding in command entry of clean target in Makefile. Signed-off-by: Jagan Teki Reviewed-by: Kever Yang --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 804eb2c652..a503ab9fc1 100644 --- a/Makefile +++ b/Makefile @@ -1848,7 +1848,7 @@ clean: $(clean-dirs) -o -name 'dsdt.aml' -o -name 'dsdt.asl.tmp' -o -name 'dsdt.c' \ -o -name '*.efi' -o -name '*.gcno' -o -name '*.so' \) \ -type f -print | xargs rm -f \ - image.map + bl31_*.bin image.map # mrproper - Delete all generated files, including .config # From patchwork Thu Jun 20 10:07:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1119352 X-Patchwork-Delegate: philipp.tomsich@theobroma-systems.com 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=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="YoQDxqYh"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45TyGS5VJJz9s3C for ; Thu, 20 Jun 2019 20:09:20 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 57C0BC21E07; Thu, 20 Jun 2019 10:08:48 +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_H3, RCVD_IN_MSPIKE_WL, 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 258E9C21DEC; Thu, 20 Jun 2019 10:08:25 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 12355C21E35; Thu, 20 Jun 2019 10:08:14 +0000 (UTC) Received: from mail-pg1-f193.google.com (mail-pg1-f193.google.com [209.85.215.193]) by lists.denx.de (Postfix) with ESMTPS id C0E9EC21DAF for ; Thu, 20 Jun 2019 10:08:09 +0000 (UTC) Received: by mail-pg1-f193.google.com with SMTP id v11so1328454pgl.5 for ; Thu, 20 Jun 2019 03:08:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=w5i2VSUzQkRVcoB9lCAN8b89i0Y9O4o5VEZfaAnhAlg=; b=YoQDxqYhyMqdFhmjHR780g9EjeoOolo9AVad3W1AoKDrLt1PMifLuKav6ZNZXMvEFr jfV2YwQdDgxApy+iylQwK/Vu8D9uFF7dSZ9oxUgjMCFeqSGp6QcXAOpiE1rUizPNokmf +M4eVmn+2AdHPhCn3cRawsuMzH/7GUd8F6/0g= 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=w5i2VSUzQkRVcoB9lCAN8b89i0Y9O4o5VEZfaAnhAlg=; b=XnO9WmdqaUoo87TcvqJMPNd6+oauUcTBqJGWWJ/YIzovAw1DWk3Avs/eTIwHdgLUus Q+7RCiweuh708OxsGV6/9I4Hsw9snoQ0PYuvp8dT5FgdZBARsvW60KpFHpGfGo1JrkBy MeGKDuJynBTYoYn7k3wGR01f5pRFWlREZXcq53QOkVT4SBPZGgDzXM43Gzu60yfWgs1I 0GHT4sGhxqz+y+mpMm7yxa4Y8v0l+W2sMQAhnVxbunwbcQRKwEDWsaPq1UsuPAe9xp5O zmM0CP4cL5CWTtzdCOThH9R4B0y38clLv7135GZYexlYDBG3EOOx9NfoMsyqC4nCGTF9 2prQ== X-Gm-Message-State: APjAAAV8465Dt6YovN3W8lysYuEp4qIMZcxBhYAMYcHI1pADwfre+F3p trslUlcQWVf2etvIjYnV4Le2Vw== X-Google-Smtp-Source: APXvYqxz9j7KHyJMCAuHOfKaOh4z1u1rFp+a54hVjIukp3OPheARrfJgpJWJ9+5bZtpC38vM3SGrmg== X-Received: by 2002:a17:90a:a116:: with SMTP id s22mr2236868pjp.47.1561025288338; Thu, 20 Jun 2019 03:08:08 -0700 (PDT) Received: from localhost.localdomain ([183.82.229.140]) by smtp.gmail.com with ESMTPSA id x129sm21731387pfb.29.2019.06.20.03.08.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Jun 2019 03:08:07 -0700 (PDT) From: Jagan Teki To: Simon Glass , Philipp Tomsich , Kever Yang , u-boot@lists.denx.de Date: Thu, 20 Jun 2019 15:37:37 +0530 Message-Id: <20190620100740.6560-4-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190620100740.6560-1-jagan@amarulasolutions.com> References: <20190620100740.6560-1-jagan@amarulasolutions.com> MIME-Version: 1.0 Cc: linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com Subject: [U-Boot] [PATCH v4 3/6] travis.yml: Add pyelftools install entry 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" Currently rockchip platform is using explicit 'make u-boot.itb' for building u-boot.itb but if we enable CONFIG_BUILD_TARGET as 'u-boot.itb' then the resulting u-boot.itb directly will create by make. But, that indeed make travis build fail since it require python-pyelftools host package. So add pyelftools install entry as 'pip install pyelftools', this would create pyelftools on travis host which are required to build rk3399 itb. Signed-off-by: Jagan Teki Reviewed-by: Kever Yang --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 8bd49ef1a5..94b795ef21 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,6 +50,7 @@ install: - . /tmp/venv/bin/activate - pip install pytest==2.8.7 - pip install python-subunit + - pip install pyelftools - grub-mkimage -o ~/grub_x86.efi -O i386-efi normal echo lsefimmap lsefi lsefisystab efinet tftp minicmd - grub-mkimage -o ~/grub_x64.efi -O x86_64-efi normal echo lsefimmap lsefi lsefisystab efinet tftp minicmd - mkdir ~/grub2-arm From patchwork Thu Jun 20 10:07:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1119355 X-Patchwork-Delegate: jagannadh.teki@gmail.com 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=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="Pdt2lpRs"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45TyHj3r15z9s3C for ; Thu, 20 Jun 2019 20:10:25 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 35829C21DF9; Thu, 20 Jun 2019 10:09:29 +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_H3, RCVD_IN_MSPIKE_WL, 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 AD867C21E29; Thu, 20 Jun 2019 10:08:43 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id E1837C21DFD; Thu, 20 Jun 2019 10:08:16 +0000 (UTC) Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by lists.denx.de (Postfix) with ESMTPS id 6043EC21DA6 for ; Thu, 20 Jun 2019 10:08:12 +0000 (UTC) Received: by mail-pf1-f193.google.com with SMTP id c85so1404607pfc.1 for ; Thu, 20 Jun 2019 03:08:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zttVe370+yU3kJRF5UVZnOomEKxVsOXxlVp69LiFmYw=; b=Pdt2lpRs9dO73yg+IMccdvzd0qS8QSTPxjWTBTaLKIFHTeOfe1AHhKjRAkDzOVT0ty 99H1Fyk3TKkVfnnf9Vl+IxHHmewTc+xj/yCNiFNWCyrtNWf6JECB4TD4Sr0LLzl5dnCh xyA74yL4cYw/JUsQg6vjZ4gfx7xthfr18ibr4= 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=zttVe370+yU3kJRF5UVZnOomEKxVsOXxlVp69LiFmYw=; b=uMZTYJ7nLoJoBoukyIlz0OBuiiMQONS+Z+TKpjJp/9TgfwwkgErBLOEFYWWLjow8ml zhk4rZCE9qSL2FBa8aX7hhfa8qinwbM/FVf6I5MrGcMPN+1eLe2MuZcYYifA04PxRlC0 mkB402iHtZfnbj5D4KEASCuHY25qRT0LrbjfWEsF39HUXw808JKUE22h+bayIwQ0viQl 7eIUVUJ3ASx2a6o4jk+TkqBGJPVEwv1BTCGBZoGeku2OJHUzdl/yv4xTUQUA40ffIHvh WYaZMIhBW8rhhSzZcSNAtp9BzuEvqMkJYIqbSsAEyWGndRMTOH1u+xFpMXBd2sy4+7X/ zPFQ== X-Gm-Message-State: APjAAAVNkeFKiNKz0ceHEJMLBNY9o1KRTd71O9BU+WBRJ+RI5Nlomk0s XvfIwzkI71Y/pyKV4faMDEARrw== X-Google-Smtp-Source: APXvYqwIr8ZSNeN+vd61vU4KuKiDPu4PjPjixkEA5o/MU1zN1j/FlWLEcQhkAyybCnP4gExXslE7Ig== X-Received: by 2002:a62:b40a:: with SMTP id h10mr131422396pfn.216.1561025290988; Thu, 20 Jun 2019 03:08:10 -0700 (PDT) Received: from localhost.localdomain ([183.82.229.140]) by smtp.gmail.com with ESMTPSA id x129sm21731387pfb.29.2019.06.20.03.08.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Jun 2019 03:08:10 -0700 (PDT) From: Jagan Teki To: Simon Glass , Philipp Tomsich , Kever Yang , u-boot@lists.denx.de Date: Thu, 20 Jun 2019 15:37:38 +0530 Message-Id: <20190620100740.6560-5-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190620100740.6560-1-jagan@amarulasolutions.com> References: <20190620100740.6560-1-jagan@amarulasolutions.com> MIME-Version: 1.0 Cc: linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com Subject: [U-Boot] [PATCH v4 4/6] rockchip: rk3399: Get bl31.elf via BL31 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" Right now rockchip platform need to copy bl31.elf into u-boot source directory to make use of building u-boot.itb. So, add environment variable BL31 like Allwinner SoC so-that the bl31.elf would available via BL31. If the builds are not exporting BL31 env, the make_fit_atf.py explicitly create dummy bl31.elf in u-boot root directory to satisfy travis builds and it will show the warning on console as WARNING: BL31 file bl31.elf NOT found, resulting binary is non-functional WARNING: Please read Building section in doc/README.rockchip Note, that the dummy bl31 files were created during not exporting BL31 case would be removed via clean target in Makefile. Signed-off-by: Jagan Teki Reviewed-by: Kever Yang --- Makefile | 2 +- arch/arm/mach-rockchip/make_fit_atf.py | 20 ++++++++++++++++++-- doc/README.rockchip | 4 ++-- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index a503ab9fc1..3ede10ff68 100644 --- a/Makefile +++ b/Makefile @@ -1848,7 +1848,7 @@ clean: $(clean-dirs) -o -name 'dsdt.aml' -o -name 'dsdt.asl.tmp' -o -name 'dsdt.c' \ -o -name '*.efi' -o -name '*.gcno' -o -name '*.so' \) \ -type f -print | xargs rm -f \ - bl31_*.bin image.map + bl31.c bl31.elf bl31_*.bin image.map # mrproper - Delete all generated files, including .config # diff --git a/arch/arm/mach-rockchip/make_fit_atf.py b/arch/arm/mach-rockchip/make_fit_atf.py index 212bd0a854..e7d3846a13 100755 --- a/arch/arm/mach-rockchip/make_fit_atf.py +++ b/arch/arm/mach-rockchip/make_fit_atf.py @@ -12,6 +12,7 @@ import os import sys import getopt +import logging # pip install pyelftools from elftools.elf.elffile import ELFFile @@ -89,13 +90,17 @@ def append_conf_section(file, cnt, dtname, segments): file.write('\t\tconfig_%d {\n' % cnt) file.write('\t\t\tdescription = "%s";\n' % dtname) file.write('\t\t\tfirmware = "atf_1";\n') - file.write('\t\t\tloadables = "uboot",') + file.write('\t\t\tloadables = "uboot"') + if segments != 0: + file.write(',') for i in range(1, segments): file.write('"atf_%d"' % (i)) if i != (segments - 1): file.write(',') else: file.write(';\n') + if segments == 0: + file.write(';\n') file.write('\t\t\tfdt = "fdt_1";\n') file.write('\t\t};\n') file.write('\n') @@ -171,8 +176,19 @@ def generate_atf_binary(bl31_file_name): def main(): uboot_elf = "./u-boot" - bl31_elf = "./bl31.elf" + bl31_elf = os.path.isfile("./bl31.elf") fit_its = sys.stdout + if bl31_elf: + bl31_elf = "./bl31.elf" + elif "BL31" in os.environ: + bl31_elf=os.getenv("BL31"); + else: + os.system("echo 'int main(){}' > bl31.c") + os.system("${CROSS_COMPILE}gcc -c bl31.c -o bl31.elf") + bl31_elf = "./bl31.elf" + logging.basicConfig(format='%(levelname)s:%(message)s', level=logging.DEBUG) + logging.warning(' BL31 file bl31.elf NOT found, resulting binary is non-functional') + logging.warning(' Please read Building section in doc/README.rockchip') opts, args = getopt.getopt(sys.argv[1:], "o:u:b:h") for opt, val in opts: diff --git a/doc/README.rockchip b/doc/README.rockchip index 264f7e4994..5680c075fa 100644 --- a/doc/README.rockchip +++ b/doc/README.rockchip @@ -149,8 +149,8 @@ For example: => make realclean => make CROSS_COMPILE=aarch64-linux-gnu- PLAT=rk3399 - (copy bl31.elf into U-Boot root dir) - => cp build/rk3399/release/bl31/bl31.elf /path/to/u-boot + (export bl31.elf) + => export BL31=/path/to/arm-trusted-firmware/build/rk3399/release/bl31/bl31.elf - Compile PMU M0 firmware From patchwork Thu Jun 20 10:07:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1119356 X-Patchwork-Delegate: philipp.tomsich@theobroma-systems.com 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=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="DbHY1y1t"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45TyJX2ZBwz9s3C for ; Thu, 20 Jun 2019 20:11:08 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id D061EC21E0D; Thu, 20 Jun 2019 10:09:01 +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_H3, RCVD_IN_MSPIKE_WL, 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 5DCE9C21E34; Thu, 20 Jun 2019 10:08:35 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 72D2CC21E1A; Thu, 20 Jun 2019 10:08:19 +0000 (UTC) Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by lists.denx.de (Postfix) with ESMTPS id 45A3FC21DAF for ; Thu, 20 Jun 2019 10:08:15 +0000 (UTC) Received: by mail-pl1-f193.google.com with SMTP id bi6so1181777plb.12 for ; Thu, 20 Jun 2019 03:08:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WyK+VrPSIT7CeTUpydw/eTXwdpjjMnF6cxvPbpeUd8I=; b=DbHY1y1tS8lWc/HM4z45W7CprnVx+QXmM+3tEpVhnjZIIue1VAemf3KMfK2Guv/HbG DZlGk64/Q2IYH6/8J9GnKcZXJ6XqhFHJ3ZOILUJhldoD83vIdKd+TAhF9ymxPMlI3OWh a/shkn/nKQjBKpv+XyZ5L4MdjPhGTxPF9YLlA= 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=WyK+VrPSIT7CeTUpydw/eTXwdpjjMnF6cxvPbpeUd8I=; b=QtdL3mVLau02nH5wuEijTfppN84BQ8D28GlyOGmNjwhwiUiJvKQ+4sqqP0TI8o9GaH AxHvwnz16ltvq+C/Q2IkkLs91dzNfOMNl+cSUK9O5RxpWc0OSPxFxubKII8wtq0UcyRL wZQ/lRgTQargOmjTH3SuSCaqtxqhfuNqla95rL8BxQltzr5ch+UDzcwBa+WkDMlkDEd9 V7/4ps9Dn4QFQCRQoqIjTgvX1Hs8Wf4M+rr8Y7xCU92Fp9kYY6CrDpGeMqWHJtLuijEu pNCfF2zJ+/RwehmzokwMVJ3kqkKR/KyDpsUvmIbEKOJ+KV7Np+e0KhGR94VbSRxPc3Rn hlVQ== X-Gm-Message-State: APjAAAXXujf8LETmBGNUdkN8J6PusSZqx4dOIjTLWdYoEMzAISXJg1CG V3l6Zk+7CACUfsJN/E2jf20cXQ== X-Google-Smtp-Source: APXvYqzJEvTyCgx/9SeMSGD6kQdrlko9Muy9wvxUhkn40Tm6rF/B0Z8WqtvhzdHUb6wLXdfQhaUupw== X-Received: by 2002:a17:902:aa83:: with SMTP id d3mr99901332plr.74.1561025293687; Thu, 20 Jun 2019 03:08:13 -0700 (PDT) Received: from localhost.localdomain ([183.82.229.140]) by smtp.gmail.com with ESMTPSA id x129sm21731387pfb.29.2019.06.20.03.08.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Jun 2019 03:08:13 -0700 (PDT) From: Jagan Teki To: Simon Glass , Philipp Tomsich , Kever Yang , u-boot@lists.denx.de Date: Thu, 20 Jun 2019 15:37:39 +0530 Message-Id: <20190620100740.6560-6-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190620100740.6560-1-jagan@amarulasolutions.com> References: <20190620100740.6560-1-jagan@amarulasolutions.com> MIME-Version: 1.0 Cc: linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com Subject: [U-Boot] [PATCH v4 5/6] board: puma: Get bl31.bin via BL31 and rk3399m0.bin via PMUM0 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" Right now puma rk3399 board need to copy bl31-rk3399.bin and rk3399m0.bin into u-boot source directory to make use of building u-boot.itb. So, add environment variable - BL31 for bl31.bin (instead of bl31-rk3399.bin to compatible with other platform BL31 env) - PMUM0 for rk3399m0.bin If the builds are not exporting BL31, PMUM0 env, the fit_spl_atf.sh will notify with warning about which document to refer for more information like this: WARNING: BL31 file bl31.bin NOT found, resulting binary is non-functional Please read Building section in doc/README.rockchip WARNING: PMUM0 file rk3399m0.bin NOT found, resulting binary is non-functional Please read Building section in doc/README.rockchip Signed-off-by: Jagan Teki Reviewed-by: Kever Yang --- .../puma_rk3399/fit_spl_atf.its | 58 ------------ .../puma_rk3399/fit_spl_atf.sh | 94 +++++++++++++++++++ configs/puma-rk3399_defconfig | 2 +- doc/README.rockchip | 8 +- 4 files changed, 99 insertions(+), 63 deletions(-) delete mode 100644 board/theobroma-systems/puma_rk3399/fit_spl_atf.its create mode 100755 board/theobroma-systems/puma_rk3399/fit_spl_atf.sh diff --git a/board/theobroma-systems/puma_rk3399/fit_spl_atf.its b/board/theobroma-systems/puma_rk3399/fit_spl_atf.its deleted file mode 100644 index 530f059f3d..0000000000 --- a/board/theobroma-systems/puma_rk3399/fit_spl_atf.its +++ /dev/null @@ -1,58 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ OR X11 */ -/* - * Copyright (C) 2017 Theobroma Systems Design und Consulting GmbH - * - * Minimal dts for a SPL FIT image payload. - */ - -/dts-v1/; - -/ { - description = "FIT image with U-Boot proper, ATF bl31, M0 Firmware, DTB"; - #address-cells = <1>; - - images { - uboot { - description = "U-Boot (64-bit)"; - data = /incbin/("../../../u-boot-nodtb.bin"); - type = "standalone"; - os = "U-Boot"; - arch = "arm64"; - compression = "none"; - load = <0x00200000>; - }; - atf { - description = "ARM Trusted Firmware"; - data = /incbin/("../../../bl31-rk3399.bin"); - type = "firmware"; - arch = "arm64"; - os = "arm-trusted-firmware"; - compression = "none"; - load = <0x1000>; - entry = <0x1000>; - }; - pmu { - description = "Cortex-M0 firmware"; - data = /incbin/("../../../rk3399m0.bin"); - type = "pmu-firmware"; - compression = "none"; - load = <0x180000>; - }; - fdt { - description = "RK3399-Q7 (Puma) flat device-tree"; - data = /incbin/("../../../u-boot.dtb"); - type = "flat_dt"; - compression = "none"; - }; - }; - - configurations { - default = "conf"; - conf { - description = "Theobroma Systems RK3399-Q7 (Puma) SoM"; - firmware = "atf"; - loadables = "uboot", "pmu"; - fdt = "fdt"; - }; - }; -}; diff --git a/board/theobroma-systems/puma_rk3399/fit_spl_atf.sh b/board/theobroma-systems/puma_rk3399/fit_spl_atf.sh new file mode 100755 index 0000000000..420e7daf4c --- /dev/null +++ b/board/theobroma-systems/puma_rk3399/fit_spl_atf.sh @@ -0,0 +1,94 @@ +#!/bin/sh +# +# SPDX-License-Identifier: GPL-2.0+ +# +# Copyright (C) 2019 Jagan Teki +# +# Based on the board/sunxi/mksunxi_fit_atf.sh +# +# Script to generate FIT image source for 64-bit puma boards with +# U-Boot proper, ATF, PMU firmware and devicetree. +# +# usage: $0 [ [&2 + echo "Please read Building section in doc/README.rockchip" >&2 + BL31=/dev/null +fi + +[ -z "$PMUM0" ] && PMUM0="rk3399m0.bin" + +if [ ! -f $PMUM0 ]; then + echo "WARNING: PMUM0 file $PMUM0 NOT found, resulting binary is non-functional" >&2 + echo "Please read Building section in doc/README.rockchip" >&2 + PMUM0=/dev/null +fi + +cat << __HEADER_EOF +/* SPDX-License-Identifier: GPL-2.0+ OR X11 */ +/* + * Copyright (C) 2017 Theobroma Systems Design und Consulting GmbH + * + * Minimal dts for a SPL FIT image payload. + */ + +/dts-v1/; + +/ { + description = "FIT image with U-Boot proper, ATF bl31, M0 Firmware, DTB"; + #address-cells = <1>; + + images { + uboot { + description = "U-Boot (64-bit)"; + data = /incbin/("u-boot-nodtb.bin"); + type = "standalone"; + arch = "arm64"; + compression = "none"; + load = <0x4a000000>; + }; + atf { + description = "ARM Trusted Firmware"; + data = /incbin/("$BL31"); + type = "firmware"; + arch = "arm64"; + os = "arm-trusted-firmware"; + compression = "none"; + load = <0x1000>; + entry = <0x1000>; + }; + pmu { + description = "Cortex-M0 firmware"; + data = /incbin/("$PMUM0"); + type = "pmu-firmware"; + compression = "none"; + load = <0x180000>; + }; + fdt { + description = "RK3399-Q7 (Puma) flat device-tree"; + data = /incbin/("u-boot.dtb"); + type = "flat_dt"; + compression = "none"; + }; +__HEADER_EOF + +cat << __CONF_HEADER_EOF + }; + + configurations { + default = "conf"; + conf { + description = "Theobroma Systems RK3399-Q7 (Puma) SoM"; + firmware = "atf"; + loadables = "uboot", "pmu"; + fdt = "fdt"; + }; +__CONF_HEADER_EOF + +cat << __ITS_EOF + }; +}; +__ITS_EOF diff --git a/configs/puma-rk3399_defconfig b/configs/puma-rk3399_defconfig index 03f0bfdb59..ebc78fb216 100644 --- a/configs/puma-rk3399_defconfig +++ b/configs/puma-rk3399_defconfig @@ -15,7 +15,7 @@ CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y CONFIG_DEBUG_UART=y -CONFIG_SPL_FIT_SOURCE="board/theobroma-systems/puma_rk3399/fit_spl_atf.its" +CONFIG_SPL_FIT_GENERATOR="board/theobroma-systems/puma_rk3399/fit_spl_atf.sh" CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-puma-haikou.dtb" CONFIG_MISC_INIT_R=y # CONFIG_DISPLAY_CPUINFO is not set diff --git a/doc/README.rockchip b/doc/README.rockchip index 5680c075fa..0ee54cd00e 100644 --- a/doc/README.rockchip +++ b/doc/README.rockchip @@ -137,8 +137,8 @@ For example: => cd arm-trusted-firmware => make CROSS_COMPILE=aarch64-linux-gnu- PLAT=rk3399 bl31 - (copy bl31.bin into U-Boot root dir) - => cp build/rk3399/release/bl31/bl31.bin /path/to/u-boot/bl31-rk3399.bin + (export bl31.bin) + => export BL31=/path/to/arm-trusted-firmware/build/rk3399/release/bl31/bl31.bin For rest of rk3399 boards. @@ -162,8 +162,8 @@ For example: (export cross compiler path for Cortex-M0 PMU) => make CROSS_COMPILE=arm-cortex_m0-eabi- - (copy rk3399m0.bin into U-Boot root dir) - => cp rk3399m0.bin /path/to/u-boot + (export rk3399m0.bin) + => export PMUM0=/path/to/rk3399-cortex-m0/rk3399m0.bin - Compile U-Boot From patchwork Thu Jun 20 10:07:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1119357 X-Patchwork-Delegate: philipp.tomsich@theobroma-systems.com 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=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="RURLjpaY"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45TyJv1y3Gz9s3C for ; Thu, 20 Jun 2019 20:11:27 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id E25C1C21E30; Thu, 20 Jun 2019 10:09: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=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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 12741C21D9A; Thu, 20 Jun 2019 10:08:41 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D27FDC21D8A; Thu, 20 Jun 2019 10:08:21 +0000 (UTC) Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by lists.denx.de (Postfix) with ESMTPS id D65CAC21DB5 for ; Thu, 20 Jun 2019 10:08:17 +0000 (UTC) Received: by mail-pg1-f196.google.com with SMTP id y72so1321269pgd.8 for ; Thu, 20 Jun 2019 03:08:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wVJfdIxX3AOWESls8BSNG7FiUmX2vaUpDqCE9rqexDM=; b=RURLjpaYtL2QTjx/+laxoYAEADu+g/OaAy5EcD+xAA6mJ2MhBO+yohTgMIJ8dkS8JY 3M/N8LsnWBxgSaxukAmTSyvkIV6gr3Z4osanm0m3ZXpsOtnQJyj1gLc763jhSDggmjMD vFI2sdlbuMxD6fu8zDW7eLXFgR4tXyPvIO55I= 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=wVJfdIxX3AOWESls8BSNG7FiUmX2vaUpDqCE9rqexDM=; b=FPtekTrKRrZA7cxehsa43J+lG1CoOfIz8cOv6CDzPsB/geOHTC2xqWOFLxsjCmodqF xUOE8x2Q0odEf1XbpaogyXRG8cIFg6lgpgF3dG5ZdOpllciZHDDlcfdFmpohw25UvW0m NrKPlISbRKkoZP8Gc7hkaAPHBj6ns/DeNon/hzADF0lnp3Hwoh6+MTbHf61AUlrFiMx9 H93SqtQL0tbp9ziMAKTB/fG5pCNX+3CnKPaHms4LgTvA4hzDZEykC23apIFsTmveDuOJ ny8s4TeYkLgCJShtRFIm/+JMgk/oJmmKwbFZNisd6Pbz34XqHKiL4+602cgg1Vdrdnss zHTw== X-Gm-Message-State: APjAAAWMZOFv6qwf7C2qNOB2hv1jTl4XppImng/7U6+jab463XD+E4cL MD0oQqhAGrn+yb7uExsHqMrrZQ== X-Google-Smtp-Source: APXvYqx0A5Wu59pMhfcFmJirFVvQ9/4zOUcFaD93VkaWY/WC2l+H1B0kscaPEn1o7OihPTmzkcPe1Q== X-Received: by 2002:a63:1723:: with SMTP id x35mr7776901pgl.233.1561025296366; Thu, 20 Jun 2019 03:08:16 -0700 (PDT) Received: from localhost.localdomain ([183.82.229.140]) by smtp.gmail.com with ESMTPSA id x129sm21731387pfb.29.2019.06.20.03.08.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Jun 2019 03:08:15 -0700 (PDT) From: Jagan Teki To: Simon Glass , Philipp Tomsich , Kever Yang , u-boot@lists.denx.de Date: Thu, 20 Jun 2019 15:37:40 +0530 Message-Id: <20190620100740.6560-7-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190620100740.6560-1-jagan@amarulasolutions.com> References: <20190620100740.6560-1-jagan@amarulasolutions.com> MIME-Version: 1.0 Cc: linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com Subject: [U-Boot] [PATCH v4 6/6] Kconfig: Add u-boot.itb BUILD_TARGET for Rockchip 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" Add u-boot.itb BUILD_TARGET for Rockchip platform when SPL_LOAD_FIT is being used. This can get rid of building itb explicitly with 'make u-boot.itb' so, from now all required images will build just by make. Signed-off-by: Jagan Teki Reviewed-by: Kever Yang --- Kconfig | 2 +- board/theobroma-systems/puma_rk3399/README | 2 +- board/vamrs/rock960_rk3399/README | 1 - doc/README.rockchip | 2 -- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Kconfig b/Kconfig index 6b44256538..df8f2946c5 100644 --- a/Kconfig +++ b/Kconfig @@ -250,7 +250,7 @@ config BUILD_TARGET default "u-boot-with-spl.sfp" if TARGET_SOCFPGA_GEN5 default "u-boot-spl.kwb" if ARCH_MVEBU && SPL default "u-boot-elf.srec" if RCAR_GEN3 - default "u-boot.itb" if SPL_LOAD_FIT && ARCH_SUNXI + default "u-boot.itb" if SPL_LOAD_FIT && (ROCKCHIP_RK3399 || ARCH_SUNXI) default "u-boot.kwb" if KIRKWOOD default "u-boot-with-spl.bin" if ARCH_AT91 && SPL_NAND_SUPPORT help diff --git a/board/theobroma-systems/puma_rk3399/README b/board/theobroma-systems/puma_rk3399/README index f67dfb451f..9b31b0b379 100644 --- a/board/theobroma-systems/puma_rk3399/README +++ b/board/theobroma-systems/puma_rk3399/README @@ -60,7 +60,7 @@ Creating a SPL image for SD-Card/eMMC Creating a SPL image for SPI-NOR > tools/mkimage -n rk3399 -T rkspi -d spl/u-boot-spl.bin spl_nor.img Create the FIT image containing U-Boot proper, ATF, M0 Firmware, devicetree - > make CROSS_COMPILE=aarch64-linux-gnu- u-boot.itb + > make CROSS_COMPILE=aarch64-linux-gnu- Flash the image =============== diff --git a/board/vamrs/rock960_rk3399/README b/board/vamrs/rock960_rk3399/README index d14399090e..c5c675c4ea 100644 --- a/board/vamrs/rock960_rk3399/README +++ b/board/vamrs/rock960_rk3399/README @@ -61,7 +61,6 @@ Compile the U-Boot > export CROSS_COMPILE=aarch64-linux-gnu- > make rock960-rk3399_defconfig > make - > make u-boot.itb Compile the rkdeveloptool ========================= diff --git a/doc/README.rockchip b/doc/README.rockchip index 0ee54cd00e..fac87ade2c 100644 --- a/doc/README.rockchip +++ b/doc/README.rockchip @@ -103,7 +103,6 @@ For example: => cd /path/to/u-boot => make nanopi-neo4-rk3399_defconfig => make - => make u-boot.itb - Get the rkbin @@ -170,7 +169,6 @@ For example: => cd /path/to/u-boot => make orangepi-rk3399_defconfig => make - => make u-boot.itb (Get spl/u-boot-spl-dtb.bin, u-boot.itb images and some boards would get spl/u-boot-spl.bin since it doesn't enable CONFIG_SPL_OF_CONTROL