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: 307 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 4168B3F08F for ; Sun, 28 Apr 2019 11:09:35 +0200 (CEST) Received: by mail-pl1-f198.google.com with SMTP id a17sf4262079plm.5 for ; Sun, 28 Apr 2019 02:09:35 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1556442572; cv=pass; d=google.com; s=arc-20160816; b=vTiD/QpDBQtARRoI/FKwIoEfoYGE1S0RJxR+rky4ZJboI87kr4JYumCURbxrvK5Gkd zC8asnmn2GRf2YoCqlXXtUFZkpthg6t8DSB6g73Kmvf1kucDK6Qfgb/qGrjy7XZhJuLb YWNae1StRPsadCy6HxeIX6lDGN7e4Jv56JLZn6n0p48KEyjMM6Cef38FS6Lm+IFmyLgS nO4M1PKtsTnUIEdddQVGSE3QiorDxdf76/QvP6I25RWcCXEEC0FFNNgBSYHSGCvBxQQf mOrzNNXI7zTthLKNR6qlIxa6IkSMteClsDhdeKX8dV8xNAm23tng3L8/thzkE773d5bs T9eg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=wKYMGjbsPDAbi2FQh/w5WOaOcPPKyUMJN1XUCV3qDQQ=; b=LtFhQqbPM2AhPu0tH5imtHkuQCGd0/JiNjebk29qSCDH1k2r3zfM7DD5oB9WxBcMeJ Y4+RJqA5ce11BJbOSd6+X1IW85WCTzq2o8tGWA28VOsNRMzrkaIsbyiVEYFAz16imQvf 3hbUR0WYrWnxk8/psGLJ7BI8hWsD0V6+z3D1sKvrNMLyNl7OusWPLoBvcWX11v/S7G+6 OD/ohmrwUWoX8yIhGf151ftpwD/daDHPiUwj+UMJTcrxVGXWzY3MHcerCXVp1SMILZTa GZZX4kA1LU6YhN79fbdVIevQIAKjV2t7ON65fYexM+ZntalytKX3q8GCHvmGFRwNe0Uk j56g== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="o91/C98E"; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com 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:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=wKYMGjbsPDAbi2FQh/w5WOaOcPPKyUMJN1XUCV3qDQQ=; b=ESBqROf660MqjOwfsJPw/x9oqgMzASO3iTehrnMDzqOx6tL1LY0o9aOzHobsmfTBCv EBIKSwgj8/Io1y6POX4haTS4CSE1E9yLYuWhKs8oXqeKIVkV83F35TjM2TCinQqUdRCf L/kpW0RFsQCPl48riJvYrAcs5wtyJ/WD8OyJQ= 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:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=wKYMGjbsPDAbi2FQh/w5WOaOcPPKyUMJN1XUCV3qDQQ=; b=OrYPNG0zf3mvnSPkMmmVYi+AVblYTt/zqqBAJupf9MKtK6qm+ha5ZQUzP1+W+kr0i+ KWOR3xg5kriaRKgJQdoHLVBKu6rfeEflILN7QinMtA4/oTNqgSsDD8CECicZqM1BAJtd OHJ7gc+He7zAFGLID+eOnxIWFcDGST4nlKnOcEj9HJvHGHVwYVmnNQ60egWSBISH63qS Sh2uzWfOfBY9H3MA7zjOVVYmHDfVot0McVBx4Z3CQVMQWwcSm5LPT0v+v8IRQtu2PtPK HRZIkGTQyEha1BoEbfseyMd4ORLDDXuhm+V+1E/VIKFi+dlrI2l0lV6UojP+RnT8Esnq 7RYw== X-Gm-Message-State: APjAAAXL/44x9SC7Mj+Hho7gcFDEfQt5MCAx3umGNv5WcmPLw/3z/A4X yyhYPDdNe6DW5gaaaqDLgq0JmzFS X-Google-Smtp-Source: APXvYqyMXRSd/7y3pX3QkICuqBJMLkcNz96RbKS0zcBvCGBLTKd4lhl8SHmCC4Dmxc94BwzpCwqOsA== X-Received: by 2002:a65:5009:: with SMTP id f9mr52635035pgo.390.1556442572748; Sun, 28 Apr 2019 02:09:32 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:aa7:8085:: with SMTP id v5ls35933pff.5.gmail; Sun, 28 Apr 2019 02:09:32 -0700 (PDT) X-Received: by 2002:a62:be14:: with SMTP id l20mr20946788pff.241.1556442572380; Sun, 28 Apr 2019 02:09:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556442572; cv=none; d=google.com; s=arc-20160816; b=h1+k8WRK5NT6g3acCyCAP5pWM0c9N+/HA3dhivFRWGjiH4revrTeIzhGlzX8bD7YXf 74Xz9Qv9/zlhF6a1S34lItkgGO+/kgee+nhLqajIvG7Cq+h/d3maVG11KtP5MzbZOA8T u0F/W9YqgZYEGZlbSO3CWAT4TFmZ4xWAgNF8UT4KhPLuixGOhsnKuhPYn8vnzyA9flzR 2jhW76pdogpCCGTZq3WL33L77VRMc+J1YO7ti9I41uEGQvQNIvRXvtyuu94kQEp9dlBC 6EEnz1uk+ymJ4jowhtB8qJVFoCHrY2HeyMgQ8UMU6SRMAaBr4rZl5gi62CecIfaomsHI R1Qw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=5+ktBmcEqonH5rPmgSadgYviy3zTlgCbf0riGNhR3/g=; b=vzPirbTT0VaArxemYrLQtPu9cxA2BeNgCf5sFkNyHSztP79jmscuEOn3TGjmVuYhEb uAm1si0mRb67O22xfezGQgoGbm1K0bQ8uZqE7dyVcQrU/vlK5fpsaxpFL7uZSyq9ogk5 2RzwgXL1Wx2y+PCMfg+ND/Qw4EjZnfY+0a7+tuPX++5FyEUB1uu3KPYocKH7CKj10Y7G wrnkWd9Zux35w1emv3a4vLz6eU4SqIzQWH/0a0fBtFCDqLYn1fwQK2CMtgBbrynxNW6K XAiKtJLOASbhG5D62gO2r+Ei9LKEJAL+e7srzVT/yucnbihzaSC7XvRaZU4q2GLUbAjW Tg6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="o91/C98E"; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id t10sor30168058plq.14.2019.04.28.02.09.30 for (Google Transport Security); Sun, 28 Apr 2019 02:09:31 -0700 (PDT) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; 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 Cc: Paul Kocialkowski , linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, u-boot@lists.denx.de, Jagan Teki 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-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="o91/C98E"; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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: 308 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 53BAA3F08F for ; Sun, 28 Apr 2019 11:09:37 +0200 (CEST) Received: by mail-pf1-f199.google.com with SMTP id b12sf5332213pfj.5 for ; Sun, 28 Apr 2019 02:09:37 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1556442576; cv=pass; d=google.com; s=arc-20160816; b=Kr5gFhrA5wlP2mwncTrTfQoZrHZIqDCXv6qzm0MPNe6oMADjnIqTwi5QrdThCEvmx+ EmDZwGHYphyuU9MFxTFQFFmSAFRcfbB+bgbIKAOcdy1Yrb6qaGq6EvCWnndnJfBIF56q i0dSnuH/a+eyB/KBYNAiWvvP3YRe1b7KuAZF7pNK63JH3QNdzAYL0EARgJzlMbJLy/Lq 5XSrAXyaoavae7IekioVHEW/fqkHBewXep1sqkn7Yug6taMxn5Czpz3JADzy7hKimItR GNw7ueaosS0NzFCtd4WC2mCwqTheSpsbVVsOxLgfL8ZMR3jYtFj+DMH9SqrDm5+p5pes aFyA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=U5piaG8KxzF7Smhz4x4ZCpuzlTt1ziVDwXH10AnHzOM=; b=BtKbj6p59A6ZTluon5fZl9wYCuxAwzHVwoBLPh7o6JE/GIhtniWaxKjHO14mX7tamK WOwlvbqd+kkuY49U0IpttuOntpew3pNt5qBLkOMnMGEyu0DImMSjcy7GL8OiTXOrexBZ knsy1RXWk+B/8Age3+RBEF/od3Dt0z0FVxZ7iod56TmUm0+j7yprmJ56GlKNuzpUA1UH 6ZtDBdVXbMB27ndSb++KHaUMGWfal8VMtS4hg3SADnI/DRO4SgOHnRtMkd4zeyjZRrc3 g6bwIPuxJsyHs6j4HFPd35I9BJC+6eEGeNDlZBy2lLIfJuupqYK9AkhGkBrz6AjfsSvn st0Q== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=k1MUIcVU; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com 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:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=U5piaG8KxzF7Smhz4x4ZCpuzlTt1ziVDwXH10AnHzOM=; b=B9B1d7OE/SqQ6dBADbx58x9KSUZe1ipWpgttYFgTxwzWUfox0YOD7lADGMtoNa2nEj XN9zAE3eOQXk3ky4Ms9Py3V8co7rDYaTbQKRQnBfvOh/i0o2AHhT2n2Hxv6Ib40K1M4r t7YtC1JYEELz9KqTvcl6g71GiPyi0semof8uE= 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:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=U5piaG8KxzF7Smhz4x4ZCpuzlTt1ziVDwXH10AnHzOM=; b=XAEaoB8/6UlbJ6uQH6KeJ65LhSw7KEK9rCAjYPkkvM1ux9P5Dm8OCLQdlXujDuTbGH 6Jt89gheili91oO1XJ9F/ic65uIuCqJYkItGp7t/fUFulPxMUes3zhJIn7BHr+kiDBqI SZ6uIDbM4EMRjbLcVnD3I3K/YOg3brIcH2R+o4bX93EA6aSyA2I6T9NktRFSt4D/ZsGE kjDDYIo3vL2rFJNiEVWcg1IQ6J6d/EYqMh1WimGwRRe5cZuLNHpkRUlEjewXDlJyK1Pv 5Yr77dMtAzsBOLq6Dt4LfwO38CyWS/rCIKP9DdmEyP0EZe/AAOV6Kh30tPVlfEJ6MnsR XjBg== X-Gm-Message-State: APjAAAWywSdrv+oNDi7Ii7sXSdYeEN4NebZIr+NixJrKhj0iOLcvOWhG Pm1Qynh2eLizFiIMdwdsR1ibipLU X-Google-Smtp-Source: APXvYqwOPe/beHFR6gfjDZ9tekrDSrcM37OSGswTis1vIUnNyDeczpBs4oRMCRFC46Yim7QY7r5Tkw== X-Received: by 2002:a63:570d:: with SMTP id l13mr53213665pgb.55.1556442576138; Sun, 28 Apr 2019 02:09:36 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:902:9347:: with SMTP id g7ls8154791plp.7.gmail; Sun, 28 Apr 2019 02:09:35 -0700 (PDT) X-Received: by 2002:a17:902:7783:: with SMTP id o3mr2465970pll.159.1556442575793; Sun, 28 Apr 2019 02:09:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556442575; cv=none; d=google.com; s=arc-20160816; b=sHvmpVyeHaVpdqKoVOCIZ7/r3cn50sa7GRr3H6JYxdGSFbgFYrh6PL/clLE3PV4pDt f5CXA+gn/ldRf9q5Io3XfxDQIQRjnw+il3SUYKCrb69lJyE3W/MeniG8dkGW2ROKA1U7 ZO9dv+Gw3gUEB0EqTRwDfgttc7svWZIQW+neiBSsJyY6lhWUCpeW3d1T33z5at9Fi6nB 3ZEGTKN+g/eQz7X54BKZM+sgbvE0Sqi8RFJC+JgDikt6pFb/c0fc34+CU5IydS0sHpJm xtlDRuZ2takMvqdFNpD+98634wOi4TzY7d3NEJJm1iP32UT6kEhxKlhYGiMOypiD31NR yy8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=l78wQw2FrFbs7HVkEO1pmaqFMcARGbget66qc4bGZpw=; b=fEsafWflWWXui7Y+6VmsBDnMV0z/Vkm0OekqMOv9yKqc93uv8wW8B6eAODvT2OqStB Y6lvIKGvui/pwl1H7NvzWGUJ2XFfSMuygioipaiBL22OUp5WjPFzmB/xfYvVDQLBgwu6 /OYHbaBSTdoXXNnJ55sylMlMN8e65HshWNLylHbpNBlAptvQrDK61x0RuiotE4lqXSuZ 3PGdHgiCH8hRexfXO3cXRJTmRrRqRG314EV+KmIMwotsbcGpYjDQHFdLKHyHtuuqVMYA 2/Ng8KK7UJPjvoat/CeJdekpR3NofnF+Yz1OJ/fopEZFKRAo+hNfAPEUc5DcYm7Tjzq8 Xgug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=k1MUIcVU; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id m184sor8792443pfb.44.2019.04.28.02.09.35 for (Google Transport Security); Sun, 28 Apr 2019 02:09:35 -0700 (PDT) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; 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 Cc: Paul Kocialkowski , linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, u-boot@lists.denx.de, Jagan Teki 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-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=k1MUIcVU; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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: 309 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 413883F08F for ; Sun, 28 Apr 2019 11:09:42 +0200 (CEST) Received: by mail-pl1-f200.google.com with SMTP id s19sf4254896plp.6 for ; Sun, 28 Apr 2019 02:09:42 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1556442581; cv=pass; d=google.com; s=arc-20160816; b=JU1jOnsYuPYSMHENcG7NI70ZQof55BAK6OSJkHPecF3Hm2ut6x22+rvIac5QeFY9Y3 BxsJr+/TKxOtziXMfYEGndUCfA2c+bjtsGIRKyOThdFfYtdfMJ7yy08wkCKTOiCdlcp0 LkrSBkkfo30bVEowijIuOujPKbuyiwcG5tm2nzPbChPYnv3VobNlmbVXD4w57z8PxQfi HFCMp8feOpQDDX3c0blB9dTZI4jiOcScdGU1N8vMg9Fea5I/nhHEVIvXRBboJJqqhhfm krr5yYvhucNNHHoGzjqsqIya7sUVjqJ7qYK3Waga5jXO4F7OCbZOdMEtOzB3/ci5XMji lXDw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=XfSNVSPKxZehEyMLyHtDnruztxVF6TA5SP3Orn6NbIg=; b=X6qucWo9VQ3HpDIIakHHtao1CZfGBan0qsKmG0pQSD8JJatepcdCF/oT08x1W2E2ra jb/T3e2r5JWu3j5918yauFjBrxoooeUGMbGjoljUNLQafeQR09AaP3V1FOx0VF50d+fl BgEmYY/8C+IeP+VzzlBTdTotowCAfjEdCUD3IhjIRDCxMsUnzG7/37m1KjPfrhUakHBw H5q2zO/VP/3aPd8oPOSI4I+vj9LyzwRlaGmVkABNeMDy/ObEhPzbdqNiFabuBbSVnKHo nWuuvReCruqfNxtIzG2+3/JgZWHcR12C0+vkI4zTqktIszJENQY1V13kY3EszQGlEjJY fMwg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=NwiUJDav; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com 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:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=XfSNVSPKxZehEyMLyHtDnruztxVF6TA5SP3Orn6NbIg=; b=It+eaWX8C9iQF76pwefuLIIKzQ1nv+uYoAReZTn70WGvJmcUZpctVf0w3uZYwnall2 YWSJPTZGKNDjHIAGdx8xkI9QFWe5TeN0XHVfwRppc/fRZjyjP+DoTdR/zgnYPLDMIvoF yHMEiiJdwPgfTGBH3iZ8c3Ticp7XDUp7feKAM= 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:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=XfSNVSPKxZehEyMLyHtDnruztxVF6TA5SP3Orn6NbIg=; b=sI3wdPbplEx9KYCC1Er6VSBJVtZ2wpsw4c2e/inYz9nwYG1rSMk3gjx9/AdkxMH4jn 6SeK3uKAUvAfLzkA7SiHPDHqddBisBxLh/HUM0xQWe91FCk3GWWlaavgylUA8CaQj4a0 w+zOcfjx9zQhJdz0Zab4fPd2cwXKuN0y1EIkI8o3Qg/iy/ncC3/FalEW4dTXokqrJN+6 VH1zltb1Vo6bnJS07JwhvYQ4q1FRscBpU/gyBWQj1f4lnjIVZys7+IZZh51ZUyXowDtr oiTGyAiICTEz1WVc0AM1RvUkqfix/LIirW0ixLVLuqAujRfCd7CZo7AFTTDsG/hv/VYh F8/w== X-Gm-Message-State: APjAAAUycidruLtvH89Qc4EUpdyDQ1Ysa/MMfgPtHUa/sUvamkimMUu5 6VZYl5gMn0+y5xm9MXYfg8o3syrE X-Google-Smtp-Source: APXvYqyL7T8sKmY5d5kEB3OT1Y+cq7QzWy8CvjOUxoUJHsnpydBO8Jo9/tHS+RFqrRnHHmdXXXQEaA== X-Received: by 2002:a63:c64c:: with SMTP id x12mr3425512pgg.379.1556442581052; Sun, 28 Apr 2019 02:09:41 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a62:45d9:: with SMTP id n86ls338535pfi.8.gmail; Sun, 28 Apr 2019 02:09:40 -0700 (PDT) X-Received: by 2002:a62:1194:: with SMTP id 20mr57082887pfr.224.1556442580696; Sun, 28 Apr 2019 02:09:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556442580; cv=none; d=google.com; s=arc-20160816; b=qFyC431JKgQ97GLSA7XC+iI2/mFijwasJPTIkQi61RolS7xYpEuIDgSJiNS2kxDm4q JqUb5+gv9MPxkeoapP/QQUvjMhIuNh3eALy2hbM1W3WXY9gLpm0JOcfsD2x5/+wKnQnI gMAIE2R0dXiaeWTrN9d98koGA2LwroskNTsAY5qQhs3cxcbr0LyF1Q5jWMwM4Grmd9Eo af5S7JvqXsV3AzP8ULtESD3J7fvu6WiZ45iYuulPdhX3qEznC19FQAIDrVJ8QwIzpbpA yC43trlV3/E5WNc0O7v1AaRLVP+dKxjsdQeWdrWQhiaPpXpC2sgB0TJYVgb0gstyYitf pNPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=hBCXYpHPkNhquxP0xZtz9CZGTunnfLjnuK4fNTlVrpw=; b=kd9pvWWOR8UEXLHw7d2H9anQwTPdQgxc4g4JNF+hrh5K1CUIqKz5ttabJ+7c1PPg7R iOWpib4etv7FLh2LffwdoM3Ogha55vc5oW7uLpa0HLlC2WRs1mTBanhv5EhzhRNdbTNl 67IuCDZO626fevFLdvEdWktSPCBoDQCAoWdLYDBE8sAz9l9DHcWnwBVvcgdoOnMb6GyF 6yQF36odO/0xlRdsS66uxDRAI/Atoof7/wJykJ1kCmK2W0DXKnUf4zpD0nid4RupeXVn kNHn9+sc//ZXTkwU1EnD2RmZ6cgiXOP3932eLN4wYClPE4BKcH7ZAM4JK/qO/KyokPBP ba7g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=NwiUJDav; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id x6sor5529324pgp.20.2019.04.28.02.09.40 for (Google Transport Security); Sun, 28 Apr 2019 02:09:40 -0700 (PDT) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; 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 Cc: Paul Kocialkowski , linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, u-boot@lists.denx.de, Jagan Teki 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-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=NwiUJDav; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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: 310 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id A4C9B3F08F for ; Sun, 28 Apr 2019 11:09:46 +0200 (CEST) Received: by mail-pf1-f199.google.com with SMTP id d12sf5329064pfn.9 for ; Sun, 28 Apr 2019 02:09:46 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1556442585; cv=pass; d=google.com; s=arc-20160816; b=RPcWt23XYzBXUE1lq9aLZ4u/3/XV90F8Rs2zWNudpDxhTH39PGPqidD4gLOzyskXMv h0oWbxJvwMxv5Ld/ac7qzjD1pNM/WrwCVGSwogchlk+Izb4Lone5htKXYTnxvZjCT39v AzKNb+1bNou27H1J7giAZnaeYXQhOv8igsX6nNzskzmQ++PqVx2h1XEs9ooLltQ/+YWg GoToC04ypLQU1+SbCvwayiAnEYT2wam2ETVgWqxEa8s+3yri9YsZQzSKDMjwLLpGkxsD Clh8FUjVWeTP32xM88JcVFPqU7J7Mf24rs4MeoUi+I6dPsNqum1NI5Wes9RegmgcL3km szog== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=Sg8Vm3WfMcxDyXou3Jgc1YgunnO4oqICifJRdcX3kIo=; b=0UK/Ibjd+1/GRUAMAHDh2dHj4IoJvBzH4kONJhHc5qTVV6IgfgO6ODEPVMKXMConMv oKc/DapTew4+jghSoSWWs39p+HbKER6yrtpZ3WkmEOT3pLOxF7As3HVvBdxRkoz6R6wK h/UAv6e0d2VIGcv1sxQt3IszPyz7eS/wN8ti5rzIOcOlVeTWN5Nb3c7HoI5lAJ8jAtPr YBSW75CksRRVkZVleFA6olojYx3Kzxdzb0TsJOZDU/obzulgeI8Gd9q8TtSPPuXGUqEy 88eQUVjmkwLS5ZZ7tAhsoOAZv65Tra5tyuLIoCVvELL6Qw8/2EMPZ2RzkiZvAe9IhkNy qi6Q== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=PYlanwSa; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com 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:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=Sg8Vm3WfMcxDyXou3Jgc1YgunnO4oqICifJRdcX3kIo=; b=EpZDT69ZxCQeQ2bM/97TTLRSsPth6u63VZBix8czBsWMojb4yYyQGyqvFbIjkzGE/G BsnwZC5I5iz8T2e/4C7Y+m2GHwLXNjXJZytJHtzx5yyALl8l1jqR/sLg49ctc+DbNXss YVgYneb0azgBJ3RsuuGboy79Ef7cYCXYcbwMw= 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:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=Sg8Vm3WfMcxDyXou3Jgc1YgunnO4oqICifJRdcX3kIo=; b=t7nN5OVKcLzv4Ix4HGPSC0tEkHEiVyFUQNa0FPx/gl0CiCvLMYydE1JuKruLV8OA/F RFL73Hu4PKNiIs70J/flmwXbxuqTuOQfUDvAfU4XdRhHMBs/hEEKNP3P1cTQhLYriFWa dAfEwPyCWGiUugrVDkzExRdTM+1vvxQSIeKoPgH374s4vz+YwHwom5rniHG0q6XE/whL UiW9hkUR2tY9ZtcW9kQuqGT6BA1FEvY1bJiYztSaCDUwvk0vnWZztOkVYNTEYJ0w2glZ 1X+ntahbH57B388gEsbIeBAEaLkCrP5j8YrY4VaK3AQd80FpP71tTzF33ssE0rLSYvDw PWIQ== X-Gm-Message-State: APjAAAX6wtOK4M91/ZJjDVtcUOLoXCH3ByyLw5uEQimdL36K7gqcYDkM mer2E9YVhTK5zJHCpXolExQ4ILa6 X-Google-Smtp-Source: APXvYqzUWwwX0/ev00oPa6kDcsMnydMY/P+Wrw2xtQrSGSuNcHr7kLxMZD8alE8AMG6y0djB516HbA== X-Received: by 2002:a62:a513:: with SMTP id v19mr56105040pfm.212.1556442585467; Sun, 28 Apr 2019 02:09:45 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a62:6f8a:: with SMTP id k132ls154478pfc.3.gmail; Sun, 28 Apr 2019 02:09:45 -0700 (PDT) X-Received: by 2002:a63:ff04:: with SMTP id k4mr38615852pgi.117.1556442585116; Sun, 28 Apr 2019 02:09:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556442585; cv=none; d=google.com; s=arc-20160816; b=zSiZxj4mX/qH2LbqO2EsIoAK6IE6G03WVWn2YzZ34oo9yvZ/FV8nJbDcddRx+DO+kt za6M+qncojcbw5dqm2QTwtE5qtH/opoRumSsSwFllf1trqRZFbmCvwAHtuerlUfP87wC a7ieAF7kTH4xx/P3J+QGO6yFn6Q4lusGpVycC4eGzUA0Wk44QImOQdFh45WTqwL1ymkM v4gN60k2EWK+qWI1995A/Pq6amJaE9RHPyXQQfnQl3BY7TLBVRFztikJEQb3K/v02mrN QjbAb3mdlYnh2ATAUkN0LtgKrjInk3H6UHZYoyVB2P8+MWQoRldW1yJST6J/+c0YweK4 mE0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=Ksp0RJAO0k4pfRprgoggQ+F3/fOSrjeMTlEOTKA44MY=; b=Q0aDfRxqKhS5uvdFzj1ikyx4lTIWNv0MmgOVbArbZ59JAtDVzAM6Iie+fqsiZemshT lFKV8nEHdExkBVX7rfhus5nJeRPgPeKWhBTGAMt11mDhS/pDrdBkoAi4PQOXQdxf9iaR 8MLHop6i3SKrvF5WLeWPYw6zxBnlH/NgS+vXTd8amuARiA9R4vEu3Zwiq7uMhnwlVLYS Datwgt15CMdiOGMAfG6arKXg43vzmMnuBwKR86Y06NmwPZHLUZ4rDGE+bpd0edGJ0uS7 juZzOLocfwYhMHqBBd35h7s6WwUJsx1DMnESZ/yZuD2vYIzLDWzmzlh4/1QqFF12wDpL KSQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=PYlanwSa; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id l9sor5459650pgq.46.2019.04.28.02.09.45 for (Google Transport Security); Sun, 28 Apr 2019 02:09:45 -0700 (PDT) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; 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 Cc: Paul Kocialkowski , linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, u-boot@lists.denx.de, Jagan Teki , Emmanuel Vadot 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-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=PYlanwSa; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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: 311 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pf1-f198.google.com (mail-pf1-f198.google.com [209.85.210.198]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id A80303F08F for ; Sun, 28 Apr 2019 11:09:51 +0200 (CEST) Received: by mail-pf1-f198.google.com with SMTP id j18sf5314798pfi.20 for ; Sun, 28 Apr 2019 02:09:51 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1556442590; cv=pass; d=google.com; s=arc-20160816; b=i6h4xgtOlnI3eFLXlpbBxZ9Qz2Z4YpF1sJ7DuIeC67MmyBCNDOfszHWnuzwE6PIw6F 5G7rt6nUjlUI9Pp7yZag/Q+pcIYDJudfa9nUKa9ysR6nRKGJqPIfq+ipP7II5LbxhFPu n8HZc5O0yF2rGDOgTTfNolWHKZvVs2o/Yj/w1Uc4SP3ILCQcTZ6o8YKqL3+vZdx59A00 I/1t8xNey2bXrXlFl6C0WgWb5c5kpj6ppXvF9BZhpIpw/6ZKUKjCSXXfeSWZnqv8yz5a avu7HnnBq9cV6mZBMu9Dhd7JyuTuxPQeWZuFnu7lPdY66n+EEP7q1fcZHBo0232aZ8yl XReg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=W0cdO0MiAei2hbez/vdElQDObxM1TmrFY7c0zesfHlM=; b=TB0t5Bq7oAo3D+SxaqEOWKjBpkuNZpNTZmDUQcvsdn/uvDPi3g3N/luX7jMb49jvew v5+gM+AXZY4ZmzOwIp+E2yxhZawyjG0n0yGe3jxsrIcCxygtjW/qJGeCjWZoLzYpb7fa 6gcpnhU5XIEmAREvHeWZ+1DB1ToydcoGl3o7CACyq8DQHWVZCbTyTCMLLLXhu/2rt7gs +K/Ia8oAw7li4DighGfuXfhJdxJNDlIA0cTG3uiaiahoOcBRlaWgCSCpQy0hD97gGxMC 1WdAYlFeXQRVzgJA+/mmdj9FLnXSFsmRWj/SZe4eZAxVdsxNgqQSFuy9iVIsN4+2S1CZ sJdw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=HMDKtnBu; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com 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:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=W0cdO0MiAei2hbez/vdElQDObxM1TmrFY7c0zesfHlM=; b=Ir/+trT47GjduOsPY1BRFQd3nHqjKbd4IAaHAQgdtFnbLiQUYg5Vj3ac+Nf1t3wi5J 67sBPwLWrvA4PT3l0J/cu2iUCIJ1Kdr2vtew69B66kL24mMCii/FN+SiDqAXqzJcG66i kGqFDu0kE40eNEoTr7rVpBrwbGtw/rQmJ4B28= 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:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=W0cdO0MiAei2hbez/vdElQDObxM1TmrFY7c0zesfHlM=; b=ZpelDK8ziikG/xuMV9VvgyuStHZ7lxTV7/1JyF8f/9Ppaj2pdZaZVrGctT4TTnihq1 XpWED6/LQCA55J1S6Rt1S+ynxKKFjjTEwik6rMUry6waoZUHgm+rFjyg7TGe3US71VB6 uuzaue5RVCX8WMClV/nl/Len+qrA1LMubMbBC7/cNLTOEKtc4HllT1f0Xxvpdxhkv6wj czghFejXEzN8WT7PPVnNqMDtBuMm9ptV3er+FDi3522RxxkNO6wFWYTFKdQcAnuZ4Ljn WVYCa28tBCzEwiYyGNQqTDOUYxXK90KuAqoqS35u0ix2bAd2FYVbnQkWhg61HqrOHy4m pCrg== X-Gm-Message-State: APjAAAUPQynKdVkyby6pR5e/qEPGyZOQ1PD+mKADpohQtzD9kcfa5afw cQd5HctpCT9yRKOag976b2okQknl X-Google-Smtp-Source: APXvYqyPqf4MQ+nGy9kJrGN+Dn9LTx7CiftR9Eed5pdCY1WbQ+IvjAqT0nmPPFDC8y02LQjq9oW0vA== X-Received: by 2002:a63:5012:: with SMTP id e18mr52256901pgb.383.1556442590468; Sun, 28 Apr 2019 02:09:50 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:902:144:: with SMTP id 62ls7138361plb.8.gmail; Sun, 28 Apr 2019 02:09:50 -0700 (PDT) X-Received: by 2002:a17:902:ab89:: with SMTP id f9mr14789133plr.151.1556442590151; Sun, 28 Apr 2019 02:09:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556442590; cv=none; d=google.com; s=arc-20160816; b=eGa+FUj3cth93N7ZVyiyItL/ZsLvGnpowAtu7ZSZ+GgMAJ0xuIzg2hoEXlwUhTUP5b XeiIcNQHagopoMsQuWdc2oD7M9x6JAz68ugHQyovKp1cqrTa1Qga+J0QF5yyyukWKn90 26gtwHD0ttxWiSjEOgL1RDu8y5tNQMrge+9m1AYgqrNDWSiDDO2P7RqC26SivdO0S9Kq hA5FCIo8TgrWL5PAD9p0NLz4CEr/8jH21Vpf178AEtLix4ZUVIzFRji9GxO7lSFGy7Ww G8/lMBdGRRNR95JiFF1a4aIZ43YOomWj59J9xTAlFAB50ruyxDlSM4wYnrzHremLLPcF i0Jw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=li9nH1roxv2V7T2EQJmhqDJtQbBwjK8kdiN9IGNeDmA=; b=jUUU0AMQXUrQP6Rp3ZO7YKpv15fOScZQSOBoH6YeVB6l1TReju8R5enYcAsS7qBd5y Lf8UstPEGR3hCfujxxYrIS74ZRlQcYokH2BFW/qCJRJipjdjB1iCBbxrzQO/C/AsvjWm Xcy+d8rnjcy6sDdf0LndHhWz90gc1EiI+3Ju5LFu67+1bWGRhbwo7KZhEXQ6U/41149w ZV66VsXqPWE1llNPfwknISm0r/7Zukm0hKFru+jJAP4QWwMJE2pwiJzqAZwVYxwy+Cx4 x8jvY7DuTZ7ithrm1oW2l+710VvpNvwHGNlDqkXrEFV9bQceLkWX0f6g2Ku8CJZ+0ADA BhTQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=HMDKtnBu; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id 3sor1212839pfa.24.2019.04.28.02.09.50 for (Google Transport Security); Sun, 28 Apr 2019 02:09:50 -0700 (PDT) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; 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 Cc: Paul Kocialkowski , linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, u-boot@lists.denx.de, Jagan Teki 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-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=HMDKtnBu; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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: 312 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pf1-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 262993F08F for ; Sun, 28 Apr 2019 11:09:56 +0200 (CEST) Received: by mail-pf1-f197.google.com with SMTP id d21sf5337725pfr.3 for ; Sun, 28 Apr 2019 02:09:56 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1556442595; cv=pass; d=google.com; s=arc-20160816; b=ObG+wBFn6OAGLnxj++iKi7s6yOU/K4/vNjKLjKnbMiA84SKDSSHlLXtUZwN+6JwwmZ A5urf0PA98X1NqeBnrRRkwP8dFJARul+DUK6mKCdS7p03Lo8v1A7DAXAYTgXewlce15q b8a7+NX0R+jUXnqy8CB/A7dNdMMS6PJs4BFrkmsgNBKZJ8KkG/rPibY7iT7UHyZ6qfsx bdfI6rzS4SaeM4OubzdUZc31SapfVxDHye1dE1etg/88Vj/sRxT5WKMrGmIujiQ9S7Px uRzTJpoGYwmmSBWvPkJlJtETPZm05h9z+Ld9Oc7+5xNCFHzKNb8xO8L6rh7/+78Pj6VJ hs2Q== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=Ugue/EHpQsD1nW2EUHLLlJrHRIftNVJSTbRyXkccX/s=; b=B9wghXth7Lz3FrNlKW6szj9DtxzMcuiiNH38P5wIBXPiFRdAJIzxbV3wOqav3mX4CL J2qUJatBrTeMReX6udGMa7L2YyEiLk5Fr10xFvcCZtZd6RLnaWWfVegs5PLoigH2SEx4 88RSfd4G4qtPH5T1i8SCKxHglXPyp2m8z6689zusYiJV0f411KIGX/9BDx9yGtJNkPDJ 6DmnhEszKbzPrGC7ROiFi0srIeGeY0oULqfQQxbixEfahOl/+gq0E9zqKd3iOz48nlx/ HN+T24AUXtwrvRv4ypuzwPSa2w+USNoqreIHaG3nqBMRyhXKguSaJOJ/3L4p2etLrtzr 6jFg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=dEtzQviH; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com 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:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=Ugue/EHpQsD1nW2EUHLLlJrHRIftNVJSTbRyXkccX/s=; b=gLLzdG2WBxBHjx8s/65V01GMSEi/NzrShuS45ZMF5QFt0PqEMp6CZe5fM+AGZgGaNc YydX4dLrW5hhLRQyCGIDs21p5yVcJam/SkZqXQzVB8AjndKm0XAXXTrcj4pOEkCsWId1 CpR7FyzQheX1O29srxBi8SND7dHCkl3WTznNE= 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:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=Ugue/EHpQsD1nW2EUHLLlJrHRIftNVJSTbRyXkccX/s=; b=MxxehLiqHlkdZ6QqRE3LFKX91JSkLSGeIlPk7HAMWmJOHfGx2fbwK9Yau58GXl15FE zHbxrrJEFgaF/oNA3o04mNGBz8KyHeY5FuRWcXa7E3+0LZ1SEt4IOs6oZGaX8Q7QjjYk qDzcfGUYFsObcwkfcalpm5P2gE5b/kKJ2lKkAKrVD0cBlEeukesCP/O4jQVcHJDdOj9s 2PUhs81i7CAk+Fk0ZaTh/rq/MRIGBB8Z8DMI/yVGvQXK5+UDGl1kT1IqxewLtJTwzR6m bqjQXFHx4dkyvbGhEUIqH/Z9OSwFqrP+hv/Hr9lUOYgBmGirBHtXfz8XPuWOCzQafHgR 8dyw== X-Gm-Message-State: APjAAAWzBXsuIR4XiLaxZ3saJ8Sh7ks4SUVb6dHlK1ll0qriTzZmKHBW 6+9GEPTasGkgGR0bKt8bumoJlWG6 X-Google-Smtp-Source: APXvYqw6y+AS3JyPGeC5G0X3UYV66cYLRn2MSvkXy41MftadZZgGPwe5P3B4OCvjE0jrjtHOuJo9wA== X-Received: by 2002:a63:e10b:: with SMTP id z11mr52155361pgh.46.1556442594979; Sun, 28 Apr 2019 02:09:54 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a62:120a:: with SMTP id a10ls597046pfj.10.gmail; Sun, 28 Apr 2019 02:09:54 -0700 (PDT) X-Received: by 2002:a63:10c:: with SMTP id 12mr54783853pgb.276.1556442594617; Sun, 28 Apr 2019 02:09:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556442594; cv=none; d=google.com; s=arc-20160816; b=WnX9SyCumi+kHKkrtnf6+uVa3rBrraU8rwJ2xuezCHtqXegHf2UMng0lz1OZCHt/QZ cKXz7DpHsGH2GurFX4+poYpTEIczZXADUp7ZQ/dmdfXsKyzGDpDb/25ypuZqyOAetSHx QluelmEjUe7zAnUM+/rSwoIenrI9Yg2MkIFNZp/QLqq3mpOT4L8livSim7MfxaBtzNy4 i7DQTtBQlrB0FdmW8zT98qpLknUTTziFubqra/97uw8w2cHopfipgSNIRXeZlf6itWb1 fhz24hh1B2JixkXH+ak9fGYYp6w/anSCoDUZk78+aKoVsDi+uGWxOqcYm/HHb5eqkKFI cpyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=eCXXxbS350tcxIqTsUZMM4f279DxaWxGFOZAXsVfst4=; b=EJLMiC1cLYeSCBIhUdS9yLBygoC1aon6KxJfJ5cwdXKGtG+r6FnK4LiHfBg0SpF+tG ikssAwaIS9RCcjbleCIu5xny//1E2ytSOi2LoZUlMs4iF7GU+gew1GpNEA5M0YV5rUzx uE1QR1EuLcCPnUVE6JQp9ieHtY79BOMFt9xdAqvNPzwimlQ2Xl0fsTGPTo52eb9HEDJ8 nItxNjEZZPmU2ObY312TI1Rh6AQ4KpftKhm3BYSdchsUK5iqOSGWTUIIoK73cUT4lOgB 5M2kTJWR9MvHIMMkJlsBuRssw5tx4nudTzyI/AYXKjwd4tddJL+mXFQib2KzSGu/2Vro j1vQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=dEtzQviH; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id l2sor33621526pfi.18.2019.04.28.02.09.54 for (Google Transport Security); Sun, 28 Apr 2019 02:09:54 -0700 (PDT) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; 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 Cc: Paul Kocialkowski , linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, u-boot@lists.denx.de, Jagan Teki 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-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=dEtzQviH; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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: 313 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pg1-f197.google.com (mail-pg1-f197.google.com [209.85.215.197]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id AF4433F05A for ; Sun, 28 Apr 2019 11:10:00 +0200 (CEST) Received: by mail-pg1-f197.google.com with SMTP id h14sf5303452pgn.23 for ; Sun, 28 Apr 2019 02:10:00 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1556442599; cv=pass; d=google.com; s=arc-20160816; b=SyNlK2poKMvLL/GDYh+L1MOB+HDIQSLg8ypYRduLpVfqLwUue3L8dXlr3PPsxoj7Ig 4WMAWZAAsUcZfi+BXWOJZq/D3oj6uFhjDYHJOgoI9ump6HYZwlk/RymkdRnW4mLsl0WZ mEyXnPCP1px7AgaksRMg5ZN8rQtJU9N/J3u8FZSE0Qdpvg+B3fBuz5sUjuQV/CrlcZ7F gIQvDurVqCeutniqLoMZUet/QhqHBe+VAkBkMsVh8m8Mud/IjoguhP3Z/j0OxLQZQ7ta BNxF1CK27DCqPmougH4B8WlFbEXUQn3zz2satyFDGpgWrb8PO0LvbqEA3h7zYMZc1ONq rcGw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=UBw8TgxKbxinlpWPp4R+7GsKt83le9qfkXNwYjPmMFQ=; b=eoTMcH+m6beSOXeA4dlVa9Zl6N1tO23WSl/AEH2vyZDirexg4ky8fUUOk5Fz7kTQgI pcLeUY23pLuyCImQE5We1FUrcvUWcPNQC1AAKYVvH+7UMfybIfTRt65a5MH3b+UsBKqd Lpu42MUUk/U9Q5n661UKTSY9UDNtH/+9YrvTvuwrDxhEgh2ZNc6X+kYUZa505rxdWEj7 Nl22xPzW1ISHtC3OOcznlxvBsInk79c1ZVTgDx+H9lCSJPiG9NG8Cjj+qYsUiriQRrUi 212nBB/FDjSPjdjcM++E1BkfQhwIf++hLEEoft6OjVHmQZ62xiRpc/4VsCSX2geL+wpE 7WPA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=jUtUte4r; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com 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:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=UBw8TgxKbxinlpWPp4R+7GsKt83le9qfkXNwYjPmMFQ=; b=JQnzUBPbFW5wtggVucrP9+VtVG+fg9g14T1PSqc0aV0ETWxXQZlTtui+IJrUQSarK8 EkJWTvZrXNTFbWaspeoVs2gGAvIipX86m4qGNYFFMrEl0SmZAbQmeAZZl3cHOGGZn7zs B1OB25bc2QdTSVMonEL4ql9mBGlNzuq/CAP6Y= 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:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=UBw8TgxKbxinlpWPp4R+7GsKt83le9qfkXNwYjPmMFQ=; b=BKDJ8Bu/9eQav4EzPl8xcTYoWTI9Bfo2gQ5hOUnx1r1uOMOdZO7RjApOXXcXyKdcvv ++xw/Z7QfrUyuIRoiopCRsIVUAb4cgHelHur/OJh/9MCPFL2z+Mb2Gg5xF+fzXYb1IsS 6EkJRZP5eUS92gkZY4h3xPT2FyrweFXFI07hSBrZ6rOsxF65X8lM+w0Eowg7o9Q9q37D eN9ykFtvEpfoKZTbAnPisCemcLNPvceLQ+E2R5vCl5gqPfyMZGasZCfFllXoGMzUogD+ 82UT9EsQPwIb9kfXDgX/2RQ7BZIfur8/MIybcbTNp9fKOocXUyHUOfHuzvbNPGkqp72R MPjw== X-Gm-Message-State: APjAAAVgBL492RimE8Iu3MzZPTVdjAw6wpZ/VJ+ywT96U/V+ilUZHS30 rZm8amNx0L0LPw+LoibqgrKi7vtb X-Google-Smtp-Source: APXvYqxulR8d7K4mpighXIj6bu/vgTiotZXpyrPQ+CPVtDOhx7miZHrWIwayQh5xH85dJ7+CsgKvZQ== X-Received: by 2002:a17:902:968c:: with SMTP id n12mr10352987plp.105.1556442599503; Sun, 28 Apr 2019 02:09:59 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:aa7:8a82:: with SMTP id a2ls115415pfc.13.gmail; Sun, 28 Apr 2019 02:09:59 -0700 (PDT) X-Received: by 2002:a62:5542:: with SMTP id j63mr3254204pfb.34.1556442599127; Sun, 28 Apr 2019 02:09:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556442599; cv=none; d=google.com; s=arc-20160816; b=upEnOxnThds4hG8EUe/T61/ObZJSua269jvVs1ZRvSfuXP09DJzBzN6UlKb3EHWI/t 8gp3t2PGeEkl4P3VQK5J6vUvEGpIrDXZ2OZXwjTglhOmrNuYlKupBlJ2KGzqtQnz3+IT i7PXjJVUGG20jsYLf4ZyEyxOzl2watmZWG/zNYLaxTxe6oiw8muu/dXlFnomHbuUARvM zD0GyZWKspA2iQr+LUFF8waggrwsgJ3s+5LOp3wL7EibyTwBa9CcKMXwHkjBOWwTlSTV pvc5282Ce2ysctOutId20NO/VgLIs41HH0Fo4PMbEH9RmngTp94pKu2TH2DxAjhG/f4w 4HdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=Gmv72XAUwvL32XO90b4eb/ahZYMWppaAG+neC+SSpjE=; b=qy7ebs5udA4RsRXBVQh9Wfj0hSAHLC9Ma+3QkxpsP1V1aeAUFrNGKnGHnFrN1SNXBG JfGRROeqnGzcT7TS2k3+6r2vPfQSU8NYySEQS3V1qyKpjeFm8N9xSJ5uqhUmRt9FZ1cN /tX99aKmeaa8t4nQyvdQ/69GrL5AGTKTm8WD0omnZEVdl2xWQw9c+8X6waufcs0i/tlS yWGqOg87IWqHOTBQuPnlTyYd+dtmNONrq5xykPhdhK9+FORjfPOycPbdEgndCESqUl8W WN5wSYPtWAbZX/gH7zHMSpGIuxhEgmu13EBeNcRp9I8k3rkMchx67ES2xokXXSzdJhnq sRSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=jUtUte4r; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id c9sor1663015pge.13.2019.04.28.02.09.59 for (Google Transport Security); Sun, 28 Apr 2019 02:09:59 -0700 (PDT) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; 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 Cc: Paul Kocialkowski , linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, u-boot@lists.denx.de, Jagan Teki 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 Content-Type: text/plain; charset="UTF-8" X-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=jUtUte4r; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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: 314 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pg1-f197.google.com (mail-pg1-f197.google.com [209.85.215.197]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 56D0B3F05A for ; Sun, 28 Apr 2019 11:10:05 +0200 (CEST) Received: by mail-pg1-f197.google.com with SMTP id h14sf5303515pgn.23 for ; Sun, 28 Apr 2019 02:10:05 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1556442604; cv=pass; d=google.com; s=arc-20160816; b=aU1rZ0UETmpuEyP2kOMFCca7ZMPOut5fRSSOqOEAY9byJBmo8qhVUO228J0mAJp5r7 hWdT84dZmMEzlXR3iAim9ANLrR4/WDJHVn2AvfHZi0FtdiQ4keBNMXrRaHtk/fzzXCf+ oO6jyxiZ2bqFfO1Cy3Na99vRpxriOmP714WvE9xyT3m8504uffSD0A4BbFjHDT572+mH RrEE0HrriacZ6mducZbEBlo25xMFgQgR5vD9cELl15zPpR+7VuAcOw3C9r9NdVUs4eNX nuH+seNKs3nGga2gyAdkULgDXFdWqmNf5IkLIEy1+HUQdDzJNBKA7fsw8pbi9d7AZzvC BZbA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=7LqPRgwYiaPHpCk3Hae7e9q1/no1v0M6qf5/JvMudrk=; b=m2xW07hqYHxV4+dmPPoF2Jy98qHtz0O8uWAxVrdH2CDHCrDbDhpLpFwvFg+3Y2ajKh V1CFwMddmhk2W2a7hLyRUmtIDhXcQuDCwN6X9izqPEVH+XbfgGcbgKWBb0VIs8MD+ZXn 4mUo/ex4OkpZapsGnL+P4IbgcSzCYFKwbkW1yzsXonpBy3ACkd9fXowiptiQEcmRP23H nmAyqeiVSZwpWlKB72b9uSmnBR9xoswjgivzRqhlkTPfwAkBE3UABQftTXZp4S8mZarE +Jd17DLyudWECnhtYQZ4EcGPg2x9Fi7u/SKJLAxHeF1Zt+HwJpLHT0RB+UlewNKRbJP0 rNKw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=mQP1jm2k; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com 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:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=7LqPRgwYiaPHpCk3Hae7e9q1/no1v0M6qf5/JvMudrk=; b=TNmLVtmvhKl7EyDpuZiQ5LE2NDnh4r6NhvXNIdyK9a71+Prp+XIBkVDCF5wFy9z11i ct4gamOEWyA14fPAsQI7nfXrAwUow8w4bQk3WFEQQ/S0xsqDbDSyXcdEj3COQuEuJvzo Oewl3ZowMEv90iCKLnKzy66Ir8nd1/7M4R6Ko= 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:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=7LqPRgwYiaPHpCk3Hae7e9q1/no1v0M6qf5/JvMudrk=; b=ArqeXaifdgE5ay8EPkv9LkKUsvvnMjqQwFQu9SuqbC4SFXEdypkbLJ6IYILP8pm+nu 30lDJS6nOLHRpIUEO8GIYq19W79iWBL3q2ccJCWvVSeXP8mVK6rfLX8zuQQS+E77CLcx bIM2Q9lEK6Knp6oMvX7r3hQCi2SLy9ftCpqGE4Ug8mDsY2LtH6jbQYn93wetTuek8nAM lHEFNlOxo54AaMuAkwQD1Gl0xEGQ0xTcqDHevCcekz2v5OjyP2LRRSQCC/GXHm0rxPWO yv4EUS9oeRtwe8bxbfJN0Q6Uu7iPMbGMY+o/AsUI/RIu44HxqsvOsbpZdEdLz1cm+fGG 0mJw== X-Gm-Message-State: APjAAAVNRx58V7+4qWVxYonyw7CGeZmVCjt8kSSt6DrapNNW/81I9Jfl LM3JEf9LgdfF1gkfaFTGLRoKpiBf X-Google-Smtp-Source: APXvYqzdc9yWx+8Pu9K4z05xWtxvd/aPsASq/MAITqjAmFhAhIJA3s/1+TjbSY1OxVCaZGkGiO4X5Q== X-Received: by 2002:a63:5012:: with SMTP id e18mr52257552pgb.383.1556442604157; Sun, 28 Apr 2019 02:10:04 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a62:45d9:: with SMTP id n86ls338724pfi.8.gmail; Sun, 28 Apr 2019 02:10:03 -0700 (PDT) X-Received: by 2002:a65:4343:: with SMTP id k3mr21692018pgq.384.1556442603851; Sun, 28 Apr 2019 02:10:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556442603; cv=none; d=google.com; s=arc-20160816; b=0iHQVW7v95u4sTAb9ADMpaIb9VW+K45cqwMBX15cxMKdpPSXGLDm/AvJE0t40Lr1dR TkLMnN4lUgLrf8dXbOhouxluIJ0tZkrJLwj/0EWyFA6Ia7+zI1v1PEB52cBNAsigJi30 nl6lbL19yUS0A+NTxFqG8HS768U4f/YXKN5l5FJ0fQouf4cPsaG4rwu8+LDzkhDhnwVw EKRRgqE/9SeGoYQccx+7rSAZr19FZwltYyKDQqNBpk7N25N8urTbbxBOEgVCxvmZqQl4 aCIHxRxolaiSMJ5lWKLUVEfrlh0VRLYRypnRDtU1Gw1zSg3Po9aWn2MHlRV/XsJDaI9l FNdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=jbmGXxkwOz7cAfu5fBsEmJSPwRK5yjC7zph2SDNhFiY=; b=K1WaOR1E0dge9ddJNquYLMXqWqb/HD1ibIFszfZZ3BDnwHEtxPT1IDX1mdgHjbGgA7 Pa1a2709AUOihIajyn6pvZdOsKL7Sm8Eh5XX8nylyC51qHjtwLjw+gSfqI+BFCa4AFBK WZQCHtgtGtiTPXPXuFIqJg5HXiRIH3w77nHfgmCSLwF2yRZzbXpwqjg1+dXFHltdFZoH JCo8RjBVqetZo0G3cfusRdgaS7nvGWRRlxgP1/ST5afznh14LsuH+7ik9SK2wZ0TN6vy fett+XYwRKSReI8slgjkwaLYcMZv5jko3T9ih0MyPqjYRL6/CCNm5BPnby7QSb4JMjkE OQYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=mQP1jm2k; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id f1sor5540803pgn.52.2019.04.28.02.10.03 for (Google Transport Security); Sun, 28 Apr 2019 02:10:03 -0700 (PDT) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; 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 Cc: Paul Kocialkowski , linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, u-boot@lists.denx.de, Jagan Teki 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-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=mQP1jm2k; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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: 315 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 6C6F03F05A for ; Sun, 28 Apr 2019 11:10:10 +0200 (CEST) Received: by mail-pf1-f200.google.com with SMTP id j18sf5315097pfi.20 for ; Sun, 28 Apr 2019 02:10:10 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1556442609; cv=pass; d=google.com; s=arc-20160816; b=uhmArRJ3b7L+bJ63gVkQFtgPkA9Uc0fpeAt6qPA9BM7cVY+84XVzkNr/NdTdXbKq1c owLxz1pF6xIyBlaghNFnqNJO+jPsThnbTADtTcfsiUMisX2Ps2NclS7Je7lhLYZuY1ae HZfdhL85MXC3JjzTzWc6uzCHaNvfH2G71Mw4vLaximGUD9py419Fh58OHwm9JpG7KWrQ CH4caznCfK7hGlh4r+sF83hsKZLe/IllWGCKOeFa9D9dJeZ5AuhqjAA4N2HgfKCC3JFj LBsJjZjHwAWFLqVlEKBrQf/826DxAPCH3KiKicckMvKefrrbXxklMDFH2cbMGWFqNbsw SKjQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=QObI9i3PiShodUWeVXttvMIyJrNe4EbUYBy4RejtNQc=; b=iLn4g6933fpbMbxrWTPwyzL5eQ3ljLSPH3oScm9zD9iZ6LYTt34LP0hIWAQxdeux8z /9PRE2KJz6pEoBc93rven3tRiMEKUpK+MNcIost8OYy10130ekdQNvPJ0tWX5Ks+2XJE Cn23zcaIghf8rov7l/9FZxIGgDIZR/qq+RXI3Db+zc8bQOHQgi/j+m382R50yP+AvgNJ wu4kdPI0nPBSzGqK8DN+TLMoihDBC14YnPTQ7qFgXe2L8NsMdne7DMuQGvZ+TEMJdrWu bEjc6gZ3KfmbBeqRIaUjQBJ2hx9u/UQ2g5Ab1J+wfGvPxOPNTHg/+nflwQ4sg7/ICiXX tfdw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=Y54ynMdN; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com 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:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=QObI9i3PiShodUWeVXttvMIyJrNe4EbUYBy4RejtNQc=; b=S1nueSCj6hOckdkwb6T+6RSiCnqhocbEN58mfyjcdkfTTM2aY+Skrk6jLwbt6lTwvq iZzdWUpFGQmNcFGU+o0/lDNr1zU4fn28+sAphha1Zcx3/XeaPL3Kv+r9xjQzvxQiiFsD i5bu9YJGa4ZAisvgMRDDiplAUPkLPju/V2tR4= 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:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=QObI9i3PiShodUWeVXttvMIyJrNe4EbUYBy4RejtNQc=; b=LUCwfm4KKTkhs3gnhM33fCRAwQTIQhWTFDsB3EyE5tuOhuXtO4MFhET9eqW1GNREFJ 62/PkMu4M2enJpSLn/7HFm0yBz2JBcPVZGxqvZIEsCDgY9h/t6EpDKZGGAwQ1893HRyV PvQge0phO3TvFpEBeIi2hENiRA2qY3Co/xfioiP5oy3n1vgfRylSm9K/AiL8isLEliL7 l88MwEBwFnKcKoIQHHjDzRWmJ6GulO+0825UMqQh/Uj/J7No9oqyDyVF3WqSnBtd/tpx i9bmh0laqwhCzrvejvwWWx+86bkhrwUImRNUiy75wVfGTSVSUQhiGlukG5gqi8Z2N3oY yqHg== X-Gm-Message-State: APjAAAUK1zZltD29UCW0/C0Y2I55Pocv59QoKs9G9JMcn4mF6zMiBzU6 Ktdu9wHFx5zlqo4Df17K5efG+x0+ X-Google-Smtp-Source: APXvYqyPpn/0cXZKb53JNvZVeHoo9CHJ9NK+DdzKYjJO5QXwzZOl5d7FXY7m/HWW00uOL4bLdGtkkQ== X-Received: by 2002:a63:6ac1:: with SMTP id f184mr54180385pgc.25.1556442609220; Sun, 28 Apr 2019 02:10:09 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a62:461d:: with SMTP id t29ls186536pfa.1.gmail; Sun, 28 Apr 2019 02:10:09 -0700 (PDT) X-Received: by 2002:a62:6490:: with SMTP id y138mr57648769pfb.230.1556442608865; Sun, 28 Apr 2019 02:10:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556442608; cv=none; d=google.com; s=arc-20160816; b=lAE+1bfnmyroFVYq//hPLkfiATcTaep03wYFz21/Bmis7Ih+iwkY5AY8H5eDBmgaNN 4APbow33jxcpS8P/2KRaV/42RDILbdFsd9f0k1ygNRYxledTSt03+TEjUAaCPQBUAmUV AUyWQQloxi8d5Gl/CfaJhy09rPzB6xNOPBK4MuZvhvs/+FtdvEkXZCiRwqKa3MonrMCF Zv2OtfX3dVYjQclmVQcf7ttcQvdMckQ5KtkI+dPrccaJ/2hQSNRJFN6EnY/hoVVhIUXm /oFwUMO9Wl4kMgzxmj8JyNApDSrhMskscezDf81FcxBn12pd7qvzkZ2FXAepd+am5wYn /NAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=atSux2CLVgvkAm/ZF1YbZ3Gw1E2OtZol0Foof5k36KQ=; b=PYh79vvjRLg3Kjh4aDpt69tkRfKRmEmyWKDMKABAzEPRhfq+z5ZVmLmPm+qftjpyS2 kRkGSMQXViSIQ6Dq3T7GHne9Xy4+VxQn05vqOmg+jgQSqIG1HLaMmn5fWRa74FXFd9GL sqiXBzuJfZNXEwK1gaU7InkfMhMtMRsiuXb8lJfFmq/bt05KnN+S8vrAhdgwODKnvK46 0fFozjn12ezUsRdQGNT+effB4y3wCcX5c/xx9De/wHJMY4T7XOqGpR+OuXGbyCsT7u7O N84JSwoIleCPibgPB83LDQR/ajg6ML+Xwba9gG26Pij6gJJY9rDa/Bjivyn02BYZVH6v KdcQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=Y54ynMdN; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id f9sor5576074pgd.81.2019.04.28.02.10.08 for (Google Transport Security); Sun, 28 Apr 2019 02:10:08 -0700 (PDT) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; 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 Cc: Paul Kocialkowski , linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, u-boot@lists.denx.de, Jagan Teki 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 Content-Type: text/plain; charset="UTF-8" X-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=Y54ynMdN; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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 \