From patchwork Tue May 7 18:52:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 10933597 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4CD0514DB for ; Tue, 7 May 2019 18:53:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 39E9C2891A for ; Tue, 7 May 2019 18:53:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2DE8E28928; Tue, 7 May 2019 18:53:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 56E5E28927 for ; Tue, 7 May 2019 18:53:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=j8I3KQmKOvsoZQFk6qlyxYcHt19dbwvm/tx970B5520=; b=VqcD8gWK127tSN w6NR9LbsAz9fsqO7/YIX31qbHZJCwyAXVrhynrEWeTNnw10xpbWJVLm+uUkA8MNr0Uv6jEJ/PjZKa VUzK6tZz986NCT+M2HkTmGpmp9Wsj5Zkjl6inD2hTuMd5AvbIrShNLuYCJ1AQg0tZCglRZGhLDhj9 A3882H1JL79iFtFNY2PCsiLW8Yt6onSKioLt9xG0FqRyDrnbGBNrZIlxdvQL/5qhm+wrwfEIxnfDz ahkEP20rjNTuk6nSU+7F0PY1QNrH2h/FuST4HZM+NAG086gDSs44q+Y7FvF2cW3V9SZDBAuJOEiSG jnug2WawPY8BBjxyaaXg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hO5DH-0005nd-L3; Tue, 07 May 2019 18:53:15 +0000 Received: from mail-pg1-x542.google.com ([2607:f8b0:4864:20::542]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hO5DF-0005mn-5y for linux-rockchip@lists.infradead.org; Tue, 07 May 2019 18:53:14 +0000 Received: by mail-pg1-x542.google.com with SMTP id c13so8770757pgt.1 for ; Tue, 07 May 2019 11:53:13 -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=2T/g02vSdhzKLNB1+UB5bfvHoCpXVenojxqrwIbyhYc=; b=cpyAIKIoKpZrGymEpFJYyZk9DgKe01Dqwya2w2Lo2zTKoczh2UjIdoI5xgXXiotwXT YG/t8ITUDSJbYiG7xpc1VS/xu1E8UQjeZhutLn2Hs6iozH6VxPo35cEINPjA0FNmdvfK EjyToP3MKKLN2wtTPmTiEz2HeCLsGf5zh8ZPM= 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=2T/g02vSdhzKLNB1+UB5bfvHoCpXVenojxqrwIbyhYc=; b=jr38SxsJ1jdFd+1suGrePqNjeIQyZQQioAQYWjutBu4aL8dvftpvuSyOjMI27aQ0Eb P50oggpO0Z5v5R8Q4KOEQuoE5lMMUJpfa/6xefxiNb+/Pf8DVKU5OuaUhfNQ+w8bTJJo DUfSMwfCknoHG7LwVjCjL3TF+g42tnZjexEKS+NWvyd1pD9dSiRkYyve9l8/PMot2pdq jtzyXTwP5FKkr3gfxga5+05RA1cib5vuZsLB+3t/hmLhGrCPcp+Pm2gxHOUNBSX2L9sl mxhqpoFV73QFZwomC//aI4yTbs34Wafu5ecZfTBu6OXGuOCfmgLo9UX9su8zllUMhNix p3ig== X-Gm-Message-State: APjAAAX+KM5XzWCHb+P6E8V9h7NaYayAk7bJscpaN9kFMXGSsMYR5wEi 9zGLjQ78uKco8nGcnPIWQbd34A== X-Google-Smtp-Source: APXvYqybISpj6Ou110zkXfY6V11+rGT9s+2NaJ2XTHznRCDZ+acqilpNKPnqTw5cN0RHFIL3/XGJfw== X-Received: by 2002:a63:1c6:: with SMTP id 189mr39955860pgb.22.1557255192569; Tue, 07 May 2019 11:53:12 -0700 (PDT) Received: from localhost.localdomain ([115.97.185.144]) by smtp.gmail.com with ESMTPSA id l83sm14668086pfi.150.2019.05.07.11.53.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 May 2019 11:53:12 -0700 (PDT) From: Jagan Teki To: Simon Glass , Philipp Tomsich , Kever Yang Subject: [PATCH v3 1/6] Makefile: clean image.map Date: Wed, 8 May 2019 00:22:10 +0530 Message-Id: <20190507185215.15441-2-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190507185215.15441-1-jagan@amarulasolutions.com> References: <20190507185215.15441-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190507_115313_222114_5940F4CB X-CRM114-Status: UNSURE ( 9.79 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, Jagan Teki , u-boot@lists.denx.de Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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 d6a6ef19ab..de11446ed3 100644 --- a/Makefile +++ b/Makefile @@ -1813,7 +1813,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 Tue May 7 18:52:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 10933603 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3E37614DB for ; Tue, 7 May 2019 18:53:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2CB0F2891A for ; Tue, 7 May 2019 18:53:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2115628928; Tue, 7 May 2019 18:53:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D00F02891A for ; Tue, 7 May 2019 18:53:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=A+yZbLF+TVwukc0M3Pr8XiG/Sk6FZQ7NpzElmxwdF7c=; b=mOp1inXQLZMrBj DaoTFH6diJaXehskNOFoi9apf2OI9YevGxECyLRPDspaJR4tZ4fOIK+Hn2HKM35HfK6/2MabjCt+S OP3vre/hBM40uYy9mVYFRn/6vGhWvp0AmcSE5N1qhXEsIHOm+jdmNfdV5dafF8Eo1+xH9G5EuY/Lr w+Hu1bhyam6ix3KYNy815IRxYsNV7gRr6jgalYawXxxd36SEJpMFo2hNcA0550w2i/4zE+/nA/CNv VCJLbfo1dY68d3e8XeHEwfW9P94UHGlJ0HjWSfq6TYuqB32iVUCkK+Kn73V2GDk07TYCTtMafjD4w SdnCaw/ZNtOQtilvHt9g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hO5DL-0005qT-Bu; Tue, 07 May 2019 18:53:19 +0000 Received: from mail-pl1-x642.google.com ([2607:f8b0:4864:20::642]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hO5DI-0005nz-C9 for linux-rockchip@lists.infradead.org; Tue, 07 May 2019 18:53:17 +0000 Received: by mail-pl1-x642.google.com with SMTP id bi2so8613093plb.13 for ; Tue, 07 May 2019 11:53:16 -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=5NdEw/MFl+V1N8bCDji05Xp8skxj9vixXwwnqbrnruo=; b=LgTavitKD0+ytd6ZGgZyETwYtpL/cQsq1Pc5YrDe/k0jyRpv9tkbLROFQZW/nc1uzL GMOpEC8IB0LTSFJBseewDFYtX7LlxKDd5iJCi8QVyZCGYle0E8liexnmebwykmDr6T9B NtFaZQyl5j9Xz1xW0OFMvd92M+mEyrUxUY0Hc= 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=5NdEw/MFl+V1N8bCDji05Xp8skxj9vixXwwnqbrnruo=; b=IKuTeWU4hFtGmjcqxJULTu2J9ICqgSOWN8+k1IyWyDpK7jnr4vpsBd2albRCtexF8V Edu+HSkcOqKNH6egqjb3Q3QA6R8EjG/rwwaBNW1mpBtWWQefb4beZ1ayVT8o5FCdXLW3 wW0AFO2PljEcihKGEydjfzHBeDQdUe6M7L056ncf9+wl25ydfPSucjAOBc9D6xhJ7kPz YA2uFuVV1HMEiQUMWPENihCJZNKLw82pzaw9pT2QmXloykzHeKaSn7nTNJuUjiwYcXxO +cmvhO9jdI0nxMEL2pI/936aoSHt7QAu48OqB41RwxlvVG05qlUn3pHGBsHq3BS+4kh8 VQ7w== X-Gm-Message-State: APjAAAV9rI/T0WuYVlkjnnB2z6PTBzG8IvuEOObfbA/O/1FFJPV6ZHe6 nzgiVTyEFnUxufbppqJRNXJg/Q== X-Google-Smtp-Source: APXvYqyv4qBgoWYiA+4VgHlfafIQmIYUG0xG0zVsuIWmD4RXnS4iKQAa9c5Gma4bt1tzOBRrfdQIHQ== X-Received: by 2002:a17:902:fa2:: with SMTP id 31mr42827839plz.128.1557255195730; Tue, 07 May 2019 11:53:15 -0700 (PDT) Received: from localhost.localdomain ([115.97.185.144]) by smtp.gmail.com with ESMTPSA id l83sm14668086pfi.150.2019.05.07.11.53.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 May 2019 11:53:14 -0700 (PDT) From: Jagan Teki To: Simon Glass , Philipp Tomsich , Kever Yang Subject: [PATCH v3 2/6] Makefile: clean bl31_*.bin Date: Wed, 8 May 2019 00:22:11 +0530 Message-Id: <20190507185215.15441-3-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190507185215.15441-1-jagan@amarulasolutions.com> References: <20190507185215.15441-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190507_115316_538849_C54E5C85 X-CRM114-Status: GOOD ( 10.79 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, Jagan Teki , u-boot@lists.denx.de Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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 de11446ed3..64c7976f7e 100644 --- a/Makefile +++ b/Makefile @@ -1814,7 +1814,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 Tue May 7 18:52:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 10933605 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0069813AD for ; Tue, 7 May 2019 18:53:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E24F6205D1 for ; Tue, 7 May 2019 18:53:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D5FDC2891A; Tue, 7 May 2019 18:53:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8F1EE205D1 for ; Tue, 7 May 2019 18:53:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=K7K8ZiKHuWOxjaWyYZh5MO3nrSeQZZd2ZPobVL/94wY=; b=mLeMvRNtYLIpvQ KdxA2sSkuPDd4jqzDg9UDCEa0sVn97Jm8/UosUyMeODw/Euf0aGwl0V9CPrxai3hIlF7YstP7YA30 9s1/aaaQRi8+5ygMf72yuVDf4HK5MK1NGbAL90zLc96dzSzvTUR2lwzh/f4sG9pmjm8RACZ8su9Uw G7heS8fWzjjWRErpdRp4dd0/bTomJwerHGtyuqIlj69GHZR1zSiUicfEza27Dci60raanC20VRAl5 pzH4XxquYszl9DWNPNrFcG8WhQQ6M7WMjFSL6pRP31v5FK7zkmBQi1SpojXWSftKzEgpQhpqKJsq2 N0QGXyaj2YJP8RqoEPDg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hO5DN-0005tV-TO; Tue, 07 May 2019 18:53:21 +0000 Received: from mail-pg1-x542.google.com ([2607:f8b0:4864:20::542]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hO5DL-0005qO-Bb for linux-rockchip@lists.infradead.org; Tue, 07 May 2019 18:53:20 +0000 Received: by mail-pg1-x542.google.com with SMTP id p6so8745259pgh.9 for ; Tue, 07 May 2019 11:53:19 -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=rqIb7elc/qRzjIW8DetaTB8B+9VR8vBHJgOxmRWjXRg=; b=k0PPTrpCnV+W+FCsipgQuQGj+MErHQCmn39j3LKASGC1UiKGNlBWQR9IaoHUV+mv0o oF/c1HKveFisjTJ2MLc2TMsOsEliTA6cCt2OKfvfmLpR/wUL/zy/RnNOundclJ0CrK7R bCj+euJ8YSHvVER/3c8DU0SLGxOfUTA3Uah1k= 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=rqIb7elc/qRzjIW8DetaTB8B+9VR8vBHJgOxmRWjXRg=; b=aiwPJD6aaT3j8DAIG9GfIi1GBthM0gadzjArgsgOwMFohEBY5sc5TLaxJznAYke5Nu G0EGeEGlAhk/Cxmhv5eHtFKtZUecOZ4bsBSj38ovHXH9AxanAe0SL7nkpEDEmhnyzBQs zZEZGzv1EmoJJmKCRxgTeTpoDbOfz3PBjwkU1iTDa44pDefHus+tEgN8QKF2JgaYUc9Z oOWvlzRoFuA0LkH61NlRixjGxo+enn9N5l5IdCDm517c1bO6F/RUaTIQhM81mesxp6AD qD07tr8R0eWgVDAA0G3YAKaIt/HVhdbIUvy+9r1SUTYt1TkBptfLh32WILuaG718vKGa 12Cw== X-Gm-Message-State: APjAAAXMKLjmfOu36hb30SnIemDDKbTiMPRoBeJmiSgyXoJUuSzGioP7 S4HKI/fgqPyCjqxfFAlXAn0AOA== X-Google-Smtp-Source: APXvYqxLjm/jfLSoEB7kf311TVQCmEdXBhiaAZH49aBZFq+F+dDKg8u/jM2ogoBzTOx2PUMa75+G9A== X-Received: by 2002:a63:9d8d:: with SMTP id i135mr24820457pgd.245.1557255198884; Tue, 07 May 2019 11:53:18 -0700 (PDT) Received: from localhost.localdomain ([115.97.185.144]) by smtp.gmail.com with ESMTPSA id l83sm14668086pfi.150.2019.05.07.11.53.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 May 2019 11:53:17 -0700 (PDT) From: Jagan Teki To: Simon Glass , Philipp Tomsich , Kever Yang Subject: [PATCH v3 3/6] travis.yml: Add pyelftools install entry Date: Wed, 8 May 2019 00:22:12 +0530 Message-Id: <20190507185215.15441-4-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190507185215.15441-1-jagan@amarulasolutions.com> References: <20190507185215.15441-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190507_115319_404971_FA454FBE X-CRM114-Status: UNSURE ( 8.70 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, Jagan Teki , u-boot@lists.denx.de Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Tue May 7 18:52:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 10933607 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5E2F713AD for ; Tue, 7 May 2019 18:53:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4C6E4205D1 for ; Tue, 7 May 2019 18:53:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 408C12891A; Tue, 7 May 2019 18:53:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D2CBD205D1 for ; Tue, 7 May 2019 18:53:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=baj6mSPfosJWuYK/CQVHd98g9kWbFOvU9FLcNvSUJmk=; b=W1aBcXov2rtWx1 gxocvK5vNXxf/KwJ0FzJ8/wQzb4oLgCPZdYQBtEhtz/7dAsLsx6NoX6h6MxoqyOgE9hZZ1OdSSLWj XEaDcORVKbfZnQBAPJDGDMhgaAo7oXAYj+SwwU8hxtFGXlmKozFKtLCOKJOchhj21WOtvIhW6DoHy 90UmppuUjiBJ7MBjzxT7pL2BBvl4BCMAzmsDY+KlbxMdvR9giI4KUT6YSd/uRaVFfz1V9B3llC10T lq3NJF3fqb49LucSHEhqS/7XH6eGQnj/Ie8zi8KDn/GDUXkPukN3zik/MMBUts55u3yXQKN8yMf1Q KMQkTU2MBuRDW7chz8XA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hO5DQ-0005w1-I2; Tue, 07 May 2019 18:53:24 +0000 Received: from mail-pf1-x442.google.com ([2607:f8b0:4864:20::442]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hO5DO-0005tj-7t for linux-rockchip@lists.infradead.org; Tue, 07 May 2019 18:53:23 +0000 Received: by mail-pf1-x442.google.com with SMTP id y13so9106799pfm.11 for ; Tue, 07 May 2019 11:53:22 -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=ImNKcjJPl5FDOV/JNbJNwcLPUBrNQElhulqr/rR/aLM=; b=i6eOFKkZNVK/O0KBDdZ4wwqTB3gINjzvq/mG3X5GrVQ+IXOU3rjb2Vobw5Y9Thys+M clx2SNjQsbYUuAEwxKF2gpj5UYHi4tEVaE5klTIgHLyRkvRVnnC4Op6IzNhxfUdqMSou 7fmeq1lUuUaam9dQ8FM7UdxuaTPA2PNFz4vuw= 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=ImNKcjJPl5FDOV/JNbJNwcLPUBrNQElhulqr/rR/aLM=; b=UrrfKlnKpPR28sacZlkzx7XYrOD1klh4+Thu092QlX1V6HV863zgun6Ur376LeXV32 pt5m35McYlN4hPuJD/SXUBbCiv2Mp7ymWlR3BOCzpud5Smp9kNnwvVwes9YQumVgiaZO 1AZ+1pEXquGyIeYSEK3JzMqJjIhIijvulHoYUdLtel/yD7zTcYW9++tiUkwWyt4ctf5s uCdIuFApi+KNrNq3eVameti7dGznXYeQMUITvPm8PDygKn8QRTJ0W2BMl1P2IobvNaEO 6qoJw8ry1dp5uJJsQVcUUXNw1/ffQXT0jrhOad7wkB/FrogkhIGIRt1OS6JguN+qrwZ7 lyKg== X-Gm-Message-State: APjAAAU73Rbrr9bz6fi3eCR1kpSiMUbbfOeGIi8vQ481zjuUIeLnc83b NJA9XNsyp+rMzLvkzF9VHsXsKZFELVA= X-Google-Smtp-Source: APXvYqyiKFflNDxd/x4+eRXzPz4HfhnTnuN4WH8dqePgoMyjB5If6jE6EHP3arHOy0vMxVsuSBanXA== X-Received: by 2002:a63:1d1d:: with SMTP id d29mr13318423pgd.63.1557255201725; Tue, 07 May 2019 11:53:21 -0700 (PDT) Received: from localhost.localdomain ([115.97.185.144]) by smtp.gmail.com with ESMTPSA id l83sm14668086pfi.150.2019.05.07.11.53.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 May 2019 11:53:21 -0700 (PDT) From: Jagan Teki To: Simon Glass , Philipp Tomsich , Kever Yang Subject: [PATCH v3 4/6] rockchip: rk3399: Get bl31.elf via BL31 Date: Wed, 8 May 2019 00:22:13 +0530 Message-Id: <20190507185215.15441-5-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190507185215.15441-1-jagan@amarulasolutions.com> References: <20190507185215.15441-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190507_115322_425662_B1EA6CE8 X-CRM114-Status: GOOD ( 11.61 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, Jagan Teki , u-boot@lists.denx.de Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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 | 11 ++++++++++- doc/README.rockchip | 4 ++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 64c7976f7e..c5078b95b7 100644 --- a/Makefile +++ b/Makefile @@ -1814,7 +1814,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 d1faff1957..327875d87b 100755 --- a/arch/arm/mach-rockchip/make_fit_atf.py +++ b/arch/arm/mach-rockchip/make_fit_atf.py @@ -10,6 +10,7 @@ usage: $0 [ [ 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 ca4d6473b0..98a3824e2c 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 Tue May 7 18:52:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 10933615 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 687E114DB for ; Tue, 7 May 2019 18:53:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5535E205D1 for ; Tue, 7 May 2019 18:53:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 494272891A; Tue, 7 May 2019 18:53:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 716802239C for ; Tue, 7 May 2019 18:53:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=OyW5Vxy22f3cScV5lsEx62KLyELLw4YUx+u46UCalXc=; b=l7yk6WJMvst7RR l83cMRCOZLp6fvYMlsJMYaaJVCP94dzVxju3KqBVD5FNFGSZCCTaXrJ7pwSSfx8+u1+3ZGtP66Xsy siyDZOXm65KWSJsua6TV3t48+GLB0OtZQMP1IQgAEWJxiSodpp4tXUFvTV//Ba0d9NHi4mSBtr1CD V6pYdrVWyouOOMdz+vg3q2tv7spDCrJJ+eRBHMXt+IVeAnTfxEWnS1/Axl2v3ZN7+AKWQS3BaBQN4 pF2acvzJaK0n+RB9PRq1LH3HmKYx41VMd9nAGIOKnf4cP82FFailnQTOXETtLYr8HNccCQgEhjV5x oBLIQYrtD/5GDZeoarqA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hO5DV-0005zJ-3Y; Tue, 07 May 2019 18:53:29 +0000 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hO5DR-0005x6-M7 for linux-rockchip@lists.infradead.org; Tue, 07 May 2019 18:53:27 +0000 Received: by mail-pf1-x444.google.com with SMTP id z26so9117045pfg.6 for ; Tue, 07 May 2019 11:53:25 -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=a8TL1A8mko6vB61txBIgdGp5GFnZlWXk1NU1ryfITfM=; b=JtxEDEWPtlgLwT4Asd/HTk+jdTeTp0jBs8Iaj+2/75cJCFNwPH2od+/w3jE9YboLj3 vTQ+/laZ/FrPgWg5qJ/KJtnIKz0pB3h7bD/UrPDh4ugxnrmpSMSrLDaYiKMxDqVIli5s HzMyLtcJxuNQNDVnVOdY+YRLEhdMe0k1Lk4RA= 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=a8TL1A8mko6vB61txBIgdGp5GFnZlWXk1NU1ryfITfM=; b=fp7lg96417YFYu16KpI5Yr5Y4mUvwA+FM/Q17MZKGBvYxJ6yHEG8mUTfRD4qpJ8QtL NhH+OJdbTWucqD7u1CTjYH9D5iFPBq1aSm7qlGktiyRn6drQTX0pIlWXIflVochHl6DY dd+qVAHnnwTm8lTZ/jtDpyfBLF5EXB0LXsL/EgvS9x3vjaPuhiPbrl+Khs/Bj/8Snnsc iGn+8BEepMPfVmaRHJNUglBoUwcjS5TFbNDq2iLQjtDR5M94Xm/GnZuMVfU6r5zxSYHq MaccOtgP/ylpJ7ga5nDIJHtfAv2Kyyy6EleZeAVXCx7gg9TNtmNbIi5OcFftW/Lt1GE0 fcew== X-Gm-Message-State: APjAAAWxtVu0bgLQbZdbDG6HbLxEzbE0N6CwJ1PEsea5+S+WJeG+8QFn jAOm3BTGIVsLm8yWump9v0A4EA== X-Google-Smtp-Source: APXvYqwVr/idjLqOHpY4Qo4coT9GPLbsIVow9m1R3FnjhcSYPj7k1i2CMHWDvrjoYGCvQrV2GUlCKQ== X-Received: by 2002:aa7:8384:: with SMTP id u4mr42134083pfm.214.1557255204939; Tue, 07 May 2019 11:53:24 -0700 (PDT) Received: from localhost.localdomain ([115.97.185.144]) by smtp.gmail.com with ESMTPSA id l83sm14668086pfi.150.2019.05.07.11.53.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 May 2019 11:53:23 -0700 (PDT) From: Jagan Teki To: Simon Glass , Philipp Tomsich , Kever Yang Subject: [PATCH v3 5/6] board: puma: Get bl31.bin via BL31 and rk3399m0.bin via PMUM0 Date: Wed, 8 May 2019 00:22:14 +0530 Message-Id: <20190507185215.15441-6-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190507185215.15441-1-jagan@amarulasolutions.com> References: <20190507185215.15441-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190507_115325_725280_3284982E X-CRM114-Status: GOOD ( 14.46 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, Jagan Teki , u-boot@lists.denx.de Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- .../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 98a3824e2c..88a4593392 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 Tue May 7 18:52:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 10933617 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D4B1313AD for ; Tue, 7 May 2019 18:53:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C25B8205D1 for ; Tue, 7 May 2019 18:53:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B671F2891A; Tue, 7 May 2019 18:53:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6587D205D1 for ; Tue, 7 May 2019 18:53:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=E4mu6FXbHx8DQkknweRdMjY5oBTQWqAmk3w+LEH1r40=; b=C+jmX49UUgGAE7 kir1RBxH7YNiFDyLPLJoSOpfut0GtPv8N567Iu0HStHZkoC2+hOKCEhtXt2xkPwJhMuP1N61GTsfs TrN61yHJ5moiu9iiXl+wG6FB6lJelR67SOLjKxLt3yPAiNOUn3+KjvbrZTLctVlrcmhpiuWiC+DD1 KR6j7yeHIsZj0APusPjcJ6LA76SYpUTSxSMu68OWczrIan1tldCsdrJ95xpKwmssx9T2DsnaliWNd B9c+5C+ieCHot4DB9BAXtOD8er6z+ZsHCwNjWBBn1+2FaYMVqJmFwLuBSu7gNuIq0Zi3Xn+kII2jL 1rEAnF5pJ5DP9KUJRT3g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hO5DY-00061m-3X; Tue, 07 May 2019 18:53:32 +0000 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hO5DV-0005zN-9A for linux-rockchip@lists.infradead.org; Tue, 07 May 2019 18:53:30 +0000 Received: by mail-pf1-x444.google.com with SMTP id u17so9116264pfn.7 for ; Tue, 07 May 2019 11:53:29 -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=3YaCBa1O0k1RP1Yy3LgAZQbXlYI99ssAvRO6LMhpi34=; b=VIvPc4nPgDIbCflRwq0dXgk+VcAlE5iHw2hgSOXYdVH08Goq3RvIjaGb0mn9UQnTxc Y2vMNDXdBOlDGhIVTDzPj50My9O1kP/xZxX6u/KhVyc4wcMCYcq4Ld1e+IiTFX6GoO3f 9jHMN0o3m4+EfRQjsOffou8kYiSlGwb8LiwKQ= 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=3YaCBa1O0k1RP1Yy3LgAZQbXlYI99ssAvRO6LMhpi34=; b=sFop0HgzCGzlsrfUQiwhu4tMQTJ7a1efCXky13lWIZUoXYZ0ZpTMWllT1ZNdmyuy4F dXHI0G5ytJe1WB3g7wmHEDqMBmW7sJYZZW2gynqfLgBQ89yt5O8D+e0pOqDCkNg7GB3O IEkKZlJCwZgxzyq8Jz5oVA90TANEDCErxJ27yQlbqsOsr6CydGYg6LiqPbGqq2AdLfW+ jz4AFm6mMF6wPmEGEbtAQ1SKGDFDs4TeIbeclun5+lOSXDExaaekJQ3cbUU8oFzAIjam 3nQhoHNMnu384altwN476YJu83QiYdvoVeqYPMgf6/SN7RLtrE6KfUQYGN/F6qi8Gh8x O4Ng== X-Gm-Message-State: APjAAAWcnedVMBWx+M+TBvd1XhDHi6Zo0Qb8IsRBjNj9DOIkPBhMXgWZ w1Eo/PtOLjEw2BbyYPD58Jaw4A== X-Google-Smtp-Source: APXvYqzFtKys+dCDEFUuRKZICc0tXlWHUIxjUajjXyoxDxCmY53Zuo+xUMFf/f+/wyHUbQ5WfQp9FA== X-Received: by 2002:a62:2687:: with SMTP id m129mr44306913pfm.204.1557255208558; Tue, 07 May 2019 11:53:28 -0700 (PDT) Received: from localhost.localdomain ([115.97.185.144]) by smtp.gmail.com with ESMTPSA id l83sm14668086pfi.150.2019.05.07.11.53.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 May 2019 11:53:28 -0700 (PDT) From: Jagan Teki To: Simon Glass , Philipp Tomsich , Kever Yang Subject: [PATCH v3 6/6] Kconfig: Add u-boot.itb BUILD_TARGET for Rockchip Date: Wed, 8 May 2019 00:22:15 +0530 Message-Id: <20190507185215.15441-7-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190507185215.15441-1-jagan@amarulasolutions.com> References: <20190507185215.15441-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190507_115329_481158_216AF075 X-CRM114-Status: GOOD ( 10.89 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, Jagan Teki , u-boot@lists.denx.de Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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 +- doc/README.rockchip | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Kconfig b/Kconfig index 91c1082ace..6bcff29659 100644 --- a/Kconfig +++ b/Kconfig @@ -240,7 +240,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/doc/README.rockchip b/doc/README.rockchip index 88a4593392..c4e5f83da7 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)