From patchwork Sun Apr 28 09:09:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 10920847 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 D3D2B92A for ; Sun, 28 Apr 2019 09:09:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B73842863D for ; Sun, 28 Apr 2019 09:09:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A4B3F28824; Sun, 28 Apr 2019 09:09:39 +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 8BF7C2863D for ; Sun, 28 Apr 2019 09:09:38 +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=SpRugTzDpGs/mAt1XUJLcuWnCtAXUsMdhEycfaTPAvo=; b=GHYcFy8xUWIJMq djvAV7l123FuvClwxO/gEbZpIzlLTRmY7iL1c6F6JslFjGXcEI3OwgReE8CeqnOdIr9JintWmslGp hL0mhcnMtJcAUvvFu0rZtkeVe0KPW2O/EsJTnTvsKKermWy1cZ5g1GzvBnbxepfq0xSpc5tBjCvd/ TrrmkfLPFOntIcLT+tfF0lSYjEs9qAN7IOCcI1MGSp/h1VaDhx3Wdp96C+/dJwx+zukcSdL/HWQkQ 0AMprNnr4ttN79bS9P8zBghSmDTdm/JFX/2AK3woIyvHxg5Y4cEb+Juv84NrKAKXhQpza2GtWK2Ks qilDnIRF/fF54bHmYWQA==; 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 1hKfoU-0000o3-NS; Sun, 28 Apr 2019 09:09:34 +0000 Received: from mail-pl1-x643.google.com ([2607:f8b0:4864:20::643]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hKfoR-0000nT-KG for linux-rockchip@lists.infradead.org; Sun, 28 Apr 2019 09:09:32 +0000 Received: by mail-pl1-x643.google.com with SMTP id f36so3638306plb.5 for ; Sun, 28 Apr 2019 02:09:31 -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=5+ktBmcEqonH5rPmgSadgYviy3zTlgCbf0riGNhR3/g=; b=o91/C98EMyhg22wvXxQrmhGjaC4l1x8a3ilADEQtdKGREPhih7lt28miF3kQzngSfo 6Vu5jSAUExWMOpFFwgics9LVQETkXF7udEQzZ7vYST75w53aSkpc2c8paGQEzrEFUPNx SVk+ZZjq+99VzRlb3BBTFY1jHVyF65IVZXhR0= 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=5+ktBmcEqonH5rPmgSadgYviy3zTlgCbf0riGNhR3/g=; b=nkTsMCQNwxO2pv2baC/B+6brV2/vXx73oNZbz4VYx3JTdlkQ+P4gj9tl/lZWARjh2d 7Na3xoGhdJZ09bSAPG7QLMxoNZa0qssPEOEkf4MK5gPGqSDWBXJ7aeE4O+tRa/cqiMKJ sOmueqiZjqltsuknpjiJ5WHNHKsPBfsX3Xwqii+7K10FTyEfORt9Sj/zf+DvLlqu6Ngx 1sgt88c+WSWC4seGLPmuRWK04vx3nXIVeXDbnbsIAREIUIgB5a42T7LKo6OvEMb4oRwn S7V2/X26pA/V6zcMXJEqXuahFh8ceTzCcZddWXdHQjLRv1ZAf7thyhbZ6bAlYZqnjzCA duiQ== X-Gm-Message-State: APjAAAXcGIOagD5t/KvaL+JUt7DJxMH3lQC7qGFhER4EmqCvTPnHz6kf 6O10QFHniHax5FCNartm+Hbuew== X-Google-Smtp-Source: APXvYqx5qmdLdaVCpXk3nkRUnKC1OZuOX9E7hFsCGdZXt6yDxKlvtx6bdRpsoSoJ2rKF+hTLp1aKRw== X-Received: by 2002:a17:902:4643:: with SMTP id o61mr31934660pld.249.1556442570747; Sun, 28 Apr 2019 02:09:30 -0700 (PDT) Received: from localhost.localdomain ([115.97.185.144]) by smtp.gmail.com with ESMTPSA id k7sm3040338pfk.93.2019.04.28.02.09.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Apr 2019 02:09:30 -0700 (PDT) From: Jagan Teki To: Simon Glass , Philipp Tomsich , Kever Yang , Akash Gajjar , Tom Rini , Manivannan Sadhasivam Subject: [PATCH v2 1/9] Makefile: clean image.map Date: Sun, 28 Apr 2019 14:39:05 +0530 Message-Id: <20190428090913.10568-2-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190428090913.10568-1-jagan@amarulasolutions.com> References: <20190428090913.10568-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190428_020931_663117_4DBE60DF X-CRM114-Status: UNSURE ( 9.72 ) 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: Paul Kocialkowski , 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 --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 92e04dd689..54e8fedff0 100644 --- a/Makefile +++ b/Makefile @@ -1781,7 +1781,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 Sun Apr 28 09:09:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 10920851 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 2622492A for ; Sun, 28 Apr 2019 09:09:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 098B32872F for ; Sun, 28 Apr 2019 09:09:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F17C22876C; Sun, 28 Apr 2019 09:09:41 +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 A9FB62872F for ; Sun, 28 Apr 2019 09:09:41 +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=ntRgAPLwMesOaT98nHhA+SVYzlz4wQxW/Om5r5gf/TA=; b=dCLLy7+BOET3JN P/G4Tce0yDnrEzwxj5TW7i47jcBm/Fz0N06vZs48pKlHCckwnFYN7+F08CtBtSQrjY8O2FHbe8q2n JC89d7npWsOylkHHZD0CPWKwa5JLa+jEO3iKiM/fDiKJF5Q5N05UIbKjjfbQXEENVg9peKTGadW+m irbRaxpafA2hmIdph9dEFCMkHjL7J0xQW87EZxLFNiivXD26BeHIv8pp4dsTno8UFo0F1sT7HBdw2 7IiiVf44eW2qnb1BkX1W6yansJMWM+pRrnr6JYzEMNSUc9YJjn1ugGemmC/geBUPoITo0wozlLb3W AXn7DLqdpFuRTJ7eYrXQ==; 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 1hKfoZ-0000rz-Be; Sun, 28 Apr 2019 09:09:39 +0000 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hKfoX-0000pG-4E for linux-rockchip@lists.infradead.org; Sun, 28 Apr 2019 09:09:38 +0000 Received: by mail-pg1-x541.google.com with SMTP id c13so2733253pgt.1 for ; Sun, 28 Apr 2019 02:09:36 -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=l78wQw2FrFbs7HVkEO1pmaqFMcARGbget66qc4bGZpw=; b=k1MUIcVUJtFHE9Gs2F/OEoWGSJfivvWZjsx76XjHKPhUfdLkXnmwk6Bc5rmBCGfm90 MxUCamQvugXR99reORw90xR3m3LWZbbYePL+t4Z50FzFxvCAnfDkSFUhBmzQtwg15kRM uXYHOgyoP4aJIJ5kdSVYTuuHzedswkLyzuoHE= 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=l78wQw2FrFbs7HVkEO1pmaqFMcARGbget66qc4bGZpw=; b=MxjZk+I5GZs1cYChOBi7ekIPfiMpCAxF5cfEzcQYWbKfiHhaQjj+teh+UR7U627xaZ VS4BciJeVAcXQX/wPN4tv6Pds14JH0ZozCbBrbFguKLJchn4mbCINtPeStfZ/rSWlMxA DcLwvPEgIh4U+KHTo/qfXbAky7d3pdhHF7nIPLfKF5dw1c4AZ/m0flWmhKplj6MMb16z QhlHCps8Ttt1y+koDgLnHeMTiMsTccQBdaEeQ4A1R/bR4mSh5D8HxZzPJh1h9PYqjJT9 sbwBiwk62/zQbUML6zgaH0lA6ZleYwKYJs5BtvbftlYKKbUg0q3Y+8hR/2gW9e2Lp8pq S0hQ== X-Gm-Message-State: APjAAAUoZc2KgOMnfWO3n3Dsw+eqQfK3U0+EyHbkU+LLA4PXmzO9MlrJ hlNxtINvpRIfXAX281Cmg/pdVA== X-Google-Smtp-Source: APXvYqwB421rzy0ATJEhwelqOgnPNEj/wTjFNbDtZ5vL7i6ahJNpUV+sFBYLFbYZ0W2CDlpCPv4jXg== X-Received: by 2002:a62:f24e:: with SMTP id y14mr56907511pfl.209.1556442575512; Sun, 28 Apr 2019 02:09:35 -0700 (PDT) Received: from localhost.localdomain ([115.97.185.144]) by smtp.gmail.com with ESMTPSA id k7sm3040338pfk.93.2019.04.28.02.09.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Apr 2019 02:09:34 -0700 (PDT) From: Jagan Teki To: Simon Glass , Philipp Tomsich , Kever Yang , Akash Gajjar , Tom Rini , Manivannan Sadhasivam Subject: [PATCH v2 2/9] Makefile: clean bl31_*.bin Date: Sun, 28 Apr 2019 14:39:06 +0530 Message-Id: <20190428090913.10568-3-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190428090913.10568-1-jagan@amarulasolutions.com> References: <20190428090913.10568-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190428_020937_167924_8165B229 X-CRM114-Status: GOOD ( 10.85 ) 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: Paul Kocialkowski , 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 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 54e8fedff0..ba0cce9f33 100644 --- a/Makefile +++ b/Makefile @@ -1782,7 +1782,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 Sun Apr 28 09:09:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 10920853 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 F1F5092A for ; Sun, 28 Apr 2019 09:09:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DF6192863D for ; Sun, 28 Apr 2019 09:09:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D31072875E; Sun, 28 Apr 2019 09:09:46 +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 8630B2863D for ; Sun, 28 Apr 2019 09:09:46 +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=O/FO8XpIB/kTYVCQeEgJAQ13fDZBvtgpk7zpl9kQvSw=; b=Ntiwh8LRK+Lx7I aVAphlBQfCFYMaKdi2/ZDsiwG++o+58o9I/DS+1cIJiJKYQWGsSYonDIWRqm4jWAmech8iCfTsig7 Ci7f019dRpN22TeGSBNM45bWLgXQOD+MHGfU6Ho9sqiWw/GDB4qqxTRgUrGO5U20G9/qC/L96Fi5S OTgQbChbbjAYaVOCxpUALa7lyTOL0KnxtVgQGwDq07Fv9J7R5iSKBtGP5XlRCHf4tPKPkQh6zkMKH UIu5ufVE41fCX95oHhfDGiv9xbQHbi+AHs4TJAZPW++kpsJje4BwU4XU8mzs9LMTUMVQhgvrm/h6L /b/j1IrjPrtRXvJXsFCw==; 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 1hKfod-0000ut-Ti; Sun, 28 Apr 2019 09:09:43 +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 1hKfoa-0000tS-SY for linux-rockchip@lists.infradead.org; Sun, 28 Apr 2019 09:09:42 +0000 Received: by mail-pg1-x542.google.com with SMTP id t22so696084pgi.10 for ; Sun, 28 Apr 2019 02:09:40 -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=hBCXYpHPkNhquxP0xZtz9CZGTunnfLjnuK4fNTlVrpw=; b=NwiUJDavwzwkWcKhVGDSbq1dpbGSHLDy4ONwBxqJRZlsV1oQfmQPqnjWCyXIvnen1g ToeOBm2gei2H5S5HLRyach33h9adILQOLFpk9JJUfRJRlJZME/eLlwbiGCi8Jt6H3XvU nmlVnCgIGTfVBsaALv9nVcxLyJ2qGXVCTOKKo= 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=hBCXYpHPkNhquxP0xZtz9CZGTunnfLjnuK4fNTlVrpw=; b=ck/VhQ8rCm/CgoqJLEHG2CTcsBCghl8UI5OJMmsyvCvWc/wdJVUDphq6Fh8anHrzq1 rpQPNMHuwuNxufG5YcbTUMY4HVmHPIVM6uXObEi5SX+X5/wkJT4VxDRm5KD3s9/G6QdA pPXaXOgqhJ34V4hS8GJ+APHRu1x4k1oQMFa6DQXaetKwS6fDbNX3P/N59sJlXS5nGHrw EUGH+m87NU4M9VekXOyOkXMg7Tdg1F5Z4vKxhmdL5n3pKf9VwSA8eyjiAEJBkcMqgUT/ Lhsng3jOmb2hqnBkjGFU6/62E1Pey/8HcySRy3HeATVh6xm8SZU1qkeUXXYocsVus9m4 QjKA== X-Gm-Message-State: APjAAAUMQ9rCqopvnxALFcNpr+NTk6GVMmZPsj82RXy0HDccuh/iS8hg vUzy6t9VM7KVyo4xTPDS2QTVHjr5xQU= X-Google-Smtp-Source: APXvYqwoVA7fzm5NTiPHy6RCiwD48Nsd4A9wIusBGg5xN6w6vlBfsplEqan7x6pNgFHAp7IK7DFf4Q== X-Received: by 2002:a63:7504:: with SMTP id q4mr21908504pgc.443.1556442580417; Sun, 28 Apr 2019 02:09:40 -0700 (PDT) Received: from localhost.localdomain ([115.97.185.144]) by smtp.gmail.com with ESMTPSA id k7sm3040338pfk.93.2019.04.28.02.09.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Apr 2019 02:09:39 -0700 (PDT) From: Jagan Teki To: Simon Glass , Philipp Tomsich , Kever Yang , Akash Gajjar , Tom Rini , Manivannan Sadhasivam Subject: [PATCH v2 3/9] travis.yml: Add pyelftools install entry Date: Sun, 28 Apr 2019 14:39:07 +0530 Message-Id: <20190428090913.10568-4-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190428090913.10568-1-jagan@amarulasolutions.com> References: <20190428090913.10568-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190428_020940_922126_B1E4A04E X-CRM114-Status: UNSURE ( 8.63 ) 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: Paul Kocialkowski , 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 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index eb531f1e5b..6dbbb5dd02 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,6 +49,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 Sun Apr 28 09:09:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 10920855 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 9CC42912 for ; Sun, 28 Apr 2019 09:09:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 62B5C1FE8D for ; Sun, 28 Apr 2019 09:09:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 51F6C2875E; Sun, 28 Apr 2019 09:09:51 +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 9B1192863D for ; Sun, 28 Apr 2019 09:09:50 +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=6aa5LLmsm+Zrm5wu8boixRR6jKosQUIisjgX+AjWP0E=; b=WYEiYZ5u3ZNO1R +RTpRN+DaDr8b1PK+R7Ht+r4vJy6eDIC/KwlYMIxEUlL8oCE+mGtauw5AnzFASlhPIjyj0WJHA66I NvdPdMrcv/1Ra0qxH6eVGxUj5kL/e+T8R2e95WvRJTDWmN1dS1Mccb7EpKDyT1Nbg5lzQfCUs6v76 9xAR3aWNuLubIWlGTbbpz8XcABrqWQ82qeZxySdRGRC0xQpO8YpQrF/AkDI7ANEtbF0whoFz+6r4b PZg8NdULcmzI/pplMSOfV27wPfqSBolDEMyXcb47JqsQpD+k6P5f5UtHZHe5uQq040boLJwGYlT3j uRZfthR5NLXMdEW4YUPg==; 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 1hKfoi-0000xH-ER; Sun, 28 Apr 2019 09:09:48 +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 1hKfof-0000w5-A4 for linux-rockchip@lists.infradead.org; Sun, 28 Apr 2019 09:09:46 +0000 Received: by mail-pg1-x542.google.com with SMTP id z16so3693133pgv.11 for ; Sun, 28 Apr 2019 02:09:45 -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=Ksp0RJAO0k4pfRprgoggQ+F3/fOSrjeMTlEOTKA44MY=; b=PYlanwSaPXOB/LraCejmiQi3WIv28GKmrh1BXgIqi2L5xlROeSlxSB5nY0Xab7PRLz QrgXBbiqvL9DCg+VKj3x9IuvjhBCUTDclNePCFKkT0XAiDacMIo/gxht969D6L/GqIbI EATuCok56CrQUgqFR0WuFpKmRyPTAR4POU/Tg= 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=Ksp0RJAO0k4pfRprgoggQ+F3/fOSrjeMTlEOTKA44MY=; b=N2jhGBZv7Om3/A1K0L0I2R74h6WIiOG973AKO/ErdJHCOnnZvird/OZL2hhFeekoCz i2CYf8haT3+0tCdOOlQR6A7siLkrAISljTKa2zlHJiXtUPYSUWeBHDwqebxH7n+Llt+H B2ZNT21UnfgfTTYz0th+F7SXL7tgBtIhSjK/lftNcPKH5Ox/BJv+cyIrkXTF2RtidCFW prAV32PqYpiCy06B0rHX7vDLxd1t/NprKoI0qvrnd7ef5AfmHdiTPdwKZ4Jbyx8C5Y8a afY/5rWVaMFrecNfIb3hlV3ZoGEjXf0zzrVsztOvyUA0MjhHodUkaYAuuf1ZfVJCs+Pd t59w== X-Gm-Message-State: APjAAAWs7Vuaqnoh1DM+Glg+TW/FC4g/4hH4YsjFQ3iE3LbnQ9/OJADd 4YwSxa87RB0FBhVC8HvDqKRFyQ== X-Google-Smtp-Source: APXvYqw2J9p/mzfctB7/jaFBSOrpJ0WJqsw704s9YdG66TOz9bAF+If2uidFb9+/Q38fVAKGNSVcgQ== X-Received: by 2002:a63:e004:: with SMTP id e4mr53483625pgh.344.1556442584814; Sun, 28 Apr 2019 02:09:44 -0700 (PDT) Received: from localhost.localdomain ([115.97.185.144]) by smtp.gmail.com with ESMTPSA id k7sm3040338pfk.93.2019.04.28.02.09.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Apr 2019 02:09:44 -0700 (PDT) From: Jagan Teki To: Simon Glass , Philipp Tomsich , Kever Yang , Akash Gajjar , Tom Rini , Manivannan Sadhasivam Subject: [PATCH v2 4/9] rockchip: rk3399: Get bl31.elf via BL31 Date: Sun, 28 Apr 2019 14:39:08 +0530 Message-Id: <20190428090913.10568-5-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190428090913.10568-1-jagan@amarulasolutions.com> References: <20190428090913.10568-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190428_020945_347263_CC21669E X-CRM114-Status: GOOD ( 11.45 ) 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: Emmanuel Vadot , u-boot@lists.denx.de, Paul Kocialkowski , linux-rockchip@lists.infradead.org, Jagan Teki , linux-amarula@amarulasolutions.com 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. Cc: Emmanuel Vadot Signed-off-by: Jagan Teki --- 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 ba0cce9f33..2471340c71 100644 --- a/Makefile +++ b/Makefile @@ -1782,7 +1782,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 Sun Apr 28 09:09:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 10920857 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 E9C7592A for ; Sun, 28 Apr 2019 09:09:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D5D241FE8D for ; Sun, 28 Apr 2019 09:09:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C9C462851E; Sun, 28 Apr 2019 09:09:56 +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 4C1031FE8D for ; Sun, 28 Apr 2019 09:09:56 +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=JZNg+NKLVV7F/6LbJ8vbzyjzUsD2Vj193L/DssHubxo=; b=LQB/U+ot2e2Wo4 f0ocWMKgM4hdeCi7fyBAXDGuVUHmghij92EY6MYaiLfZYG0Vz+KBdHxr1XYbFIs5+OqFjfrtZfs94 GJH1VhihP31tUHOtTE2TxmyxlskrHORqNMVVb7VVYBRmPzEPvkRfzLz0UDaZwfJJ3z/jmz0HztWKz Du0cC6jxoGEBFvBF4O4Zos83zxzS30SW0CvDlsgGlmM7r3ajqeKVS1TwHfS4/118sp+ekA4Pua1pn /0/yCt6MYmtVFk93TOC6RKKmJHplQg81M7RaMxJ+bSgrCSlXIKuUkunKF1CfTuTEKtS1hfN0gSQqY Ed6IjrnIlWuKM9MZfr8g==; 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 1hKfon-0000zm-TD; Sun, 28 Apr 2019 09:09:53 +0000 Received: from mail-pg1-x543.google.com ([2607:f8b0:4864:20::543]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hKfok-0000yc-KO for linux-rockchip@lists.infradead.org; Sun, 28 Apr 2019 09:09:52 +0000 Received: by mail-pg1-x543.google.com with SMTP id l18so3707183pgj.6 for ; Sun, 28 Apr 2019 02:09:50 -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=li9nH1roxv2V7T2EQJmhqDJtQbBwjK8kdiN9IGNeDmA=; b=HMDKtnBuyPZ2W4R2e7C2nZuzxozVxukiYZTGBSNxsKEQF24c/+1vzJZN3j7lPhTKHR abPuWLEvMt1UwZFtR0IyN5ZEZd2MTI5I0d/5wfijc1GwT2YxeV6i8aix1B8hypXrGZdM P3jPx1D/MYQwCeGH2sFdIkLi8HBK1xsmU3hL0= 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=li9nH1roxv2V7T2EQJmhqDJtQbBwjK8kdiN9IGNeDmA=; b=TXeKJPmSCogr2ThLF7HMO1SjzSVUrFJhS/Eg4R0RNU6yxEegQyk5UZWmMcb2GBVVKF MYsFU/T2BAXMz3DOSR47jh9ythzWc9cm4tF9G45W80fi4ve/ZWKlFkCX67pydWrgnNWm 4J103m8nuhdPlTZZkkL0CD5Qju2WEUPojXuMUyZQcqHBadv/H01cFOqOvuxNJCgy7KES ETfqUkgyEkbINN8aa5ACPG3oxkmy1xhZcC5BQOZZV1K+PMOmmKvdRREheEo3/GbGQyxz gGvNikbkFGNJLdkxNH/bgMrcfnpClEAW6A3gi9vUlUZ3nErOsjjFRMuhKzGi8aVxGr3R zeig== X-Gm-Message-State: APjAAAXwM+pLuoJYaWheqMy+hlqeM9RbQ7P4bxqprn1lIBjCbuzzPxpJ Kajx5eBQzgXOPCzVMqb8m1NtVw== X-Google-Smtp-Source: APXvYqySz9T2qrUNB8bPEV7japR/JlCrUPV2OiQr/BUzEjxh2WHv+NBatq4yQig7kLWg6MeVYqmYDQ== X-Received: by 2002:a62:5542:: with SMTP id j63mr3253747pfb.34.1556442589829; Sun, 28 Apr 2019 02:09:49 -0700 (PDT) Received: from localhost.localdomain ([115.97.185.144]) by smtp.gmail.com with ESMTPSA id k7sm3040338pfk.93.2019.04.28.02.09.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Apr 2019 02:09:48 -0700 (PDT) From: Jagan Teki To: Simon Glass , Philipp Tomsich , Kever Yang , Akash Gajjar , Tom Rini , Manivannan Sadhasivam Subject: [PATCH v2 5/9] board: puma: Get bl31.bin via BL31 and rk3399m0.bin via PMUM0 Date: Sun, 28 Apr 2019 14:39:09 +0530 Message-Id: <20190428090913.10568-6-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190428090913.10568-1-jagan@amarulasolutions.com> References: <20190428090913.10568-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190428_020950_669921_E3CF15EB X-CRM114-Status: GOOD ( 12.57 ) 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: Paul Kocialkowski , 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 --- .../{fit_spl_atf.its => fit_spl_atf.sh} | 46 ++++++++++++++++--- configs/puma-rk3399_defconfig | 2 +- doc/README.rockchip | 8 ++-- 3 files changed, 45 insertions(+), 11 deletions(-) rename board/theobroma-systems/puma_rk3399/{fit_spl_atf.its => fit_spl_atf.sh} (50%) mode change 100644 => 100755 diff --git a/board/theobroma-systems/puma_rk3399/fit_spl_atf.its b/board/theobroma-systems/puma_rk3399/fit_spl_atf.sh old mode 100644 new mode 100755 similarity index 50% rename from board/theobroma-systems/puma_rk3399/fit_spl_atf.its rename to board/theobroma-systems/puma_rk3399/fit_spl_atf.sh index 530f059f3d..517fad40a1 --- a/board/theobroma-systems/puma_rk3399/fit_spl_atf.its +++ b/board/theobroma-systems/puma_rk3399/fit_spl_atf.sh @@ -1,3 +1,31 @@ +#!/bin/sh +# +# 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 @@ -14,16 +42,15 @@ images { uboot { description = "U-Boot (64-bit)"; - data = /incbin/("../../../u-boot-nodtb.bin"); + data = /incbin/("u-boot-nodtb.bin"); type = "standalone"; - os = "U-Boot"; arch = "arm64"; compression = "none"; - load = <0x00200000>; + load = <0x4a000000>; }; atf { description = "ARM Trusted Firmware"; - data = /incbin/("../../../bl31-rk3399.bin"); + data = /incbin/("$BL31"); type = "firmware"; arch = "arm64"; os = "arm-trusted-firmware"; @@ -33,17 +60,20 @@ }; pmu { description = "Cortex-M0 firmware"; - data = /incbin/("../../../rk3399m0.bin"); + data = /incbin/("$PMUM0"); type = "pmu-firmware"; compression = "none"; load = <0x180000>; }; fdt { description = "RK3399-Q7 (Puma) flat device-tree"; - data = /incbin/("../../../u-boot.dtb"); + data = /incbin/("u-boot.dtb"); type = "flat_dt"; compression = "none"; }; +__HEADER_EOF + +cat << __CONF_HEADER_EOF }; configurations { @@ -54,5 +84,9 @@ 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 e5ea2fe0b3..98b2dd6f02 100644 --- a/configs/puma-rk3399_defconfig +++ b/configs/puma-rk3399_defconfig @@ -15,7 +15,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y CONFIG_DEBUG_UART=y CONFIG_NR_DRAM_BANKS=1 -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 Sun Apr 28 09:09: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: 10920859 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 0800892A for ; Sun, 28 Apr 2019 09:10:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E8AD61FE8D for ; Sun, 28 Apr 2019 09:09:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DD1982851E; Sun, 28 Apr 2019 09:09:59 +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 9157D1FE8D for ; Sun, 28 Apr 2019 09:09:59 +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=fk2Icyak6W7UhvXp2jK+JOtXeJ5JtcEwikVqGbw6v9A=; b=qcBpN8OLOlzfvC FrDfRNRloN1GauE1ihwGOU1USjHUBYnD5Q01oLNiDS8Yl3bVWldukHcXmqP0bO8hT6NRdyB3OzUhm afCWRqqT0Y+wVtU02PGnDnSB9CCIKg2rw5KPNUlFCAKeFZ1r298MfvCLbyVr/IiJFcX4stSk9DzAW NoTWi6jM545rJ0r71BCd2HKBMQ4ayboExILvnsZFJ9LA2GTD6pe37v+pAn9ni4DAeminLysPGaYIR GAKPtB6Mruet0ev9EtzDDbP5k7CETIweN2MyduVjiIeLopBQsjpJ/akIPZ84wCfo034BG59dJjXI2 Sq/TgHfKdGZv033PlBTw==; 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 1hKfor-000126-DH; Sun, 28 Apr 2019 09:09:57 +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 1hKfop-00010Z-4c for linux-rockchip@lists.infradead.org; Sun, 28 Apr 2019 09:09:56 +0000 Received: by mail-pf1-x444.google.com with SMTP id z5so3847843pfn.3 for ; Sun, 28 Apr 2019 02:09:54 -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=eCXXxbS350tcxIqTsUZMM4f279DxaWxGFOZAXsVfst4=; b=dEtzQviHls9FyHfnkqqdhFRSh0YC1t8Z6KixOh0GvIoPvU5uCmxc8YcSeRy2jdsKTG gvXXs36GwK0rriXelJwcB++nJM9TKHtTJd3Ktr/saMHICju97mStZf0lHFo0w8nmYmqC kzv35x7lWnLaBaCEeTl/oucWX56vDb6Y08t5Q= 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=eCXXxbS350tcxIqTsUZMM4f279DxaWxGFOZAXsVfst4=; b=hK+bjZ9hADozkvqrfFdniens+5uFAiIhelD0Q45YTXw89OIS5bitb1j/PhtcZTmihm 8B7IxElxr1cb/AR9f2tWA8RbWIc0Bu6660VUL3DVcl8/gy1PY/Q5KAcysOKwD8PVZfME ni7WARY1GPRAroS5qOORhaYm8TlYj56rD+EmvywC6k7SoZjWdIgDj5KCH3YgvEppxnyS tFS384d6+bzkO8d5dFxN2LGh2wSZDlRqOVHaJEjRHdPCnsjNy0EYRLsY0HkL4GDEkN9G z5dA+VHMXc4gq7JVfS7vZCf39OPs9/1jkgKicFjgGMHan0dT1iWQ6SPRo8dPHEHNBjXY wpDQ== X-Gm-Message-State: APjAAAWl8tI8uc8bBCQluDnrtjEH95KxE/7EU2zlq/FKUrdx45MRAloH Wft2L0WOxrgD4KDJySk3hUlZxg== X-Google-Smtp-Source: APXvYqxeF4mTjRBbMKBm+zNhd0XvscOnxnZSHO7AVGOULdL1u+zFI5XYzmCKi1E7gI8M69svJx2VWQ== X-Received: by 2002:a62:1483:: with SMTP id 125mr14974621pfu.161.1556442594347; Sun, 28 Apr 2019 02:09:54 -0700 (PDT) Received: from localhost.localdomain ([115.97.185.144]) by smtp.gmail.com with ESMTPSA id k7sm3040338pfk.93.2019.04.28.02.09.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Apr 2019 02:09:53 -0700 (PDT) From: Jagan Teki To: Simon Glass , Philipp Tomsich , Kever Yang , Akash Gajjar , Tom Rini , Manivannan Sadhasivam Subject: [PATCH v2 6/9] Kconfig: Add u-boot.itb BUILD_TARGET for Rockchip Date: Sun, 28 Apr 2019 14:39:10 +0530 Message-Id: <20190428090913.10568-7-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190428090913.10568-1-jagan@amarulasolutions.com> References: <20190428090913.10568-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190428_020955_179508_325B4D0E X-CRM114-Status: GOOD ( 10.72 ) 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: Paul Kocialkowski , 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 --- Kconfig | 2 +- doc/README.rockchip | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Kconfig b/Kconfig index 5679a288ec..7e918e5c37 100644 --- a/Kconfig +++ b/Kconfig @@ -230,7 +230,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 help Some SoCs need special image types (e.g. U-Boot binary 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) From patchwork Sun Apr 28 09:09:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 10920861 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 C68CF92A for ; Sun, 28 Apr 2019 09:10:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AB25528748 for ; Sun, 28 Apr 2019 09:10:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9F0AA287AA; Sun, 28 Apr 2019 09:10:06 +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 E831328748 for ; Sun, 28 Apr 2019 09:10:05 +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=5ZWQbid0Z6x17r8ZGrCou8QkqiTFzfpVspHlMe5tQmo=; b=r7hvArRmnuEYtF QpkOiMAtYdZ1rJCj1qGfrW6So23LUz1TGyscVjatFuj9+m6U2ToLQXVGwyI76xdOuFNdR7dlQby/2 QLGBh9JibTul94gjQ/zOHPLuTbIdisIXRtcdcR3GUb+h6rRiotLIv7OzZLt3PMDD4gvX40lt0XaXQ 6YYOgk4Kyh45YnTyrTqXUml4IyRvZCEiWdbjGHmms32hxXUF2uvbemYIgktB9i2qPPZCmg7HZ8gfo nzQ6TwPVkRLifqvVVdlBq6WCt5nPi8+S9Lz5minbqPSbs8Jahs/SqzwM8NRr9xbPrG91JVqMGbgDp yULndGSaGbHLJKxgoUvQ==; 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 1hKfow-00016D-6Z; Sun, 28 Apr 2019 09:10:02 +0000 Received: from mail-pg1-x543.google.com ([2607:f8b0:4864:20::543]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hKfot-00013a-AP for linux-rockchip@lists.infradead.org; Sun, 28 Apr 2019 09:10:00 +0000 Received: by mail-pg1-x543.google.com with SMTP id f6so3700424pgs.8 for ; Sun, 28 Apr 2019 02:09:59 -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=Gmv72XAUwvL32XO90b4eb/ahZYMWppaAG+neC+SSpjE=; b=jUtUte4rlz/WZN8jisim3Zn01PqDp4IYfr+gAwnaFXIaVHW906ybuibH8JvqpgWeNz J+zajtMiT7vlaHVetFGhPjHAdXf+1h0zzrC5f2O6y4cBsmMviGAblENWnnuR7Gb8AzZI 2I4g1BbUO8RvxrYYs++aa7sRjbC312+Kf7XDs= 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=Gmv72XAUwvL32XO90b4eb/ahZYMWppaAG+neC+SSpjE=; b=JmdAHHxmv0nhJ5c9VOHvTm6joQtk8bbIcYucXFlP/8hm2VOsXzn3ZHZrqiHyo16Fb0 qal6tOtcpJNGGVRn+TTJQCpFJJbU3XUC0x1ZVMMNi7T72+NU7iSUqfvePsQT4ba1LrW0 1Bz5Ma4JEGifXbgdBsdTk2Kdd8Oe+ltsF2r6oQ7k1Pab6C17evjidPuNSX8vOwFNVMQI m7+v7jWzdRpuKlvEL8BAz6fJFJZX8KOXy5sKTEC26NAE+ej47iKAqNSU/K7vIQAo8qU4 nwXnQZoUKOW4wlrrfAQv+UjeWpRQHsMpt268Vlt4vDqcR5jzUnZOyYt5hhUS1Y2czwCM eJYA== X-Gm-Message-State: APjAAAX7ZKY7KwGUBN25vrsFf3lFiDaYHzqcclNJNuAjtuAMFmVmFug8 P5XREgq0SSzBkPaQF6Uairun3w== X-Google-Smtp-Source: APXvYqyTNEvLVdD2F0apo6zNhxfbt7MJmV8tr+KrTDjtjTsb4692ckzmQ1O7G/Ml/ThVtzlXSUELcg== X-Received: by 2002:a65:480c:: with SMTP id h12mr52210940pgs.266.1556442598841; Sun, 28 Apr 2019 02:09:58 -0700 (PDT) Received: from localhost.localdomain ([115.97.185.144]) by smtp.gmail.com with ESMTPSA id k7sm3040338pfk.93.2019.04.28.02.09.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Apr 2019 02:09:58 -0700 (PDT) From: Jagan Teki To: Simon Glass , Philipp Tomsich , Kever Yang , Akash Gajjar , Tom Rini , Manivannan Sadhasivam Subject: [PATCH v2 7/9] Makefile.spl: Create u-boot-spl-rockchip.bin for rk3399 Date: Sun, 28 Apr 2019 14:39:11 +0530 Message-Id: <20190428090913.10568-8-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190428090913.10568-1-jagan@amarulasolutions.com> References: <20190428090913.10568-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190428_020959_357692_B515A20E X-CRM114-Status: GOOD ( 11.90 ) 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: Paul Kocialkowski , 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 would require an explicit call to mkimage for creating bootable images which indeed specific to SoC family along with boot devices. Example of creating bootable image for rk3399 family with SD boot device as ₹ mkimage -n rk3399 -T rksd -d ./spl/u-boot-spl-dtb.bin u-boot-spl-rockchip.bin This patch would do the same think via Makefile.spl for rk3399. This would be an initial version and it can easily expand further to support other families of SoC's with variety of boot stages like TPL, SPL. Signed-off-by: Jagan Teki --- arch/arm/mach-rockchip/Kconfig | 8 ++++++++ doc/README.rockchip | 3 +-- scripts/Makefile.spl | 21 +++++++++++++++++++++ 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index dbe7f11d39..286c870135 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -222,6 +222,14 @@ config ROCKCHIP_SPL_RESERVE_IRAM config ROCKCHIP_BROM_HELPER bool +config SPL_ROCKCHIP_IMG_NAME + string "SPL Rockchip image name" + default "rk3399" if ROCKCHIP_RK3399 + help + To create SPL image for rockchip targets the image name would + depends on the SoC family that would pass as an argument as + '-n rk3399' to mkimage for creating Rockchip SPL boot image. + config SPL_ROCKCHIP_EARLYRETURN_TO_BROM bool "SPL requires early-return (for RK3188-style BROM) to BROM" depends on SPL && ENABLE_ARM_SOC_BOOT0_HOOK diff --git a/doc/README.rockchip b/doc/README.rockchip index c4e5f83da7..ccbaaaa9a7 100644 --- a/doc/README.rockchip +++ b/doc/README.rockchip @@ -421,11 +421,10 @@ Option 2: Package the image with SPL: - Prefix rk3399 header to SPL image => cd /path/to/u-boot - => ./tools/mkimage -n rk3399 -T rksd -d spl/u-boot-spl-dtb.bin out - Write prefixed SPL at 64th sector - => sudo dd if=out of=/dev/sdc seek=64 + => sudo dd if=spl/u-boot-spl-rockchip.bin of=/dev/sdc seek=64 - Write U-Boot proper at 16384 sector diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl index 54b160d72b..49c0641aa2 100644 --- a/scripts/Makefile.spl +++ b/scripts/Makefile.spl @@ -235,6 +235,10 @@ ALL-$(CONFIG_ARCH_ZYNQMP) += $(obj)/boot.bin ALL-$(CONFIG_ARCH_MEDIATEK) += $(obj)/u-boot-spl-mtk.bin +ifdef CONFIG_ROCKCHIP_RK3399 +ALL-$(CONFIG_ARCH_ROCKCHIP) += $(obj)/u-boot-spl-rockchip.bin +endif + all: $(ALL-y) quiet_cmd_cat = CAT $@ @@ -369,6 +373,23 @@ MKIMAGEFLAGS_u-boot-spl-mtk.bin = -T mtk_image \ $(obj)/u-boot-spl-mtk.bin: $(obj)/u-boot-spl.bin FORCE $(call if_changed,mkimage) +# Rockchip specific SPL build +ifeq ($(CONFIG_ROCKCHIP_RK3399),y) + +ifeq ($(CONFIG_SPI_FLASH_SUPPORT),y) +ROCKCHIP_IMG_TYPE := rkspi +else +ROCKCHIP_IMG_TYPE := rksd +endif + +MKIMAGEFLAGS_u-boot-spl-rockchip.bin = -n $(CONFIG_SPL_ROCKCHIP_IMG_NAME) \ + -T $(ROCKCHIP_IMG_TYPE) -d $(MKIMAGEOUTPUT) + +$(obj)/u-boot-spl-rockchip.bin: $(obj)/u-boot-spl.bin FORCE + $(call if_changed,mkimage) + +endif # CONFIG_ROCKCHIP_RK3399 + # Rule to link u-boot-spl # May be overridden by arch/$(ARCH)/config.mk quiet_cmd_u-boot-spl ?= LD $@ From patchwork Sun Apr 28 09:09: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: 10920863 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 8C8F3912 for ; Sun, 28 Apr 2019 09:10:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7B4042837E for ; Sun, 28 Apr 2019 09:10:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6F586286A7; Sun, 28 Apr 2019 09:10:11 +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 18256287D1 for ; Sun, 28 Apr 2019 09:10:11 +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=KTxnrft0iOVAqcBC6BUQ6NGFdgv52EpdUeCp90Zbick=; b=n7v0ZZsqIkLjt7 LXMJUdbI601YTr2uz59mLx6szGmPrs9sglMHnQjMpcFAMB+vmKa/IS2mPTGYculiweQl0ffzPKP/c 2SqvSozK/HxsKlKfsgVg4onqC1gCrrEID3Ye+mXkj9T1/ZDSCC5hXhbTfa6SX3rmrxRY9LJGhPN4z BnARwzvAFOMWFhWhOyvZz7heG7Q5a52dyyKHS6xQRfej+YItLOQNJRTEZO8za9v0vx2+r3OcmoSQQ mvnDOwHfGyzHbX68DW9+tmPkIPY+T2jPiwOAXrKn2SXYNs1G0bMG4+31jXbDwNLhAwrJzq3KAREoh VeZfqJBlhncT39KvPd4g==; 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 1hKfp1-0001pi-IQ; Sun, 28 Apr 2019 09:10:07 +0000 Received: from mail-pf1-x443.google.com ([2607:f8b0:4864:20::443]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hKfoy-0001Fg-EC for linux-rockchip@lists.infradead.org; Sun, 28 Apr 2019 09:10:05 +0000 Received: by mail-pf1-x443.google.com with SMTP id 188so3837014pfd.8 for ; Sun, 28 Apr 2019 02:10: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=jbmGXxkwOz7cAfu5fBsEmJSPwRK5yjC7zph2SDNhFiY=; b=mQP1jm2kW5E7f/TJqjF21UgNDuOU38qsMcAe4kg55+gsvBwgXRQBwEUSw1ftfxKANk wadVvUFqILAMS9foLngwaLNB1Bl1bhBqSuW6i0tBrn0BtTpIsAKLxKb5ogQqF437MmeD pdKMK5XPvuEQ4/D0PDik8QXpoYM1xknXdcwJc= 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=jbmGXxkwOz7cAfu5fBsEmJSPwRK5yjC7zph2SDNhFiY=; b=I/S/lJEJ6XagqPePVmiNwUiBGYoQV0LhPjKyGx6bjYI5Bcj8Mr8cFxIl+9WasViEZL rPulGiMfnE0Nhnd0DBUy+9Ab6KDcQkWkxqz8QzRILxRX1bXovCQnca8LG9Gw8YAcH7ig GQGxwh9AlTxPEaa5p7lQR9djCCJZxRBkhNa6uZhmcCM6U+cUuGCv8hufV3T3B1wKZQFH ZWQ/l/o10cZZo+VuOR8POP6N2qu6omMg214tMrzTZh3axUNfj5w3Z68VhLoe+NanMKDQ dAqAgScfcHlbXsQZRRtFxiPlijTfCTIXElWjyumJDFPH6FvGdo5l/DzB+LQCQj/8b2q5 vxtw== X-Gm-Message-State: APjAAAU+EC0fnO9w9H6komsH5YWRvhn8nbAOmqO6BRxTQzhHzCT6978y oGWItVu3SerpRI3065smZcjoEw== X-Google-Smtp-Source: APXvYqzngpU6WrUEKHPTrgr7tssKeZMGXTq0kQeXmsfs6Sb6uRHMWJn5ugq4lGv+3e+KewqHx3CVHQ== X-Received: by 2002:a65:518d:: with SMTP id h13mr53637108pgq.259.1556442603558; Sun, 28 Apr 2019 02:10:03 -0700 (PDT) Received: from localhost.localdomain ([115.97.185.144]) by smtp.gmail.com with ESMTPSA id k7sm3040338pfk.93.2019.04.28.02.09.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Apr 2019 02:10:02 -0700 (PDT) From: Jagan Teki To: Simon Glass , Philipp Tomsich , Kever Yang , Akash Gajjar , Tom Rini , Manivannan Sadhasivam Subject: [PATCH v2 8/9] dts: Makefile: Build rockchip dtbs based on SoC types Date: Sun, 28 Apr 2019 14:39:12 +0530 Message-Id: <20190428090913.10568-9-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190428090913.10568-1-jagan@amarulasolutions.com> References: <20190428090913.10568-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190428_021004_500723_8347E37C X-CRM114-Status: UNSURE ( 9.42 ) 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: Paul Kocialkowski , 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 Sometimes u-boot specific dts nodes or properties can use from config macros from respective rockchip family include/configs files, example CONFIG_SPL_PAD_TO. So, it's better to compile the dtbs based on the respective rockchip family types rather than rockchip itself to avoid compilation issues. This patch organize the existing dtb's based on the rockchip family types. Signed-off-by: Jagan Teki --- arch/arm/dts/Makefile | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index a2911fa2fd..0f9d6b7d0d 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -60,11 +60,19 @@ dtb-$(CONFIG_KIRKWOOD) += \ dtb-$(CONFIG_ARCH_OWL) += \ bubblegum_96.dtb -dtb-$(CONFIG_ARCH_ROCKCHIP) += \ - rk3036-sdk.dtb \ - rk3128-evb.dtb \ - rk3188-radxarock.dtb \ - rk3229-evb.dtb \ +dtb-$(CONFIG_ROCKCHIP_RK3036) += \ + rk3036-sdk.dtb + +dtb-$(CONFIG_ROCKCHIP_RK3128) += \ + rk3128-evb.dtb + +dtb-$(CONFIG_ROCKCHIP_RK3188) += \ + rk3188-radxarock.dtb + +dtb-$(CONFIG_ROCKCHIP_RK322X) += \ + rk3229-evb.dtb + +dtb-$(CONFIG_ROCKCHIP_RK3288) += \ rk3288-evb.dtb \ rk3288-fennec.dtb \ rk3288-firefly.dtb \ @@ -77,14 +85,20 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \ rk3288-veyron-mickey.dtb \ rk3288-veyron-minnie.dtb \ rk3288-veyron-speedy.dtb \ - rk3288-vyasa.dtb \ - rk3328-evb.dtb \ - rk3399-ficus.dtb \ + rk3288-vyasa.dtb + +dtb-$(CONFIG_ROCKCHIP_RK3328) += \ + rk3328-evb.dtb + +dtb-$(CONFIG_ROCKCHIP_RK3368) += \ rk3368-lion.dtb \ rk3368-sheep.dtb \ rk3368-geekbox.dtb \ rk3368-px5-evb.dtb \ + +dtb-$(CONFIG_ROCKCHIP_RK3399) += \ rk3399-evb.dtb \ + rk3399-ficus.dtb \ rk3399-firefly.dtb \ rk3399-gru-bob.dtb \ rk3399-nanopc-t4.dtb \ @@ -96,9 +110,12 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \ rk3399-puma-ddr1866.dtb \ rk3399-rock-pi-4.dtb \ rk3399-rock960.dtb \ - rk3399-rockpro64.dtb \ + rk3399-rockpro64.dtb + +dtb-$(CONFIG_ROCKCHIP_RV1108) += \ rv1108-elgin-r1.dtb \ rv1108-evb.dtb + dtb-$(CONFIG_ARCH_MESON) += \ meson-gxbb-nanopi-k2.dtb \ meson-gxbb-odroidc2.dtb \ From patchwork Sun Apr 28 09:09:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 10920865 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 752FB912 for ; Sun, 28 Apr 2019 09:10:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 63AD928647 for ; Sun, 28 Apr 2019 09:10:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 57D262880A; Sun, 28 Apr 2019 09:10:16 +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 D054928647 for ; Sun, 28 Apr 2019 09:10:15 +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=R3XoM3gn0FwoRyAWl5W30kQHcVyqcP1JEzWh0jbJBmU=; b=NGXmepXIDeTZ8y wyQPlQo9B6NeWZ43AnK1aulMcdqNNeB4oo1zThr9ijzgknUMPbaHSPB+X81+uLwd/4b8aN5U6EOBQ pU/cIabvYantHIU20k4Bo8y/4Y/q05+aKu58+OAJao3Bs7nMbNJBvYkDEIxu5NBXEDMCQyyl8BxW6 38kim5vlACQAdc8iEKWZuzxIBvP8F8Uyh+7aMGUr3Pgc4tv0g6+SXpBZ9Vq+S4TeFxVfLyYZOGqK8 elYtchK4Yryc2VuJjCwU1KBzNIPM9Ee4OPKh8sXvbgTFXGj+sE/eP5PfJ6/fGjOiCbXzlfZo1Axjl KV3FEx3BQ3OQRKqdJKiw==; 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 1hKfp6-0002QF-Bq; Sun, 28 Apr 2019 09:10:12 +0000 Received: from mail-pf1-x441.google.com ([2607:f8b0:4864:20::441]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hKfp3-00020r-GZ for linux-rockchip@lists.infradead.org; Sun, 28 Apr 2019 09:10:11 +0000 Received: by mail-pf1-x441.google.com with SMTP id w25so3830465pfi.9 for ; Sun, 28 Apr 2019 02:10: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=atSux2CLVgvkAm/ZF1YbZ3Gw1E2OtZol0Foof5k36KQ=; b=Y54ynMdNqP620+jYdLekHXHNfPJTLp4IMsAQmksyATfYIkhztUg4YZZjGy/SRHxAVM 3OouvORqKBjJlwglBZwR2wySb65wZUx4LrHmqMN4eyCzu0nj/GlpP213oSQ7TIm7hMG1 gsM+KCRZbHzyncvnSImypGx6pHjqtk6Vh3e00= 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=atSux2CLVgvkAm/ZF1YbZ3Gw1E2OtZol0Foof5k36KQ=; b=fZFFhh1mX9l1B3mLXpG5j1KqfC4Js5lMJv2Yi/MRP8S1BYpsFaEt7RluvL8O3nF5/H jwUO87tiHy7Ytv7BcJ1UsnSnDXitYzaeQagZmtG3v+2gWWXN99+6Ax9N3ZLvtmNG0RT3 OZmKRxiO8B68nae1HSrqINMOzQeqpPKGoIvulazVj5I5xD6tvsgiEy4yB0R82+sflRJt hxFYttWnGDf+JjpmKwAFc1PHmANmVbp7W+REFXrI4T82gZG6nRzN4rgFEAnvZa5JaevO RZjLbbf7tV85bIzKQnKC7dAKPJ9OOEyfYhxRV6ZlhMwhJLF9KxKEmFFZ/ZfLeQ13Fs/T cCHQ== X-Gm-Message-State: APjAAAXhOXGWYpRgRhUkDaIr4jhO7NSx9uZ5viVhKWT2EHJkZms9xbrq O2MvyKTFKnWHW0boX9AideaqtA== X-Google-Smtp-Source: APXvYqzvsbx9AKxeZgs7QPbPPKorGhTgZnfezUtdeCOouaOjpRAzkHkKhKNy1Ev0Icom9c8JzyFhhw== X-Received: by 2002:a63:2b41:: with SMTP id r62mr53139332pgr.403.1556442608545; Sun, 28 Apr 2019 02:10:08 -0700 (PDT) Received: from localhost.localdomain ([115.97.185.144]) by smtp.gmail.com with ESMTPSA id k7sm3040338pfk.93.2019.04.28.02.10.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Apr 2019 02:10:07 -0700 (PDT) From: Jagan Teki To: Simon Glass , Philipp Tomsich , Kever Yang , Akash Gajjar , Tom Rini , Manivannan Sadhasivam Subject: [PATCH v2 9/9] rockchip: rk3399: Create single image using BINMAN Date: Sun, 28 Apr 2019 14:39:13 +0530 Message-Id: <20190428090913.10568-10-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190428090913.10568-1-jagan@amarulasolutions.com> References: <20190428090913.10568-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190428_021009_564763_ECFB4D46 X-CRM114-Status: GOOD ( 11.41 ) 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: Paul Kocialkowski , 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 RK3399 platform has two stage boot loaders like SPL and U-Boot proper. For each stage we need to burn the image on to flash with respective offsets. This patch create a single image using binman, so that user can get rid of burning different stage boot images. without this patch: ------------------ ₹ sudo dd if=spl/u-boot-spl-rockchip.bin of=/dev/sdc seek=64 ₹ sudo dd if=u-boot.itb of=/dev/sdc seek=16384 with this patch: --------------- ₹ sudo dd if=u-boot-rockchip-with-spl.bin of=/dev/sdc seek=64 This would easily extend if other rockchip family SoC's would make use of single image creation. Signed-off-by: Jagan Teki --- Makefile | 13 +++++++++++++ arch/arm/dts/rk3399-ficus-u-boot.dtsi | 1 + arch/arm/dts/rk3399-rock960-u-boot.dtsi | 1 + arch/arm/dts/rk3399-u-boot.dtsi | 17 +++++++++++++++++ arch/arm/mach-rockchip/Kconfig | 1 + doc/README.rockchip | 8 ++------ include/configs/rk3399_common.h | 2 ++ 7 files changed, 37 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 2471340c71..0fe7ac3cc0 100644 --- a/Makefile +++ b/Makefile @@ -851,6 +851,11 @@ ifeq ($(CONFIG_ARCH_SUNXI)$(CONFIG_SPL),yy) ALL-y += u-boot-sunxi-with-spl.bin endif +# Build a combined spl + u-boot image for rockchip +ifdef CONFIG_ROCKCHIP_RK3399 +ALL-$(CONFIG_ARCH_ROCKCHIP) += u-boot-rockchip-with-spl.bin +endif + # enable combined SPL/u-boot/dtb rules for tegra ifeq ($(CONFIG_TEGRA)$(CONFIG_SPL),yy) ALL-y += u-boot-tegra.bin u-boot-nodtb-tegra.bin @@ -1366,6 +1371,11 @@ u-boot-sunxi-with-spl.bin: spl/sunxi-spl.bin u-boot.itb FORCE endif endif +ifeq ($(CONFIG_ROCKCHIP_RK3399),y) +u-boot-rockchip-with-spl.bin: spl/u-boot-spl-rockchip.bin u-boot.itb FORCE + @$(call if_changed,binman) +endif # CONFIG_ROCKCHIP_RK3399 + ifneq ($(CONFIG_TEGRA),) ifneq ($(CONFIG_BINMAN),) # Makes u-boot-dtb-tegra.bin u-boot-tegra.bin u-boot-nodtb-tegra.bin @@ -1664,6 +1674,9 @@ spl/u-boot-spl: tools prepare \ spl/sunxi-spl.bin: spl/u-boot-spl @: +spl/u-boot-spl-rockchip.bin: spl/u-boot-spl + @: + spl/sunxi-spl-with-ecc.bin: spl/sunxi-spl.bin @: diff --git a/arch/arm/dts/rk3399-ficus-u-boot.dtsi b/arch/arm/dts/rk3399-ficus-u-boot.dtsi index eab86bdb30..67b63a8352 100644 --- a/arch/arm/dts/rk3399-ficus-u-boot.dtsi +++ b/arch/arm/dts/rk3399-ficus-u-boot.dtsi @@ -3,4 +3,5 @@ * Copyright (C) 2019 Jagan Teki */ +#include "rk3399-u-boot.dtsi" #include "rk3399-sdram-ddr3-1600.dtsi" diff --git a/arch/arm/dts/rk3399-rock960-u-boot.dtsi b/arch/arm/dts/rk3399-rock960-u-boot.dtsi index 5256f6d3f2..7fb5072a9b 100644 --- a/arch/arm/dts/rk3399-rock960-u-boot.dtsi +++ b/arch/arm/dts/rk3399-rock960-u-boot.dtsi @@ -3,4 +3,5 @@ * Copyright (C) 2019 Jagan Teki */ +#include "rk3399-u-boot.dtsi" #include "rk3399-sdram-lpddr3-2GB-1600.dtsi" diff --git a/arch/arm/dts/rk3399-u-boot.dtsi b/arch/arm/dts/rk3399-u-boot.dtsi index 0786c1193a..abd0b091ab 100644 --- a/arch/arm/dts/rk3399-u-boot.dtsi +++ b/arch/arm/dts/rk3399-u-boot.dtsi @@ -3,6 +3,23 @@ * Copyright (C) 2019 Jagan Teki */ +#include + +/ { + binman { + filename = "u-boot-rockchip-with-spl.bin"; + pad-byte = <0xff>; + + blob { + filename = "spl/u-boot-spl-rockchip.bin"; + }; + + u-boot-img { + offset = ; + }; + }; +}; + &sdmmc { u-boot,dm-pre-reloc; }; diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index 286c870135..7ac0ee3c2d 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -130,6 +130,7 @@ endif config ROCKCHIP_RK3399 bool "Support Rockchip RK3399" select ARM64 + select BINMAN select SUPPORT_SPL select SPL select SPL_ATF diff --git a/doc/README.rockchip b/doc/README.rockchip index ccbaaaa9a7..4ceb383bb7 100644 --- a/doc/README.rockchip +++ b/doc/README.rockchip @@ -422,13 +422,9 @@ Option 2: Package the image with SPL: => cd /path/to/u-boot - - Write prefixed SPL at 64th sector + - Write single spl + u-boot at 64th sector - => sudo dd if=spl/u-boot-spl-rockchip.bin of=/dev/sdc seek=64 - - - Write U-Boot proper at 16384 sector - - => sudo dd if=u-boot.itb of=/dev/sdc seek=16384 + => sudo dd if=u-boot-rockchip-with-spl.bin of=/dev/sdc seek=64 => sync Put this SD (or micro-SD) card into your board and reset it. You should see diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h index b412012582..a658f03ade 100644 --- a/include/configs/rk3399_common.h +++ b/include/configs/rk3399_common.h @@ -38,6 +38,8 @@ #define CONFIG_SYS_SDRAM_BASE 0 #define SDRAM_MAX_SIZE 0xf8000000 +#define CONFIG_SPL_PAD_TO 8355840 + #ifndef CONFIG_SPL_BUILD #define ENV_MEM_LAYOUT_SETTINGS \