From 268b040fc031d71da22aaeaa07ed6cc54641929b Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 26 Aug 2019 08:35:47 +0100 Subject: [PATCH 01/10] fixes to building 2019.10-rc2 --- env-fix-build-error-for-envtools.patch | 460 +++++++++++++++++++++++++ uboot-tools.spec | 3 +- 2 files changed, 462 insertions(+), 1 deletion(-) create mode 100644 env-fix-build-error-for-envtools.patch diff --git a/env-fix-build-error-for-envtools.patch b/env-fix-build-error-for-envtools.patch new file mode 100644 index 0000000..6c563b1 --- /dev/null +++ b/env-fix-build-error-for-envtools.patch @@ -0,0 +1,460 @@ +From patchwork Fri Aug 23 21:03:16 2019 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 8bit +X-Patchwork-Submitter: Pierre-Jean Texier +X-Patchwork-Id: 1152434 +Return-Path: +X-Original-To: incoming@patchwork.ozlabs.org +Delivered-To: patchwork-incoming@bilbo.ozlabs.org +Authentication-Results: ozlabs.org; + spf=none (mailfrom) smtp.mailfrom=lists.denx.de + (client-ip=81.169.180.215; helo=lists.denx.de; + envelope-from=u-boot-bounces@lists.denx.de; + receiver=) +Authentication-Results: ozlabs.org; dmarc=fail (p=quarantine dis=none) + header.from=koncepto.io +Authentication-Results: ozlabs.org; + dkim=fail reason="signature verification failed" (2048-bit key; + unprotected) header.d=koncepto.io header.i=@koncepto.io + header.b="pNQdPEmE"; dkim-atps=neutral +Received: from lists.denx.de (dione.denx.de [81.169.180.215]) + by ozlabs.org (Postfix) with ESMTP id 46FYnW5SRZz9s7T + for ; + Sat, 24 Aug 2019 07:05:03 +1000 (AEST) +Received: by lists.denx.de (Postfix, from userid 105) + id 6AC85C22128; Fri, 23 Aug 2019 21:04:09 +0000 (UTC) +X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de +X-Spam-Level: +X-Spam-Status: No, score=0.0 required=5.0 tests=SPF_HELO_PASS, T_DKIM_INVALID + autolearn=unavailable autolearn_force=no version=3.4.0 +Received: from lists.denx.de (localhost [IPv6:::1]) + by lists.denx.de (Postfix) with ESMTP id 22BCCC2211C; + Fri, 23 Aug 2019 21:04:03 +0000 (UTC) +Received: by lists.denx.de (Postfix, from userid 105) + id C539FC220FB; Fri, 23 Aug 2019 21:03:59 +0000 (UTC) +Received: from koncepto.io (koncepto.io [195.154.119.111]) + by lists.denx.de (Postfix) with ESMTPS id 00EFDC21C29 + for ; Fri, 23 Aug 2019 21:03:58 +0000 (UTC) +Received: from menoah.home (lfbn-1-8923-205.w193-250.abo.wanadoo.fr + [193.250.65.205]) + by koncepto.io (Postfix) with ESMTPSA id 6577E6027E; + Fri, 23 Aug 2019 23:03:57 +0200 (CEST) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=koncepto.io; + s=default; t=1566594237; + bh=1A6uYtcv7poOVUlwbsHD8uICjE/sD7eKsXfiKdjIzE0=; + h=From:To:Cc:Subject:Date:In-Reply-To:References:From; + b=pNQdPEmEp/YVx2uHZaOLlkfc+yoEMwug74Mi62v19dvMw1UAykCHu1Ex/mk/7w9wF + 8mpXN+1P2wpCWIyTN86BNbmBUrEE1q18nJL1xMalMn0CQXXaL/o5aBAMDDUto3shoL + FhuP0+U2ky+BeHGMr/YZZQhaOHR9HtxYZGIr9D4IRsX0jqRJxTzxmcyaJr9jzOSus9 + SrRFMD9Thr8uxv1tPOXk1vtMtUrUYhlulvxF3tRFwr6S/nPZEfJP5F4A9iJDoobPTn + LQrE0JRQKALig+LKrec4hi8gRn20HinWxj/dl2utVwsJdtxA4C4nG1aCL+PghaEh0+ + APc7DCJINwsJA== +From: Pierre-Jean Texier +To: u-boot@lists.denx.de +Date: Fri, 23 Aug 2019 23:03:16 +0200 +Message-Id: <1566594199-25314-2-git-send-email-pjtexier@koncepto.io> +X-Mailer: git-send-email 2.7.4 +In-Reply-To: <1566594199-25314-1-git-send-email-pjtexier@koncepto.io> +References: <1566594199-25314-1-git-send-email-pjtexier@koncepto.io> +MIME-Version: 1.0 +Cc: bjorn@haxx.se, michal.simek@xilinx.com, joe.hershberger@ni.com, + philip@philipmolloy.com +Subject: [U-Boot] [PATCH 1/4] fw_env: remove duplicated definitions +X-BeenThere: u-boot@lists.denx.de +X-Mailman-Version: 2.1.18 +Precedence: list +List-Id: U-Boot discussion +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +Content-Type: text/plain; charset="utf-8" +Errors-To: u-boot-bounces@lists.denx.de +Sender: "U-Boot" + +Since commit d3716dd ("env: Rename the redundancy flags"), the +definitions of ENV_REDUND_OBSOLETE & ENV_REDUND_ACTIVE was moved +to env.h. + +Fixes: + +tools/env/fw_env.c:122:22: error: ‘ENV_REDUND_ACTIVE’ redeclared as different kind of symbol + static unsigned char ENV_REDUND_ACTIVE = 1; + ^~~~~~~~~~~~~~~~~ +In file included from tools/env/fw_env.c:13: +include/env.h:63:2: note: previous definition of ‘ENV_REDUND_ACTIVE’ was here + ENV_REDUND_ACTIVE = 1, + ^~~~~~~~~~~~~~~~~ +tools/env/fw_env.c:127:22: error: ‘ENV_REDUND_OBSOLETE’ redeclared as different kind of symbol + static unsigned char ENV_REDUND_OBSOLETE; + ^~~~~~~~~~~~~~~~~~~ +In file included from tools/env/fw_env.c:13: +include/env.h:62:2: note: previous definition of ‘ENV_REDUND_OBSOLETE’ was here + ENV_REDUND_OBSOLETE = 0, + +Signed-off-by: Pierre-Jean Texier +Tested-by: Heiko Schocher +--- + tools/env/fw_env.c | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c +index 95c9984..876bf2b 100644 +--- a/tools/env/fw_env.c ++++ b/tools/env/fw_env.c +@@ -119,13 +119,6 @@ static struct environment environment = { + + static int have_redund_env; + +-static unsigned char ENV_REDUND_ACTIVE = 1; +-/* +- * ENV_REDUND_OBSOLETE must be 0 to efficiently set it on NOR flash without +- * erasing +- */ +-static unsigned char ENV_REDUND_OBSOLETE; +- + #define DEFAULT_ENV_INSTANCE_STATIC + #include + + +From patchwork Fri Aug 23 21:03:17 2019 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 8bit +X-Patchwork-Submitter: Pierre-Jean Texier +X-Patchwork-Id: 1152435 +Return-Path: +X-Original-To: incoming@patchwork.ozlabs.org +Delivered-To: patchwork-incoming@bilbo.ozlabs.org +Authentication-Results: ozlabs.org; + spf=none (mailfrom) smtp.mailfrom=lists.denx.de + (client-ip=81.169.180.215; helo=lists.denx.de; + envelope-from=u-boot-bounces@lists.denx.de; + receiver=) +Authentication-Results: ozlabs.org; dmarc=fail (p=quarantine dis=none) + header.from=koncepto.io +Authentication-Results: ozlabs.org; + dkim=fail reason="signature verification failed" (2048-bit key; + unprotected) header.d=koncepto.io header.i=@koncepto.io + header.b="t2Jp3XnT"; dkim-atps=neutral +Received: from lists.denx.de (dione.denx.de [81.169.180.215]) + by ozlabs.org (Postfix) with ESMTP id 46FYnm6pJhz9s7T + for ; + Sat, 24 Aug 2019 07:05:16 +1000 (AEST) +Received: by lists.denx.de (Postfix, from userid 105) + id A2545C2213B; Fri, 23 Aug 2019 21:04:18 +0000 (UTC) +X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de +X-Spam-Level: +X-Spam-Status: No, score=0.0 required=5.0 tests=SPF_HELO_PASS, T_DKIM_INVALID + autolearn=unavailable autolearn_force=no version=3.4.0 +Received: from lists.denx.de (localhost [IPv6:::1]) + by lists.denx.de (Postfix) with ESMTP id B8E03C2211C; + Fri, 23 Aug 2019 21:04:10 +0000 (UTC) +Received: by lists.denx.de (Postfix, from userid 105) + id 35EB6C22132; Fri, 23 Aug 2019 21:04:01 +0000 (UTC) +Received: from koncepto.io (koncepto.io [195.154.119.111]) + by lists.denx.de (Postfix) with ESMTPS id 0782CC220F3 + for ; Fri, 23 Aug 2019 21:03:59 +0000 (UTC) +Received: from menoah.home (lfbn-1-8923-205.w193-250.abo.wanadoo.fr + [193.250.65.205]) + by koncepto.io (Postfix) with ESMTPSA id 553C9602A2; + Fri, 23 Aug 2019 23:03:58 +0200 (CEST) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=koncepto.io; + s=default; t=1566594238; + bh=LfOe92dihVLTQdy8KYc5qePwlSi19PPHReqod3h7au4=; + h=From:To:Cc:Subject:Date:In-Reply-To:References:From; + b=t2Jp3XnT4Ey+6E5wPqOGWDgmA1pvZqePipaMfSC5KSGsgfn44sKDCiX2+pYNXwKAY + DGEOt8Kvzy7BS2KzyWFFH5rKgjX5EU30Tq/+4oE/tPKPCyguVzLTX6jyvvFQgXeT0q + 1R7C7KDH6AUGiGsjoAjs3NFvo42kokk4f6IuWSUd7uUgDsd1YIHfLE4wnANk6SxP6e + yiqCppqBbsgV7CHu1gb+uxz2gccEX9SCU3Dkj/bGxMepPySe0NEfow34IvtOHspvp1 + uj9eJQ3LjuVA5XqXzbk4yHIALwgoH7QpSryDdHGjlYOVnVE4YFscKBDpS9XpzStLFZ + xL3WOZAJt/dJQ== +From: Pierre-Jean Texier +To: u-boot@lists.denx.de +Date: Fri, 23 Aug 2019 23:03:17 +0200 +Message-Id: <1566594199-25314-3-git-send-email-pjtexier@koncepto.io> +X-Mailer: git-send-email 2.7.4 +In-Reply-To: <1566594199-25314-1-git-send-email-pjtexier@koncepto.io> +References: <1566594199-25314-1-git-send-email-pjtexier@koncepto.io> +MIME-Version: 1.0 +Cc: bjorn@haxx.se, michal.simek@xilinx.com, joe.hershberger@ni.com, + philip@philipmolloy.com +Subject: [U-Boot] [PATCH 2/4] fw_env: fix build error +X-BeenThere: u-boot@lists.denx.de +X-Mailman-Version: 2.1.18 +Precedence: list +List-Id: U-Boot discussion +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +Content-Type: text/plain; charset="utf-8" +Errors-To: u-boot-bounces@lists.denx.de +Sender: "U-Boot" + +The following error appears: + +tools/env/fw_env.c:1149:25: error: lvalue required as unary ‘&’ operand + rc = write(fd, &ENV_REDUND_OBSOLETE, sizeof(ENV_REDUND_OBSOLETE)); + +Fixes: d3716dd ("env: Rename the redundancy flags") + +Signed-off-by: Pierre-Jean Texier +Tested-by: Heiko Schocher +--- + tools/env/fw_env.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c +index 876bf2b..b8b936f 100644 +--- a/tools/env/fw_env.c ++++ b/tools/env/fw_env.c +@@ -1146,7 +1146,7 @@ static int flash_flag_obsolete(int dev, int fd, off_t offset) + return rc; + } + ioctl(fd, MEMUNLOCK, &erase); +- rc = write(fd, &ENV_REDUND_OBSOLETE, sizeof(ENV_REDUND_OBSOLETE)); ++ rc = write(fd, ENV_REDUND_OBSOLETE, sizeof(ENV_REDUND_OBSOLETE)); + ioctl(fd, MEMLOCK, &erase); + if (rc < 0) + perror("Could not set obsolete flag"); + +From patchwork Fri Aug 23 21:03:18 2019 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 8bit +X-Patchwork-Submitter: Pierre-Jean Texier +X-Patchwork-Id: 1152436 +Return-Path: +X-Original-To: incoming@patchwork.ozlabs.org +Delivered-To: patchwork-incoming@bilbo.ozlabs.org +Authentication-Results: ozlabs.org; + spf=none (mailfrom) smtp.mailfrom=lists.denx.de + (client-ip=81.169.180.215; helo=lists.denx.de; + envelope-from=u-boot-bounces@lists.denx.de; + receiver=) +Authentication-Results: ozlabs.org; dmarc=fail (p=quarantine dis=none) + header.from=koncepto.io +Authentication-Results: ozlabs.org; + dkim=fail reason="signature verification failed" (2048-bit key; + unprotected) header.d=koncepto.io header.i=@koncepto.io + header.b="pjwIphoI"; dkim-atps=neutral +Received: from lists.denx.de (dione.denx.de [81.169.180.215]) + by ozlabs.org (Postfix) with ESMTP id 46FYpN1t0Fz9s7T + for ; + Sat, 24 Aug 2019 07:05:48 +1000 (AEST) +Received: by lists.denx.de (Postfix, from userid 105) + id EEDEEC22149; Fri, 23 Aug 2019 21:04:35 +0000 (UTC) +X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de +X-Spam-Level: +X-Spam-Status: No, score=0.0 required=5.0 tests=SPF_HELO_PASS, T_DKIM_INVALID + autolearn=unavailable autolearn_force=no version=3.4.0 +Received: from lists.denx.de (localhost [IPv6:::1]) + by lists.denx.de (Postfix) with ESMTP id 10E42C22119; + Fri, 23 Aug 2019 21:04:24 +0000 (UTC) +Received: by lists.denx.de (Postfix, from userid 105) + id 10AC6C22100; Fri, 23 Aug 2019 21:04:02 +0000 (UTC) +Received: from koncepto.io (koncepto.io [195.154.119.111]) + by lists.denx.de (Postfix) with ESMTPS id C1716C2211C + for ; Fri, 23 Aug 2019 21:03:59 +0000 (UTC) +Received: from menoah.home (lfbn-1-8923-205.w193-250.abo.wanadoo.fr + [193.250.65.205]) + by koncepto.io (Postfix) with ESMTPSA id 28492602CF; + Fri, 23 Aug 2019 23:03:59 +0200 (CEST) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=koncepto.io; + s=default; t=1566594239; + bh=vz6qm8CT1Bzb32KpNR3krs97Ns4VK4eOovt/tpxnm9I=; + h=From:To:Cc:Subject:Date:In-Reply-To:References:From; + b=pjwIphoIjS3ugkAK2bwHZnPfDdBTCvl7rQ1RaVUrjWIkHLSwB6q8rDp/sqMiVEqTD + lwSZuMtsOibIY+2cE7O1lIw0NDrav4ltJLgGYZBUfU+pG5ZudRHc4SF+sGVSgk1NXJ + sS3alNbxsA4rPghfOTrgx07pF9RmlHYv+Zoe+oPL2z2GvWDRYgRuZ8bXOWo4LCdieh + WxGIhYhbQyf7Gy7EQjotwyabUstOYMlv4gVVFLeWAbGOWPfuckOSF8IbsusNDFHTdz + lN6/RNx1HK/JNlxawIZklpeO4BtLBMTBVgbBGkpuwi0th6Hq0IfGc/oETpvfnlQjZ0 + UFebqc7lSAWIA== +From: Pierre-Jean Texier +To: u-boot@lists.denx.de +Date: Fri, 23 Aug 2019 23:03:18 +0200 +Message-Id: <1566594199-25314-4-git-send-email-pjtexier@koncepto.io> +X-Mailer: git-send-email 2.7.4 +In-Reply-To: <1566594199-25314-1-git-send-email-pjtexier@koncepto.io> +References: <1566594199-25314-1-git-send-email-pjtexier@koncepto.io> +MIME-Version: 1.0 +Cc: bjorn@haxx.se, michal.simek@xilinx.com, joe.hershberger@ni.com, + philip@philipmolloy.com +Subject: [U-Boot] [PATCH 3/4] env: add missing header file +X-BeenThere: u-boot@lists.denx.de +X-Mailman-Version: 2.1.18 +Precedence: list +List-Id: U-Boot discussion +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +Content-Type: text/plain; charset="utf-8" +Errors-To: u-boot-bounces@lists.denx.de +Sender: "U-Boot" + +Since commit af95f20 ("env: Create a new file for environment functions"), +a new header file exists. + +So, this commit add a missing header file. + +Fixes: + +include/env.h:158:1: error: unknown type name ‘ulong’; did you mean ‘long’? + ulong env_get_ulong(const char *name, int base, ulong default_val); + ^~~~~ + long +include/env.h:158:49: error: unknown type name ‘ulong’; did you mean ‘long’? + ulong env_get_ulong(const char *name, int base, ulong default_val); + +Signed-off-by: Pierre-Jean Texier +Tested-by: Heiko Schocher +--- + include/env.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/env.h b/include/env.h +index a74a261..b72239f 100644 +--- a/include/env.h ++++ b/include/env.h +@@ -9,6 +9,7 @@ + #ifndef __ENV_H + #define __ENV_H + ++#include + #include + #include + + +From patchwork Fri Aug 23 21:03:19 2019 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Patchwork-Submitter: Pierre-Jean Texier +X-Patchwork-Id: 1152433 +Return-Path: +X-Original-To: incoming@patchwork.ozlabs.org +Delivered-To: patchwork-incoming@bilbo.ozlabs.org +Authentication-Results: ozlabs.org; + spf=none (mailfrom) smtp.mailfrom=lists.denx.de + (client-ip=81.169.180.215; helo=lists.denx.de; + envelope-from=u-boot-bounces@lists.denx.de; + receiver=) +Authentication-Results: ozlabs.org; dmarc=fail (p=quarantine dis=none) + header.from=koncepto.io +Authentication-Results: ozlabs.org; + dkim=fail reason="signature verification failed" (2048-bit key; + unprotected) header.d=koncepto.io header.i=@koncepto.io + header.b="MLoR0pLn"; dkim-atps=neutral +Received: from lists.denx.de (dione.denx.de [81.169.180.215]) + by ozlabs.org (Postfix) with ESMTP id 46FYnH1vcVz9s7T + for ; + Sat, 24 Aug 2019 07:04:51 +1000 (AEST) +Received: by lists.denx.de (Postfix, from userid 105) + id EA07BC22119; Fri, 23 Aug 2019 21:04:27 +0000 (UTC) +X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de +X-Spam-Level: +X-Spam-Status: No, score=0.0 required=5.0 tests=SPF_HELO_PASS, T_DKIM_INVALID + autolearn=unavailable autolearn_force=no version=3.4.0 +Received: from lists.denx.de (localhost [IPv6:::1]) + by lists.denx.de (Postfix) with ESMTP id 5017BC22128; + Fri, 23 Aug 2019 21:04:20 +0000 (UTC) +Received: by lists.denx.de (Postfix, from userid 105) + id 28D29C21D74; Fri, 23 Aug 2019 21:04:02 +0000 (UTC) +Received: from koncepto.io (koncepto.io [195.154.119.111]) + by lists.denx.de (Postfix) with ESMTPS id 8C956C22127 + for ; Fri, 23 Aug 2019 21:04:00 +0000 (UTC) +Received: from menoah.home (lfbn-1-8923-205.w193-250.abo.wanadoo.fr + [193.250.65.205]) + by koncepto.io (Postfix) with ESMTPSA id E9520602D0; + Fri, 23 Aug 2019 23:03:59 +0200 (CEST) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=koncepto.io; + s=default; t=1566594240; + bh=Mc23EDVcZaZMYgrrKwCQSFQQ7Ha0pSbWk3NULDE15hk=; + h=From:To:Cc:Subject:Date:In-Reply-To:References:From; + b=MLoR0pLn287FS4CiPTiVfu2Iqk3PldkFZkPW5rY0dTpiQFpSl15wRVyerSbmxDp1n + 4Erl2YMzlJwPQH/W1IuVqdYpsjX8/6qLUmK547M9G9meCW3aBy0yTsZYZ+oRFnh2cb + gI+jpjZkarOAsfTjMIpZoRSpkrys1TiWf2tJnwAnZNoze8FnGsdT7YyB9xniMekdmV + UhKOrY5eZTx/FyRfwVVB18sZ/lBfVda+X8yNzXlUdCGFiK4MSixCPCepZAzaZsI7/K + pHWsz47HljX7jEoNpa/kUcPbNTIwf5fSFbVaoFGgXGPlu25t3iFiyjWJOfVX/pzin/ + wXRG/9pPQ5XEQ== +From: Pierre-Jean Texier +To: u-boot@lists.denx.de +Date: Fri, 23 Aug 2019 23:03:19 +0200 +Message-Id: <1566594199-25314-5-git-send-email-pjtexier@koncepto.io> +X-Mailer: git-send-email 2.7.4 +In-Reply-To: <1566594199-25314-1-git-send-email-pjtexier@koncepto.io> +References: <1566594199-25314-1-git-send-email-pjtexier@koncepto.io> +Cc: bjorn@haxx.se, michal.simek@xilinx.com, joe.hershberger@ni.com, + philip@philipmolloy.com +Subject: [U-Boot] [PATCH 4/4] ci: add envtools support +X-BeenThere: u-boot@lists.denx.de +X-Mailman-Version: 2.1.18 +Precedence: list +List-Id: U-Boot discussion +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +MIME-Version: 1.0 +Content-Type: text/plain; charset="utf-8" +Errors-To: u-boot-bounces@lists.denx.de +Sender: "U-Boot" + +This commit add envtools suppport to CI to verify if there +is no build issues. + +Signed-off-by: Pierre-Jean Texier +Acked-by: Heiko Schocher +--- + .gitlab-ci.yml | 7 +++++++ + .travis.yml | 4 ++++ + 2 files changed, 11 insertions(+) + +diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml +index 84e79bf..a1c5b4f 100644 +--- a/.gitlab-ci.yml ++++ b/.gitlab-ci.yml +@@ -145,6 +145,13 @@ Build tools-only: + script: + - make tools-only_config tools-only -j$(nproc) + ++# Ensure env tools build ++Build envtools: ++ tags: [ 'all' ] ++ stage: testsuites ++ script: ++ - make tools-only_config envtools -j$(nproc) ++ + Run binman, buildman, dtoc and patman testsuites: + tags: [ 'all' ] + stage: testsuites +diff --git a/.travis.yml b/.travis.yml +index d330dda..6adc754 100644 +--- a/.travis.yml ++++ b/.travis.yml +@@ -361,6 +361,10 @@ matrix: + - name: "Build tools-only" + script: + - make tools-only_config tools-only -j$(nproc) ++ # Ensure env tools build ++ - name: "Build envtools" ++ script: ++ - make tools-only_config envtools -j$(nproc) + + # test/py + - name: "test/py sandbox" diff --git a/uboot-tools.spec b/uboot-tools.spec index b2800cd..79cd6aa 100644 --- a/uboot-tools.spec +++ b/uboot-tools.spec @@ -26,6 +26,7 @@ Patch6: rpi-Enable-using-the-DT-provided-by-the-Raspberry-Pi.patch Patch7: dragonboard-fixes.patch Patch8: ARM-tegra-Add-NVIDIA-Jetson-Nano.patch Patch9: arm-tegra-defaine-fdtfile-for-all-devices.patch +Patch10: env-fix-build-error-for-envtools.patch BuildRequires: bc BuildRequires: dtc @@ -242,7 +243,7 @@ cp -p board/warp7/README builds/docs/README.warp7 %files %doc README doc/imx doc/README.kwbimage doc/README.distro doc/README.gpt -%doc doc/README.odroid doc/README.rockchip doc/README.uefi doc/uImage.FIT doc/README.arm64 +%doc doc/README.odroid doc/README.rockchip doc/uefi doc/uImage.FIT doc/arch/arm64.rst %doc doc/README.chromium builds/docs/* %{_bindir}/* %{_mandir}/man1/mkimage.1* From b054e6bb422d944748242803556a4eca939ff6d3 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 26 Aug 2019 13:02:45 +0100 Subject: [PATCH 02/10] Temporarily disable Chrome devices due to unexpected retirement of vboot-utils, python2-pyelftools re-written in something else --- env-fix-build-error-for-envtools.patch | 242 ++++++++++++++----------- uboot-tools.spec | 12 +- 2 files changed, 138 insertions(+), 116 deletions(-) diff --git a/env-fix-build-error-for-envtools.patch b/env-fix-build-error-for-envtools.patch index 6c563b1..d3e75be 100644 --- a/env-fix-build-error-for-envtools.patch +++ b/env-fix-build-error-for-envtools.patch @@ -1,9 +1,9 @@ -From patchwork Fri Aug 23 21:03:16 2019 +From patchwork Mon Aug 26 11:06:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierre-Jean Texier -X-Patchwork-Id: 1152434 +X-Patchwork-Id: 1153103 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org @@ -17,50 +17,50 @@ Authentication-Results: ozlabs.org; dmarc=fail (p=quarantine dis=none) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=koncepto.io header.i=@koncepto.io - header.b="pNQdPEmE"; dkim-atps=neutral + header.b="oiyEB9Yh"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) - by ozlabs.org (Postfix) with ESMTP id 46FYnW5SRZz9s7T + by ozlabs.org (Postfix) with ESMTP id 46H8NK1LPKz9sDB for ; - Sat, 24 Aug 2019 07:05:03 +1000 (AEST) + Mon, 26 Aug 2019 21:07:13 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) - id 6AC85C22128; Fri, 23 Aug 2019 21:04:09 +0000 (UTC) + id CAF1DC21F7D; Mon, 26 Aug 2019 11:06:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=SPF_HELO_PASS, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) - by lists.denx.de (Postfix) with ESMTP id 22BCCC2211C; - Fri, 23 Aug 2019 21:04:03 +0000 (UTC) + by lists.denx.de (Postfix) with ESMTP id 0AA54C21FCA; + Mon, 26 Aug 2019 11:06:52 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) - id C539FC220FB; Fri, 23 Aug 2019 21:03:59 +0000 (UTC) + id 27147C21FB5; Mon, 26 Aug 2019 11:06:47 +0000 (UTC) Received: from koncepto.io (koncepto.io [195.154.119.111]) - by lists.denx.de (Postfix) with ESMTPS id 00EFDC21C29 - for ; Fri, 23 Aug 2019 21:03:58 +0000 (UTC) + by lists.denx.de (Postfix) with ESMTPS id A73A1C21F9A + for ; Mon, 26 Aug 2019 11:06:44 +0000 (UTC) Received: from menoah.home (lfbn-1-8923-205.w193-250.abo.wanadoo.fr [193.250.65.205]) - by koncepto.io (Postfix) with ESMTPSA id 6577E6027E; - Fri, 23 Aug 2019 23:03:57 +0200 (CEST) + by koncepto.io (Postfix) with ESMTPSA id 0C8AF602CF; + Mon, 26 Aug 2019 13:06:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=koncepto.io; - s=default; t=1566594237; - bh=1A6uYtcv7poOVUlwbsHD8uICjE/sD7eKsXfiKdjIzE0=; + s=default; t=1566817604; + bh=V4r1z9HD8aVGoyELWRC99LX8pZowixLpYqFHkVfjVik=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; - b=pNQdPEmEp/YVx2uHZaOLlkfc+yoEMwug74Mi62v19dvMw1UAykCHu1Ex/mk/7w9wF - 8mpXN+1P2wpCWIyTN86BNbmBUrEE1q18nJL1xMalMn0CQXXaL/o5aBAMDDUto3shoL - FhuP0+U2ky+BeHGMr/YZZQhaOHR9HtxYZGIr9D4IRsX0jqRJxTzxmcyaJr9jzOSus9 - SrRFMD9Thr8uxv1tPOXk1vtMtUrUYhlulvxF3tRFwr6S/nPZEfJP5F4A9iJDoobPTn - LQrE0JRQKALig+LKrec4hi8gRn20HinWxj/dl2utVwsJdtxA4C4nG1aCL+PghaEh0+ - APc7DCJINwsJA== + b=oiyEB9YhFL8jh+kux8tsm0WhBM8b/ijFR0262b6Oe55f6YePlv9wHb6b1pEW1Fs62 + gNimouSjMWLCAW2wZquTDRjoQoRVCykS9rPbigionFMazyPmt1F0vDBpjoN75MDJl9 + yx8GGplCS3yU5fHLkfd1SKxnta0u7sLu7EnjfagoI6XuV53Ix6DkJAvkvPfgUhl1hD + 2Cz7oBfJafbblAdKb019EWk6TTrW86ASL0aHwKF/R3hXfDjwLN2gzhD0pckzmEklxR + Z+9c649IYaa9B3K3PAdhRoQ5lptYyVqLNrAffsabjbXQzrxyBcGEg5hRnleeede86M + 4HoWxUCDgE5EQ== From: Pierre-Jean Texier To: u-boot@lists.denx.de -Date: Fri, 23 Aug 2019 23:03:16 +0200 -Message-Id: <1566594199-25314-2-git-send-email-pjtexier@koncepto.io> +Date: Mon, 26 Aug 2019 13:06:15 +0200 +Message-Id: <1566817578-16750-2-git-send-email-pjtexier@koncepto.io> X-Mailer: git-send-email 2.7.4 -In-Reply-To: <1566594199-25314-1-git-send-email-pjtexier@koncepto.io> -References: <1566594199-25314-1-git-send-email-pjtexier@koncepto.io> +In-Reply-To: <1566817578-16750-1-git-send-email-pjtexier@koncepto.io> +References: <1566817578-16750-1-git-send-email-pjtexier@koncepto.io> MIME-Version: 1.0 Cc: bjorn@haxx.se, michal.simek@xilinx.com, joe.hershberger@ni.com, philip@philipmolloy.com -Subject: [U-Boot] [PATCH 1/4] fw_env: remove duplicated definitions +Subject: [U-Boot] [PATCH v2 1/4] fw_env: remove duplicated definitions X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list @@ -97,8 +97,12 @@ include/env.h:62:2: note: previous definition of ‘ENV_REDUND_OBSOLETE’ was h ENV_REDUND_OBSOLETE = 0, Signed-off-by: Pierre-Jean Texier +Tested-by: Joris Offouga Tested-by: Heiko Schocher --- +v1 -> v2: + - None + tools/env/fw_env.c | 7 ------- 1 file changed, 7 deletions(-) @@ -121,12 +125,12 @@ index 95c9984..876bf2b 100644 #include -From patchwork Fri Aug 23 21:03:17 2019 +From patchwork Mon Aug 26 11:06:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierre-Jean Texier -X-Patchwork-Id: 1152435 +X-Patchwork-Id: 1153106 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org @@ -140,50 +144,50 @@ Authentication-Results: ozlabs.org; dmarc=fail (p=quarantine dis=none) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=koncepto.io header.i=@koncepto.io - header.b="t2Jp3XnT"; dkim-atps=neutral + header.b="c5/r1UEA"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) - by ozlabs.org (Postfix) with ESMTP id 46FYnm6pJhz9s7T + by ozlabs.org (Postfix) with ESMTP id 46H8Q906lcz9sBF for ; - Sat, 24 Aug 2019 07:05:16 +1000 (AEST) + Mon, 26 Aug 2019 21:08:48 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) - id A2545C2213B; Fri, 23 Aug 2019 21:04:18 +0000 (UTC) + id AEEDAC2212D; Mon, 26 Aug 2019 11:07:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=SPF_HELO_PASS, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) - by lists.denx.de (Postfix) with ESMTP id B8E03C2211C; - Fri, 23 Aug 2019 21:04:10 +0000 (UTC) + by lists.denx.de (Postfix) with ESMTP id 858A4C2214E; + Mon, 26 Aug 2019 11:07:01 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) - id 35EB6C22132; Fri, 23 Aug 2019 21:04:01 +0000 (UTC) + id BFF15C2216A; Mon, 26 Aug 2019 11:06:48 +0000 (UTC) Received: from koncepto.io (koncepto.io [195.154.119.111]) - by lists.denx.de (Postfix) with ESMTPS id 0782CC220F3 - for ; Fri, 23 Aug 2019 21:03:59 +0000 (UTC) + by lists.denx.de (Postfix) with ESMTPS id 87FBDC21FCA + for ; Mon, 26 Aug 2019 11:06:45 +0000 (UTC) Received: from menoah.home (lfbn-1-8923-205.w193-250.abo.wanadoo.fr [193.250.65.205]) - by koncepto.io (Postfix) with ESMTPSA id 553C9602A2; - Fri, 23 Aug 2019 23:03:58 +0200 (CEST) + by koncepto.io (Postfix) with ESMTPSA id EB51860367; + Mon, 26 Aug 2019 13:06:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=koncepto.io; - s=default; t=1566594238; - bh=LfOe92dihVLTQdy8KYc5qePwlSi19PPHReqod3h7au4=; + s=default; t=1566817605; + bh=/BzW5h1tpm92Axd1WgUReyBQsFQF3cTqd1CNLOzC1ko=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; - b=t2Jp3XnT4Ey+6E5wPqOGWDgmA1pvZqePipaMfSC5KSGsgfn44sKDCiX2+pYNXwKAY - DGEOt8Kvzy7BS2KzyWFFH5rKgjX5EU30Tq/+4oE/tPKPCyguVzLTX6jyvvFQgXeT0q - 1R7C7KDH6AUGiGsjoAjs3NFvo42kokk4f6IuWSUd7uUgDsd1YIHfLE4wnANk6SxP6e - yiqCppqBbsgV7CHu1gb+uxz2gccEX9SCU3Dkj/bGxMepPySe0NEfow34IvtOHspvp1 - uj9eJQ3LjuVA5XqXzbk4yHIALwgoH7QpSryDdHGjlYOVnVE4YFscKBDpS9XpzStLFZ - xL3WOZAJt/dJQ== + b=c5/r1UEA9buu4jObmZtyFpyrpiS53PaMZNrL4rMiyrbgACz9Mkdy2Z55vsSjmATqG + 7uTbEVjsPuqi/ECX2+8I9ozMGh72h4vosbfoak2jzAwHkC4ostork7ltSS2ahy7ZuO + CN0oXYk6/WA5mipEaQb6aaipBMd65Hm7hfN365ZHk5a8RBJD805QekonFLGUahFIP6 + J7bu7RkeQeCV5n3lqIPfYddP73Lfx4hNs5plSHs+xDT69dyfW7xBGp0qLEljRfw9VS + WD/O/BhsUWgQVVbQdludCJaYQgrkLYRUOjdiAA8zMCFYX7TnQT5wvzHDSQiZ0w+RDW + ClVzkMBJWfW4Q== From: Pierre-Jean Texier To: u-boot@lists.denx.de -Date: Fri, 23 Aug 2019 23:03:17 +0200 -Message-Id: <1566594199-25314-3-git-send-email-pjtexier@koncepto.io> +Date: Mon, 26 Aug 2019 13:06:16 +0200 +Message-Id: <1566817578-16750-3-git-send-email-pjtexier@koncepto.io> X-Mailer: git-send-email 2.7.4 -In-Reply-To: <1566594199-25314-1-git-send-email-pjtexier@koncepto.io> -References: <1566594199-25314-1-git-send-email-pjtexier@koncepto.io> +In-Reply-To: <1566817578-16750-1-git-send-email-pjtexier@koncepto.io> +References: <1566817578-16750-1-git-send-email-pjtexier@koncepto.io> MIME-Version: 1.0 Cc: bjorn@haxx.se, michal.simek@xilinx.com, joe.hershberger@ni.com, philip@philipmolloy.com -Subject: [U-Boot] [PATCH 2/4] fw_env: fix build error +Subject: [U-Boot] [PATCH v2 2/4] fw_env: fix build error X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list @@ -207,31 +211,44 @@ tools/env/fw_env.c:1149:25: error: lvalue required as unary ‘&’ operand Fixes: d3716dd ("env: Rename the redundancy flags") Signed-off-by: Pierre-Jean Texier +Tested-by: Joris Offouga Tested-by: Heiko Schocher +Suggested-by: Heiko Schocher --- - tools/env/fw_env.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) +v1 -> v2: + - fix fw_setenv with flag_obsolete (reported by Heiko Schocher) + + tools/env/fw_env.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c -index 876bf2b..b8b936f 100644 +index 876bf2b..e2801f5 100644 --- a/tools/env/fw_env.c +++ b/tools/env/fw_env.c -@@ -1146,7 +1146,7 @@ static int flash_flag_obsolete(int dev, int fd, off_t offset) +@@ -1135,6 +1135,7 @@ static int flash_flag_obsolete(int dev, int fd, off_t offset) + { + int rc; + struct erase_info_user erase; ++ char tmp = ENV_REDUND_OBSOLETE; + + erase.start = DEVOFFSET(dev); + erase.length = DEVESIZE(dev); +@@ -1146,7 +1147,7 @@ static int flash_flag_obsolete(int dev, int fd, off_t offset) return rc; } ioctl(fd, MEMUNLOCK, &erase); - rc = write(fd, &ENV_REDUND_OBSOLETE, sizeof(ENV_REDUND_OBSOLETE)); -+ rc = write(fd, ENV_REDUND_OBSOLETE, sizeof(ENV_REDUND_OBSOLETE)); ++ rc = write(fd, &tmp, sizeof(tmp)); ioctl(fd, MEMLOCK, &erase); if (rc < 0) perror("Could not set obsolete flag"); -From patchwork Fri Aug 23 21:03:18 2019 +From patchwork Mon Aug 26 11:06:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierre-Jean Texier -X-Patchwork-Id: 1152436 +X-Patchwork-Id: 1153105 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org @@ -245,50 +262,50 @@ Authentication-Results: ozlabs.org; dmarc=fail (p=quarantine dis=none) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=koncepto.io header.i=@koncepto.io - header.b="pjwIphoI"; dkim-atps=neutral + header.b="N3SBJxTS"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) - by ozlabs.org (Postfix) with ESMTP id 46FYpN1t0Fz9s7T + by ozlabs.org (Postfix) with ESMTP id 46H8PF6lSpz9sBF for ; - Sat, 24 Aug 2019 07:05:48 +1000 (AEST) + Mon, 26 Aug 2019 21:08:01 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) - id EEDEEC22149; Fri, 23 Aug 2019 21:04:35 +0000 (UTC) + id 98EDDC2213B; Mon, 26 Aug 2019 11:07:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=SPF_HELO_PASS, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) - by lists.denx.de (Postfix) with ESMTP id 10E42C22119; - Fri, 23 Aug 2019 21:04:24 +0000 (UTC) + by lists.denx.de (Postfix) with ESMTP id 118FFC21F9C; + Mon, 26 Aug 2019 11:06:59 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) - id 10AC6C22100; Fri, 23 Aug 2019 21:04:02 +0000 (UTC) + id 84A9AC220FB; Mon, 26 Aug 2019 11:06:49 +0000 (UTC) Received: from koncepto.io (koncepto.io [195.154.119.111]) - by lists.denx.de (Postfix) with ESMTPS id C1716C2211C - for ; Fri, 23 Aug 2019 21:03:59 +0000 (UTC) + by lists.denx.de (Postfix) with ESMTPS id 45D40C22127 + for ; Mon, 26 Aug 2019 11:06:46 +0000 (UTC) Received: from menoah.home (lfbn-1-8923-205.w193-250.abo.wanadoo.fr [193.250.65.205]) - by koncepto.io (Postfix) with ESMTPSA id 28492602CF; - Fri, 23 Aug 2019 23:03:59 +0200 (CEST) + by koncepto.io (Postfix) with ESMTPSA id 99A5960378; + Mon, 26 Aug 2019 13:06:45 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=koncepto.io; - s=default; t=1566594239; - bh=vz6qm8CT1Bzb32KpNR3krs97Ns4VK4eOovt/tpxnm9I=; + s=default; t=1566817605; + bh=dWwf9DG0EIYj1c3i6TZ9GcIjpKB4dt6vWg1Dt8wKqzw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; - b=pjwIphoIjS3ugkAK2bwHZnPfDdBTCvl7rQ1RaVUrjWIkHLSwB6q8rDp/sqMiVEqTD - lwSZuMtsOibIY+2cE7O1lIw0NDrav4ltJLgGYZBUfU+pG5ZudRHc4SF+sGVSgk1NXJ - sS3alNbxsA4rPghfOTrgx07pF9RmlHYv+Zoe+oPL2z2GvWDRYgRuZ8bXOWo4LCdieh - WxGIhYhbQyf7Gy7EQjotwyabUstOYMlv4gVVFLeWAbGOWPfuckOSF8IbsusNDFHTdz - lN6/RNx1HK/JNlxawIZklpeO4BtLBMTBVgbBGkpuwi0th6Hq0IfGc/oETpvfnlQjZ0 - UFebqc7lSAWIA== + b=N3SBJxTSaw0Cc/Af4mtNxZoxnO00iPmrwKFdSpv7Ivcye0Fvia3QcbbWuikUWWsvC + tJmF5PWGKgVlihn9XPEGhMKbhKWPGiBu/s2hlexR6DoJJxDf/8NmNTh8lpWjm4OvRM + PL7ZRhxs8bIN8CO+pKk+FwZswp8J/ox8Y65QcrmlG7eyLivK+/D87dI0GPVjeu68Am + 5LC+rYJKFB12qalI8b+QJHWZFyhx4yA6crHbz3ynfXYMFywXLz99bvj+3hiyadKuVA + HvY54Esmj1mVtaO9YeWOA0UseI6tI7NnFpFsDhXOHGjROrGPlGH+ZutRy00m1sfcZH + hb5LdaY/5drGg== From: Pierre-Jean Texier To: u-boot@lists.denx.de -Date: Fri, 23 Aug 2019 23:03:18 +0200 -Message-Id: <1566594199-25314-4-git-send-email-pjtexier@koncepto.io> +Date: Mon, 26 Aug 2019 13:06:17 +0200 +Message-Id: <1566817578-16750-4-git-send-email-pjtexier@koncepto.io> X-Mailer: git-send-email 2.7.4 -In-Reply-To: <1566594199-25314-1-git-send-email-pjtexier@koncepto.io> -References: <1566594199-25314-1-git-send-email-pjtexier@koncepto.io> +In-Reply-To: <1566817578-16750-1-git-send-email-pjtexier@koncepto.io> +References: <1566817578-16750-1-git-send-email-pjtexier@koncepto.io> MIME-Version: 1.0 Cc: bjorn@haxx.se, michal.simek@xilinx.com, joe.hershberger@ni.com, philip@philipmolloy.com -Subject: [U-Boot] [PATCH 3/4] env: add missing header file +Subject: [U-Boot] [PATCH v2 3/4] env: add missing header file X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list @@ -319,8 +336,12 @@ include/env.h:158:49: error: unknown type name ‘ulong’; did you mean ‘long ulong env_get_ulong(const char *name, int base, ulong default_val); Signed-off-by: Pierre-Jean Texier +Tested-by: Joris Offouga Tested-by: Heiko Schocher --- +v1 -> v2: + - None + include/env.h | 1 + 1 file changed, 1 insertion(+) @@ -337,12 +358,12 @@ index a74a261..b72239f 100644 #include -From patchwork Fri Aug 23 21:03:19 2019 +From patchwork Mon Aug 26 11:06:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Jean Texier -X-Patchwork-Id: 1152433 +X-Patchwork-Id: 1153104 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org @@ -356,49 +377,49 @@ Authentication-Results: ozlabs.org; dmarc=fail (p=quarantine dis=none) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=koncepto.io header.i=@koncepto.io - header.b="MLoR0pLn"; dkim-atps=neutral + header.b="HvNQuMmn"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) - by ozlabs.org (Postfix) with ESMTP id 46FYnH1vcVz9s7T + by ozlabs.org (Postfix) with ESMTP id 46H8P275Mcz9sBF for ; - Sat, 24 Aug 2019 07:04:51 +1000 (AEST) + Mon, 26 Aug 2019 21:07:50 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) - id EA07BC22119; Fri, 23 Aug 2019 21:04:27 +0000 (UTC) + id A5445C22143; Mon, 26 Aug 2019 11:07:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=SPF_HELO_PASS, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) - by lists.denx.de (Postfix) with ESMTP id 5017BC22128; - Fri, 23 Aug 2019 21:04:20 +0000 (UTC) + by lists.denx.de (Postfix) with ESMTP id 99A7EC21F9E; + Mon, 26 Aug 2019 11:06:56 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) - id 28D29C21D74; Fri, 23 Aug 2019 21:04:02 +0000 (UTC) + id 1B211C21FB7; Mon, 26 Aug 2019 11:06:50 +0000 (UTC) Received: from koncepto.io (koncepto.io [195.154.119.111]) - by lists.denx.de (Postfix) with ESMTPS id 8C956C22127 - for ; Fri, 23 Aug 2019 21:04:00 +0000 (UTC) + by lists.denx.de (Postfix) with ESMTPS id 5DD4FC22142 + for ; Mon, 26 Aug 2019 11:06:47 +0000 (UTC) Received: from menoah.home (lfbn-1-8923-205.w193-250.abo.wanadoo.fr [193.250.65.205]) - by koncepto.io (Postfix) with ESMTPSA id E9520602D0; - Fri, 23 Aug 2019 23:03:59 +0200 (CEST) + by koncepto.io (Postfix) with ESMTPSA id C256360379; + Mon, 26 Aug 2019 13:06:46 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=koncepto.io; - s=default; t=1566594240; - bh=Mc23EDVcZaZMYgrrKwCQSFQQ7Ha0pSbWk3NULDE15hk=; + s=default; t=1566817607; + bh=uZNRBSN4VpoP7mepjwChysqtnjGfdVboiTXTDe06LEU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; - b=MLoR0pLn287FS4CiPTiVfu2Iqk3PldkFZkPW5rY0dTpiQFpSl15wRVyerSbmxDp1n - 4Erl2YMzlJwPQH/W1IuVqdYpsjX8/6qLUmK547M9G9meCW3aBy0yTsZYZ+oRFnh2cb - gI+jpjZkarOAsfTjMIpZoRSpkrys1TiWf2tJnwAnZNoze8FnGsdT7YyB9xniMekdmV - UhKOrY5eZTx/FyRfwVVB18sZ/lBfVda+X8yNzXlUdCGFiK4MSixCPCepZAzaZsI7/K - pHWsz47HljX7jEoNpa/kUcPbNTIwf5fSFbVaoFGgXGPlu25t3iFiyjWJOfVX/pzin/ - wXRG/9pPQ5XEQ== + b=HvNQuMmnrlCD9XJG0/ozSpYPRFnOXBTD8TUFjcv0J+z/nZt0lCcYuSgICWNwLzjkK + mOfgLxHOC5GAWv+jSVCNiL4NHnlsHtCWPTmwoWLHvuJMSopMyK/zbGkNKdiB0D5bAn + oc3cAuzUIex4yqSidWtEXN7uxYstmMRNOVyyacTKDCfTYwUDb+4RMbr62MZGXNQO26 + 0YShoLiU0geXqsu5IXy896mMWQejlZ6J14FiRN7ZD/cEHZGuPcFcophp4PgIMLnvJz + KW2AAdMo8YoYUznZ19vBEmJuEutoju0h0Bee+YH0/jtbTgH9XarZrO6ljyEV+gbrKt + W2vCG78kPreOQ== From: Pierre-Jean Texier To: u-boot@lists.denx.de -Date: Fri, 23 Aug 2019 23:03:19 +0200 -Message-Id: <1566594199-25314-5-git-send-email-pjtexier@koncepto.io> +Date: Mon, 26 Aug 2019 13:06:18 +0200 +Message-Id: <1566817578-16750-5-git-send-email-pjtexier@koncepto.io> X-Mailer: git-send-email 2.7.4 -In-Reply-To: <1566594199-25314-1-git-send-email-pjtexier@koncepto.io> -References: <1566594199-25314-1-git-send-email-pjtexier@koncepto.io> +In-Reply-To: <1566817578-16750-1-git-send-email-pjtexier@koncepto.io> +References: <1566817578-16750-1-git-send-email-pjtexier@koncepto.io> Cc: bjorn@haxx.se, michal.simek@xilinx.com, joe.hershberger@ni.com, philip@philipmolloy.com -Subject: [U-Boot] [PATCH 4/4] ci: add envtools support +Subject: [U-Boot] [PATCH v2 4/4] ci: add envtools support X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list @@ -421,6 +442,9 @@ is no build issues. Signed-off-by: Pierre-Jean Texier Acked-by: Heiko Schocher --- +v1 -> v2: + - None + .gitlab-ci.yml | 7 +++++++ .travis.yml | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/uboot-tools.spec b/uboot-tools.spec index 79cd6aa..faee16c 100644 --- a/uboot-tools.spec +++ b/uboot-tools.spec @@ -2,7 +2,7 @@ Name: uboot-tools Version: 2019.10 -Release: 0.1%{?candidate:.%{candidate}}%{?dist} +Release: 0.2%{?candidate:.%{candidate}}%{?dist} Summary: U-Boot utilities License: GPLv2+ BSD LGPL-2.1+ LGPL-2.0+ URL: http://www.denx.de/wiki/U-Boot @@ -44,15 +44,10 @@ BuildRequires: openssl-devel BuildRequires: python2-devel BuildRequires: python2-setuptools BuildRequires: python2-libfdt -%if 0%{?rhel} == 7 -BuildRequires: python-pyelftools -%else -BuildRequires: python2-pyelftools -%endif BuildRequires: SDL-devel BuildRequires: swig %ifarch %{arm} aarch64 -BuildRequires: vboot-utils +#BuildRequires: vboot-utils %endif %ifarch aarch64 BuildRequires: arm-trusted-firmware-armv8 @@ -262,6 +257,9 @@ cp -p board/warp7/README builds/docs/README.warp7 %endif %changelog +* Mon Aug 26 2019 Peter Robinson 2019.10-0.2-rc2 +- Temporarily disable Chrome devices due to unexpected retirement of vboot-utils + * Wed Aug 14 2019 Peter Robinson 2019.10-0.1-rc2 - 2019.10 RC2 From 55487ddec2eeaaed9f451d7d925104f50344e388 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 26 Aug 2019 15:18:21 +0100 Subject: [PATCH 03/10] fix build of Jetson Nano --- ARM-tegra-Add-NVIDIA-Jetson-Nano.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ARM-tegra-Add-NVIDIA-Jetson-Nano.patch b/ARM-tegra-Add-NVIDIA-Jetson-Nano.patch index f4c7b96..2510a7f 100644 --- a/ARM-tegra-Add-NVIDIA-Jetson-Nano.patch +++ b/ARM-tegra-Add-NVIDIA-Jetson-Nano.patch @@ -298,7 +298,7 @@ index 000000000000..432179e92605 + */ + +#include -+#include ++#include +#include +#include +#include From f00e59665fd8dd7cfd01a304b22427b908c9eaa0 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 26 Aug 2019 17:11:19 +0100 Subject: [PATCH 04/10] Re-add accidentally dropped RPi4 patch --- Raspberry-Pi-32-64-support.patch | 1155 ++++++++++++++++++++++++++++++ uboot-tools.spec | 1 + 2 files changed, 1156 insertions(+) create mode 100644 Raspberry-Pi-32-64-support.patch diff --git a/Raspberry-Pi-32-64-support.patch b/Raspberry-Pi-32-64-support.patch new file mode 100644 index 0000000..38a094f --- /dev/null +++ b/Raspberry-Pi-32-64-support.patch @@ -0,0 +1,1155 @@ +From patchwork Wed Jul 24 14:39:04 2019 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Patchwork-Submitter: Andrei Gherzan +X-Patchwork-Id: 1136358 +X-Patchwork-Delegate: matthias.bgg@gmail.com +Return-Path: +X-Original-To: incoming@patchwork.ozlabs.org +Delivered-To: patchwork-incoming@bilbo.ozlabs.org +Authentication-Results: ozlabs.org; + spf=none (mailfrom) smtp.mailfrom=lists.denx.de + (client-ip=81.169.180.215; helo=lists.denx.de; + envelope-from=u-boot-bounces@lists.denx.de; + receiver=) +Authentication-Results: ozlabs.org; + dmarc=none (p=none dis=none) header.from=balena.io +Received: from lists.denx.de (dione.denx.de [81.169.180.215]) + by ozlabs.org (Postfix) with ESMTP id 45tyhH0gbgz9s8m + for ; + Thu, 25 Jul 2019 00:41:03 +1000 (AEST) +Received: by lists.denx.de (Postfix, from userid 105) + id 92844C21D9A; Wed, 24 Jul 2019 14:39:46 +0000 (UTC) +X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de +X-Spam-Level: +X-Spam-Status: No, score=0.8 required=5.0 tests=UPPERCASE_50_75 autolearn=no + autolearn_force=no version=3.4.0 +Received: from lists.denx.de (localhost [IPv6:::1]) + by lists.denx.de (Postfix) with ESMTP id 882B5C21D72; + Wed, 24 Jul 2019 14:39:40 +0000 (UTC) +Received: by lists.denx.de (Postfix, from userid 105) + id 7C7EBC21C27; Wed, 24 Jul 2019 14:39:35 +0000 (UTC) +Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com + [209.85.221.65]) + by lists.denx.de (Postfix) with ESMTPS id 2B1D6C21BE5 + for ; Wed, 24 Jul 2019 14:39:35 +0000 (UTC) +Received: by mail-wr1-f65.google.com with SMTP id x1so32293472wrr.9 + for ; Wed, 24 Jul 2019 07:39:35 -0700 (PDT) +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=8Z82pQdbffuUA8JpsYMwwHCjbZBONEoOwfFh2hjslOs=; + b=rJPUcmpkh37qDajtL1440DjXD+gxop4QeK685/B+RpJIrTVrBVPe9Z8ahOzM4t6MfA + R9KYo3KoDOOvp0dm6Ovih0rgEVLjUL9K+/tzqQi9Y3YbflK/VRA7WUuzKWq7o/732qqh + CLtDHeYCaaAepsl6TzeXSndNd74QoJJFlMtFUf2kDHV3ERIqIDvRd2LI1144GMTFOBjj + gkZr28fm0BVQPbHVN9p7mZ4vXcKUf2I2Wkje7P6EN6IJTrIcKZvcT2IpnzvsEdbPJ14r + 1JkPI3Bg7pf7iTVAcHDhZ0HWOxnuRuB3KzmC0WkOgYIWpjgUGdNCIys1VHusa8JGUmtz + X/OQ== +X-Gm-Message-State: APjAAAV4zaznNtIjQJuMF7dLBX4DR9QvnvmUcRzNftXStiuRuXXWnXS1 + MP7oLCr936klnQUkQAkOlyr/cP0s +X-Google-Smtp-Source: APXvYqxJiPSQ9vd5GlT71/+cluS1CRb303VcbpLDq5FS1UdhoChDRrXDGMI6wz5akinycJIMwNQZrg== +X-Received: by 2002:adf:f3d1:: with SMTP id g17mr58097903wrp.38.1563979174441; + Wed, 24 Jul 2019 07:39:34 -0700 (PDT) +Received: from localhost.localdomain ([212.36.34.46]) + by smtp.gmail.com with ESMTPSA id + n14sm84860651wra.75.2019.07.24.07.39.33 + (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); + Wed, 24 Jul 2019 07:39:34 -0700 (PDT) +From: Andrei Gherzan +To: u-boot@lists.denx.de +Date: Wed, 24 Jul 2019 15:39:04 +0100 +Message-Id: <20190724143911.29770-2-andrei@balena.io> +X-Mailer: git-send-email 2.22.0 +In-Reply-To: <20190724143911.29770-1-andrei@balena.io> +References: <20190716133803.1174-1-andrei@gherzan.ro> + <20190724143911.29770-1-andrei@balena.io> +MIME-Version: 1.0 +Cc: mbrugger@suse.com, Andrei Gherzan +Subject: [U-Boot] [PATCH v2 1/8] RPI: Add defconfigs for rpi4 (32/64) +X-BeenThere: u-boot@lists.denx.de +X-Mailman-Version: 2.1.18 +Precedence: list +List-Id: U-Boot discussion +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +Content-Type: text/plain; charset="utf-8" +Errors-To: u-boot-bounces@lists.denx.de +Sender: "U-Boot" + +This defines a minimum defconfig for each of the two Raspberry Pi 4 +variants. One notable difference is that we don't have a embedded dt for +this board given that the fw supplies us with one which we can reuse. +Furthermore, the ram size is not queryable through mbox interface as the +maximum reported size is 1G. The fw patches the dt with the right +memory configuration and uboot uses it as it is. We avoid u-boot +touching this configuration by making sure CONFIG_ARCH_FIXUP_FDT_MEMORY +is deactivated. + +Signed-off-by: Andrei Gherzan +--- + configs/rpi_4_32b_defconfig | 33 +++++++++++++++++++++++++++++++++ + configs/rpi_4_defconfig | 33 +++++++++++++++++++++++++++++++++ + 2 files changed, 66 insertions(+) + create mode 100644 configs/rpi_4_32b_defconfig + create mode 100644 configs/rpi_4_defconfig + +diff --git a/configs/rpi_4_32b_defconfig b/configs/rpi_4_32b_defconfig +new file mode 100644 +index 0000000000..a31a617a5f +--- /dev/null ++++ b/configs/rpi_4_32b_defconfig +@@ -0,0 +1,33 @@ ++CONFIG_ARM=y ++CONFIG_ARCH_BCM283X=y ++CONFIG_SYS_TEXT_BASE=0x00008000 ++CONFIG_TARGET_RPI_4_32B=y ++CONFIG_SYS_MALLOC_F_LEN=0x2000 ++CONFIG_DISTRO_DEFAULTS=y ++CONFIG_NR_DRAM_BANKS=1 ++# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set ++CONFIG_OF_BOARD=y ++CONFIG_OF_BOARD_SETUP=y ++CONFIG_MISC_INIT_R=y ++# CONFIG_DISPLAY_CPUINFO is not set ++# CONFIG_DISPLAY_BOARDINFO is not set ++CONFIG_SYS_PROMPT="U-Boot> " ++# CONFIG_CMD_FLASH is not set ++CONFIG_CMD_GPIO=y ++CONFIG_CMD_MMC=y ++CONFIG_CMD_FS_UUID=y ++CONFIG_ENV_FAT_INTERFACE="mmc" ++CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" ++CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y ++CONFIG_DM_KEYBOARD=y ++CONFIG_DM_MMC=y ++CONFIG_MMC_SDHCI=y ++CONFIG_MMC_SDHCI_BCM2835=y ++CONFIG_PINCTRL=y ++# CONFIG_PINCTRL_GENERIC is not set ++# CONFIG_REQUIRE_SERIAL_CONSOLE is not set ++CONFIG_DM_VIDEO=y ++CONFIG_SYS_WHITE_ON_BLACK=y ++CONFIG_CONSOLE_SCROLL_LINES=10 ++CONFIG_PHYS_TO_BUS=y ++CONFIG_OF_LIBFDT_OVERLAY=y +diff --git a/configs/rpi_4_defconfig b/configs/rpi_4_defconfig +new file mode 100644 +index 0000000000..da8c960a2a +--- /dev/null ++++ b/configs/rpi_4_defconfig +@@ -0,0 +1,33 @@ ++CONFIG_ARM=y ++CONFIG_ARCH_BCM283X=y ++CONFIG_SYS_TEXT_BASE=0x00080000 ++CONFIG_TARGET_RPI_4=y ++CONFIG_SYS_MALLOC_F_LEN=0x2000 ++CONFIG_DISTRO_DEFAULTS=y ++CONFIG_NR_DRAM_BANKS=1 ++# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set ++CONFIG_OF_BOARD=y ++CONFIG_OF_BOARD_SETUP=y ++CONFIG_MISC_INIT_R=y ++# CONFIG_DISPLAY_CPUINFO is not set ++# CONFIG_DISPLAY_BOARDINFO is not set ++CONFIG_SYS_PROMPT="U-Boot> " ++# CONFIG_CMD_FLASH is not set ++CONFIG_CMD_GPIO=y ++CONFIG_CMD_MMC=y ++CONFIG_CMD_FS_UUID=y ++CONFIG_ENV_FAT_INTERFACE="mmc" ++CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" ++CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y ++CONFIG_DM_KEYBOARD=y ++CONFIG_DM_MMC=y ++CONFIG_MMC_SDHCI=y ++CONFIG_MMC_SDHCI_BCM2835=y ++CONFIG_PINCTRL=y ++# CONFIG_PINCTRL_GENERIC is not set ++# CONFIG_REQUIRE_SERIAL_CONSOLE is not set ++CONFIG_DM_VIDEO=y ++CONFIG_SYS_WHITE_ON_BLACK=y ++CONFIG_CONSOLE_SCROLL_LINES=10 ++CONFIG_PHYS_TO_BUS=y ++CONFIG_OF_LIBFDT_OVERLAY=y + +From patchwork Wed Jul 24 14:39:05 2019 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Patchwork-Submitter: Andrei Gherzan +X-Patchwork-Id: 1136357 +X-Patchwork-Delegate: matthias.bgg@gmail.com +Return-Path: +X-Original-To: incoming@patchwork.ozlabs.org +Delivered-To: patchwork-incoming@bilbo.ozlabs.org +Authentication-Results: ozlabs.org; + spf=none (mailfrom) smtp.mailfrom=lists.denx.de + (client-ip=81.169.180.215; helo=lists.denx.de; + envelope-from=u-boot-bounces@lists.denx.de; + receiver=) +Authentication-Results: ozlabs.org; + dmarc=none (p=none dis=none) header.from=balena.io +Received: from lists.denx.de (dione.denx.de [81.169.180.215]) + by ozlabs.org (Postfix) with ESMTP id 45tygm6ldWz9s3l + for ; + Thu, 25 Jul 2019 00:40:36 +1000 (AEST) +Received: by lists.denx.de (Postfix, from userid 105) + id 9DA33C21CB6; Wed, 24 Jul 2019 14:39:59 +0000 (UTC) +X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de +X-Spam-Level: +X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2 + autolearn=unavailable autolearn_force=no version=3.4.0 +Received: from lists.denx.de (localhost [IPv6:::1]) + by lists.denx.de (Postfix) with ESMTP id 17CAEC21D8E; + Wed, 24 Jul 2019 14:39:47 +0000 (UTC) +Received: by lists.denx.de (Postfix, from userid 105) + id 82DD4C21CB6; Wed, 24 Jul 2019 14:39:36 +0000 (UTC) +Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com + [209.85.221.67]) + by lists.denx.de (Postfix) with ESMTPS id 01AFFC21BE5 + for ; Wed, 24 Jul 2019 14:39:36 +0000 (UTC) +Received: by mail-wr1-f67.google.com with SMTP id 31so47328827wrm.1 + for ; Wed, 24 Jul 2019 07:39:36 -0700 (PDT) +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=SBRknuqaA8nrsEqGUKyxns0jOTIIj2fE4uzSYMyIGew=; + b=PM1drqcqaap81ZOvnmAJY7X232GJ1xovWSwf0Gfii33S1JHlV0lXbcT6pHy/MY5C1Y + GVqDd9jEF6nKvHAGx2xHd2df1KTAaYpuxqmmo89okoq1FQ80/gwzWj+AZJ/AsoZHiR0W + Jo/QZmK8NjcG9xVEPkdvq2kYg7V7FGrTQgKFCn8y4tSk6rdFXH6x71luCFr9GTiHqmes + XE5UGqaitR84yV9d5U4NL8pNnZbhtyxT8YYgkRyRbtOTwYi44C0XYsVwHP4G8DSjMjeE + 5jdjVUB8rmMki3Bqtj5aGkS0F+k/RvLiQPKbkssavqHl24M4ohWNlZ4fI9VXzg+4DJjZ + aT7g== +X-Gm-Message-State: APjAAAXvh2LHWYIbEeX1TSDzEtnms+hdW6mVhDH8RRCsABLlzzPSCiUf + 8um70SOfA7+T6IFVzjiHE/2q21x6 +X-Google-Smtp-Source: APXvYqzpQ+14M+bTmm58qDfrEm+q5psg5hqSSHCmXarzdL9SPFCPF5TlXBFq2NrJt8Zn5k7Cm+vgzQ== +X-Received: by 2002:adf:e444:: with SMTP id t4mr83713613wrm.262.1563979175247; + Wed, 24 Jul 2019 07:39:35 -0700 (PDT) +Received: from localhost.localdomain ([212.36.34.46]) + by smtp.gmail.com with ESMTPSA id + n14sm84860651wra.75.2019.07.24.07.39.34 + (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); + Wed, 24 Jul 2019 07:39:34 -0700 (PDT) +From: Andrei Gherzan +To: u-boot@lists.denx.de +Date: Wed, 24 Jul 2019 15:39:05 +0100 +Message-Id: <20190724143911.29770-3-andrei@balena.io> +X-Mailer: git-send-email 2.22.0 +In-Reply-To: <20190724143911.29770-1-andrei@balena.io> +References: <20190716133803.1174-1-andrei@gherzan.ro> + <20190724143911.29770-1-andrei@balena.io> +MIME-Version: 1.0 +Cc: mbrugger@suse.com, Andrei Gherzan +Subject: [U-Boot] [PATCH v2 2/8] ARM: bcm283x: Add BCM283x_BASE define +X-BeenThere: u-boot@lists.denx.de +X-Mailman-Version: 2.1.18 +Precedence: list +List-Id: U-Boot discussion +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +Content-Type: text/plain; charset="utf-8" +Errors-To: u-boot-bounces@lists.denx.de +Sender: "U-Boot" + +From: Matthias Brugger + +Devices of bcm283x have different base address, depending if they are on +bcm2835 or bcm2836/7. Use BCM283x_BASE depending on the SoC you want to +build and only add the offset in the header files. + +Signed-off-by: Matthias Brugger +Signed-off-by: Andrei Gherzan +--- + arch/arm/mach-bcm283x/Kconfig | 5 +++++ + arch/arm/mach-bcm283x/include/mach/mbox.h | 6 +----- + arch/arm/mach-bcm283x/include/mach/sdhci.h | 6 +----- + arch/arm/mach-bcm283x/include/mach/timer.h | 6 +----- + arch/arm/mach-bcm283x/include/mach/wdog.h | 6 +----- + 5 files changed, 9 insertions(+), 20 deletions(-) + +diff --git a/arch/arm/mach-bcm283x/Kconfig b/arch/arm/mach-bcm283x/Kconfig +index 3eb5a9a897..8e69914a83 100644 +--- a/arch/arm/mach-bcm283x/Kconfig ++++ b/arch/arm/mach-bcm283x/Kconfig +@@ -141,4 +141,9 @@ config SYS_SOC + config SYS_CONFIG_NAME + default "rpi" + ++config BCM283x_BASE ++ hex ++ default "0x20000000" if BCM2835 ++ default "0x3f000000" if BCM2836 || BCM2837 ++ + endmenu +diff --git a/arch/arm/mach-bcm283x/include/mach/mbox.h b/arch/arm/mach-bcm283x/include/mach/mbox.h +index e3a893e49c..e44c7577da 100644 +--- a/arch/arm/mach-bcm283x/include/mach/mbox.h ++++ b/arch/arm/mach-bcm283x/include/mach/mbox.h +@@ -37,11 +37,7 @@ + + /* Raw mailbox HW */ + +-#ifndef CONFIG_BCM2835 +-#define BCM2835_MBOX_PHYSADDR 0x3f00b880 +-#else +-#define BCM2835_MBOX_PHYSADDR 0x2000b880 +-#endif ++#define BCM2835_MBOX_PHYSADDR (CONFIG_BCM283x_BASE + 0x0000b880) + + struct bcm2835_mbox_regs { + u32 read; +diff --git a/arch/arm/mach-bcm283x/include/mach/sdhci.h b/arch/arm/mach-bcm283x/include/mach/sdhci.h +index 5cb6ec3340..b443c379d8 100644 +--- a/arch/arm/mach-bcm283x/include/mach/sdhci.h ++++ b/arch/arm/mach-bcm283x/include/mach/sdhci.h +@@ -6,11 +6,7 @@ + #ifndef _BCM2835_SDHCI_H_ + #define _BCM2835_SDHCI_H_ + +-#ifndef CONFIG_BCM2835 +-#define BCM2835_SDHCI_BASE 0x3f300000 +-#else +-#define BCM2835_SDHCI_BASE 0x20300000 +-#endif ++#define BCM2835_SDHCI_BASE (CONFIG_BCM283x_BASE + 0x00300000) + + int bcm2835_sdhci_init(u32 regbase, u32 emmc_freq); + +diff --git a/arch/arm/mach-bcm283x/include/mach/timer.h b/arch/arm/mach-bcm283x/include/mach/timer.h +index 56b0c356bb..014355e759 100644 +--- a/arch/arm/mach-bcm283x/include/mach/timer.h ++++ b/arch/arm/mach-bcm283x/include/mach/timer.h +@@ -6,11 +6,7 @@ + #ifndef _BCM2835_TIMER_H + #define _BCM2835_TIMER_H + +-#ifndef CONFIG_BCM2835 +-#define BCM2835_TIMER_PHYSADDR 0x3f003000 +-#else +-#define BCM2835_TIMER_PHYSADDR 0x20003000 +-#endif ++#define BCM2835_TIMER_PHYSADDR (CONFIG_BCM283x_BASE + 0x00003000) + + #define BCM2835_TIMER_CS_M3 (1 << 3) + #define BCM2835_TIMER_CS_M2 (1 << 2) +diff --git a/arch/arm/mach-bcm283x/include/mach/wdog.h b/arch/arm/mach-bcm283x/include/mach/wdog.h +index 99c88e5df7..8292b3cf1f 100644 +--- a/arch/arm/mach-bcm283x/include/mach/wdog.h ++++ b/arch/arm/mach-bcm283x/include/mach/wdog.h +@@ -6,11 +6,7 @@ + #ifndef _BCM2835_WDOG_H + #define _BCM2835_WDOG_H + +-#ifndef CONFIG_BCM2835 +-#define BCM2835_WDOG_PHYSADDR 0x3f100000 +-#else +-#define BCM2835_WDOG_PHYSADDR 0x20100000 +-#endif ++#define BCM2835_WDOG_PHYSADDR (CONFIG_BCM283x_BASE + 0x00100000) + + struct bcm2835_wdog_regs { + u32 unknown0[7]; + +From patchwork Wed Jul 24 14:39:06 2019 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Patchwork-Submitter: Andrei Gherzan +X-Patchwork-Id: 1136372 +X-Patchwork-Delegate: matthias.bgg@gmail.com +Return-Path: +X-Original-To: incoming@patchwork.ozlabs.org +Delivered-To: patchwork-incoming@bilbo.ozlabs.org +Authentication-Results: ozlabs.org; + spf=none (mailfrom) smtp.mailfrom=lists.denx.de + (client-ip=81.169.180.215; helo=lists.denx.de; + envelope-from=u-boot-bounces@lists.denx.de; + receiver=) +Authentication-Results: ozlabs.org; + dmarc=none (p=none dis=none) header.from=balena.io +Received: from lists.denx.de (dione.denx.de [81.169.180.215]) + by ozlabs.org (Postfix) with ESMTP id 45tyl70FC2z9s3l + for ; + Thu, 25 Jul 2019 00:43:30 +1000 (AEST) +Received: by lists.denx.de (Postfix, from userid 105) + id A8034C21DF3; Wed, 24 Jul 2019 14:40:46 +0000 (UTC) +X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de +X-Spam-Level: +X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2 + autolearn=unavailable autolearn_force=no version=3.4.0 +Received: from lists.denx.de (localhost [IPv6:::1]) + by lists.denx.de (Postfix) with ESMTP id 4C777C21DCA; + Wed, 24 Jul 2019 14:40:10 +0000 (UTC) +Received: by lists.denx.de (Postfix, from userid 105) + id 474FDC21D74; Wed, 24 Jul 2019 14:39:39 +0000 (UTC) +Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com + [209.85.128.68]) + by lists.denx.de (Postfix) with ESMTPS id 55C9DC21D4A + for ; Wed, 24 Jul 2019 14:39:37 +0000 (UTC) +Received: by mail-wm1-f68.google.com with SMTP id s15so20507009wmj.3 + for ; Wed, 24 Jul 2019 07:39:37 -0700 (PDT) +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=pWvZ588J48xOgvZOVW9fhkWibsiRtNBVuM4VBynrLQw=; + b=Am1Me0M/J3HedD2FzOBBvEpBhsNfG5psGW0Lap+uSDun9LynEo+RqAgmLAAp3KtUFD + vUkieSMQZAjAIyzy8ySvUjuVA8iEUPN8wbo55HZ+3X5HfhgsbMwu70KZDA9UBw1T4v6V + CE1pyL9enGgcwdDiTcXztZo57iM/vq1B6HilY8J27ZJFb9fJNH4L7IxE4O/febLJ4ljc + micbK/014Ibg6DqlmHbBh4akENSDlXOrQLqMC8FdK0lsJIP7EH9Xqc6MubvgCzyhvS89 + xPFsmuRVAZVvpnQ6+mcSidfeiyYCMXh2IE8wgKExlyysSAjkZPC8Z+1H2qOnvOz+XEjX + GVrg== +X-Gm-Message-State: APjAAAVcUgx+4UkyQKJDr3/tCu0zV2vBZk5reX2ukIrxHlkjQSBTYuSa + Napy/FHrIjVsWObEdv0xTsrwwqT8 +X-Google-Smtp-Source: APXvYqz1dOMBUWbTH/jK138AvmFcmCjdMc9s6oLE6NbSPeUiM4M0S3istSFU+IBlBRGqC2zlitzAQg== +X-Received: by 2002:a7b:cc86:: with SMTP id p6mr69114900wma.123.1563979176511; + Wed, 24 Jul 2019 07:39:36 -0700 (PDT) +Received: from localhost.localdomain ([212.36.34.46]) + by smtp.gmail.com with ESMTPSA id + n14sm84860651wra.75.2019.07.24.07.39.35 + (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); + Wed, 24 Jul 2019 07:39:35 -0700 (PDT) +From: Andrei Gherzan +To: u-boot@lists.denx.de +Date: Wed, 24 Jul 2019 15:39:06 +0100 +Message-Id: <20190724143911.29770-4-andrei@balena.io> +X-Mailer: git-send-email 2.22.0 +In-Reply-To: <20190724143911.29770-1-andrei@balena.io> +References: <20190716133803.1174-1-andrei@gherzan.ro> + <20190724143911.29770-1-andrei@balena.io> +MIME-Version: 1.0 +Cc: mbrugger@suse.com, Andrei Gherzan +Subject: [U-Boot] [PATCH v2 3/8] ARM: bcm283x: Define configs for RaspberryPi 4 +X-BeenThere: u-boot@lists.denx.de +X-Mailman-Version: 2.1.18 +Precedence: list +List-Id: U-Boot discussion +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +Content-Type: text/plain; charset="utf-8" +Errors-To: u-boot-bounces@lists.denx.de +Sender: "U-Boot" + +Define two target configs for Raspberry Pi 4 (32 and 64bit) and the +corresponding BCM2838* configs. + +Be aware of the current limitation in firmware which requires an +explicit configuration to force the arm in 64bit mode when the +respective target is used. + +Signed-off-by: Andrei Gherzan +Signed-off-by: Matthias Brugger +--- + arch/arm/mach-bcm283x/Kconfig | 62 +++++++++++++++++++++++++++++++++++ + 1 file changed, 62 insertions(+) + +diff --git a/arch/arm/mach-bcm283x/Kconfig b/arch/arm/mach-bcm283x/Kconfig +index 8e69914a83..09a5b42bbb 100644 +--- a/arch/arm/mach-bcm283x/Kconfig ++++ b/arch/arm/mach-bcm283x/Kconfig +@@ -26,6 +26,23 @@ config BCM2837_64B + select BCM2837 + select ARM64 + ++config BCM2838 ++ bool "Broadcom BCM2838 SoC support" ++ depends on ARCH_BCM283X ++ ++config BCM2838_32B ++ bool "Broadcom BCM2838 SoC 32-bit support" ++ depends on ARCH_BCM283X ++ select BCM2838 ++ select ARMV7_LPAE ++ select CPU_V7A ++ ++config BCM2838_64B ++ bool "Broadcom BCM2838 SoC 64-bit support" ++ depends on ARCH_BCM283X ++ select BCM2838 ++ select ARM64 ++ + menu "Broadcom BCM283X family" + depends on ARCH_BCM283X + +@@ -127,6 +144,50 @@ config TARGET_RPI_3 + This option creates a build targeting the ARMv8/AArch64 ISA. + select BCM2837_64B + ++config TARGET_RPI_4_32B ++ bool "Raspberry Pi 4 32-bit build" ++ help ++ Support for all BCM2838-based Raspberry Pi variants, such as ++ the RPi 4 model B, in AArch32 (32-bit) mode. ++ ++ This option assumes the VideoCore firmware is configured to use the ++ mini UART (rather than PL011) for the serial console. This is the ++ default on the RPi 4. To enable the UART console, the following non- ++ default option must be present in config.txt: enable_uart=1. This is ++ required for U-Boot to operate correctly, even if you only care ++ about the HDMI/usbkbd console. ++ ++ Due to hardware incompatibilities, this can't be used with ++ BCM283/5/6/7. ++ ++ This option creates a build targeting the ARMv7/AArch32 ISA. ++ select BCM2838_32B ++ ++config TARGET_RPI_4 ++ bool "Raspberry Pi 4 64-bit build" ++ help ++ Support for all BCM2838-based Raspberry Pi variants, such as ++ the RPi 4 model B, in AArch64 (64-bit) mode. ++ ++ This option assumes the VideoCore firmware is configured to use the ++ mini UART (rather than PL011) for the serial console. This is the ++ default on the RPi 4. To enable the UART console, the following non- ++ default option must be present in config.txt: enable_uart=1. This is ++ required for U-Boot to operate correctly, even if you only care ++ about the HDMI/usbkbd console. ++ ++ Due to hardware incompatibilities, this can't be used with ++ BCM283/5/6/7. ++ ++ Also, due to a bug in firmware, switching to 64bit mode doesn't ++ happen automatically based on the kernel's image filename. See ++ https://github.com/raspberrypi/firmware/issues/1193 for more details. ++ Until that is resolved, the configuration (config.txt) needs to ++ explicitly set: arm_64bit=1. ++ ++ This option creates a build targeting the ARMv8/AArch64 ISA. ++ select BCM2838_64B ++ + endchoice + + config SYS_BOARD +@@ -145,5 +206,6 @@ config BCM283x_BASE + hex + default "0x20000000" if BCM2835 + default "0x3f000000" if BCM2836 || BCM2837 ++ default "0xfe000000" if BCM2838 + + endmenu + +From patchwork Wed Jul 24 14:39:07 2019 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Patchwork-Submitter: Andrei Gherzan +X-Patchwork-Id: 1136366 +X-Patchwork-Delegate: matthias.bgg@gmail.com +Return-Path: +X-Original-To: incoming@patchwork.ozlabs.org +Delivered-To: patchwork-incoming@bilbo.ozlabs.org +Authentication-Results: ozlabs.org; + spf=none (mailfrom) smtp.mailfrom=lists.denx.de + (client-ip=81.169.180.215; helo=lists.denx.de; + envelope-from=u-boot-bounces@lists.denx.de; + receiver=) +Authentication-Results: ozlabs.org; + dmarc=none (p=none dis=none) header.from=balena.io +Received: from lists.denx.de (dione.denx.de [81.169.180.215]) + by ozlabs.org (Postfix) with ESMTP id 45tyjX1rBvz9s3l + for ; + Thu, 25 Jul 2019 00:42:08 +1000 (AEST) +Received: by lists.denx.de (Postfix, from userid 105) + id F1D99C21CB6; Wed, 24 Jul 2019 14:40:11 +0000 (UTC) +X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de +X-Spam-Level: +X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2 + autolearn=unavailable autolearn_force=no version=3.4.0 +Received: from lists.denx.de (localhost [IPv6:::1]) + by lists.denx.de (Postfix) with ESMTP id 937A0C21D65; + Wed, 24 Jul 2019 14:39:51 +0000 (UTC) +Received: by lists.denx.de (Postfix, from userid 105) + id 748BCC21C2F; Wed, 24 Jul 2019 14:39:40 +0000 (UTC) +Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com + [209.85.128.68]) + by lists.denx.de (Postfix) with ESMTPS id CE175C21C29 + for ; Wed, 24 Jul 2019 14:39:37 +0000 (UTC) +Received: by mail-wm1-f68.google.com with SMTP id a15so42072601wmj.5 + for ; Wed, 24 Jul 2019 07:39:37 -0700 (PDT) +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=u/X0NAp+r55Bugx2HDgeaVfXBeYCSiyWcV7zL0w2yXE=; + b=meBOAW1SzAbuPxzp+nYt716FpccdfeH1Xh3xWr+zMzkGW0O6P+hkYAjOsYmnzj/5rX + WNazbP1wNvSVBowPChoHa1zwn2I8PhxW9EDSfNkECgfLCYdPettoGRQ94zsUSZAkp4dD + FJkwXFsPDQX4UoFpLxN7fhbkYqdcezpK7kv2ijiYnQR9z/RfadD4yVQHLYt+M6UsmWph + FjXmBWf8Dqj0HniyCpAFBQclBp2LF6Cf3teLv0SKjJfkyJnfnB2D26Sig1t5Z1JIRw8h + +2J1FXpChqug7KpnKuQNHWz1P/yhSY/b+dPHkLABO1yCQ9N5+IvUCw+KXXd8o3RtpwuS + UnjA== +X-Gm-Message-State: APjAAAULyjSTt+VemoBBXMausXImPmWbP6ymxMkyPmdzjRXNS/pvDSjw + SvFvIJXwqw2UxgfJbVQsZf3L04kE +X-Google-Smtp-Source: APXvYqwDVdWVyjv8DnkgBTqEwcrcxXXF1Xof6TjgZnG7RMtXzWC3l2a8f4Awp1bVLNcspHnduMBWqg== +X-Received: by 2002:a1c:a909:: with SMTP id s9mr74064408wme.20.1563979177108; + Wed, 24 Jul 2019 07:39:37 -0700 (PDT) +Received: from localhost.localdomain ([212.36.34.46]) + by smtp.gmail.com with ESMTPSA id + n14sm84860651wra.75.2019.07.24.07.39.36 + (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); + Wed, 24 Jul 2019 07:39:36 -0700 (PDT) +From: Andrei Gherzan +To: u-boot@lists.denx.de +Date: Wed, 24 Jul 2019 15:39:07 +0100 +Message-Id: <20190724143911.29770-5-andrei@balena.io> +X-Mailer: git-send-email 2.22.0 +In-Reply-To: <20190724143911.29770-1-andrei@balena.io> +References: <20190716133803.1174-1-andrei@gherzan.ro> + <20190724143911.29770-1-andrei@balena.io> +MIME-Version: 1.0 +Cc: mbrugger@suse.com, Andrei Gherzan +Subject: [U-Boot] [PATCH v2 4/8] RPI: Add entry for Raspberry Pi 4 model B +X-BeenThere: u-boot@lists.denx.de +X-Mailman-Version: 2.1.18 +Precedence: list +List-Id: U-Boot discussion +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +Content-Type: text/plain; charset="utf-8" +Errors-To: u-boot-bounces@lists.denx.de +Sender: "U-Boot" + +The Raspebrry Pi 4 uses the new revision code scheme as documented by +the foundation. This change adds an entry for this board as well. + +Signed-off-by: Andrei Gherzan +--- + board/raspberrypi/rpi/rpi.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c +index 617c892dde..6d6f1ef39a 100644 +--- a/board/raspberrypi/rpi/rpi.c ++++ b/board/raspberrypi/rpi/rpi.c +@@ -148,6 +148,11 @@ static const struct rpi_model rpi_models_new_scheme[] = { + DTB_DIR "bcm2837-rpi-cm3.dtb", + false, + }, ++ [0x11] = { ++ "4 Model B", ++ DTB_DIR "bcm2711-rpi-4-b.dtb", ++ true, ++ }, + }; + + static const struct rpi_model rpi_models_old_scheme[] = { + +From patchwork Wed Jul 24 14:39:08 2019 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Patchwork-Submitter: Andrei Gherzan +X-Patchwork-Id: 1136373 +X-Patchwork-Delegate: matthias.bgg@gmail.com +Return-Path: +X-Original-To: incoming@patchwork.ozlabs.org +Delivered-To: patchwork-incoming@bilbo.ozlabs.org +Authentication-Results: ozlabs.org; + spf=none (mailfrom) smtp.mailfrom=lists.denx.de + (client-ip=81.169.180.215; helo=lists.denx.de; + envelope-from=u-boot-bounces@lists.denx.de; + receiver=) +Authentication-Results: ozlabs.org; + dmarc=none (p=none dis=none) header.from=balena.io +Received: from lists.denx.de (dione.denx.de [81.169.180.215]) + by ozlabs.org (Postfix) with ESMTP id 45tyl91yqVz9s3l + for ; + Thu, 25 Jul 2019 00:43:33 +1000 (AEST) +Received: by lists.denx.de (Postfix, from userid 105) + id 0991BC21D74; Wed, 24 Jul 2019 14:40:59 +0000 (UTC) +X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de +X-Spam-Level: +X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=unavailable + autolearn_force=no version=3.4.0 +Received: from lists.denx.de (localhost [IPv6:::1]) + by lists.denx.de (Postfix) with ESMTP id 118D3C21D8E; + Wed, 24 Jul 2019 14:40:25 +0000 (UTC) +Received: by lists.denx.de (Postfix, from userid 105) + id 3020BC21DA2; Wed, 24 Jul 2019 14:39:40 +0000 (UTC) +Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com + [209.85.221.65]) + by lists.denx.de (Postfix) with ESMTPS id 9468EC21C4A + for ; Wed, 24 Jul 2019 14:39:38 +0000 (UTC) +Received: by mail-wr1-f65.google.com with SMTP id r1so47270575wrl.7 + for ; Wed, 24 Jul 2019 07:39:38 -0700 (PDT) +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=INTj2ZkmrgCvQnwXSkRkNgGGyv8wKd+4Dp1WiNdZg9A=; + b=Q12tNYAAjgCy4zkzIOEnY6VGsX14oy+bwAD75RZPvG/KwLZEgoIWaH67glrnxVMKCW + lnIUiim0jTu+lUQws/OaHw3Nl55HUaXoZMrKZ50vANqXzk0brozRNLBsZTBmFZGlyrP4 + 1ftizkEJMJr74KxyuZBbSHmN5gMxoEH/r6V8DZ1b8dH5RXr0J4hEuoeDiKT26fxfOpMk + dLXJd/Mx/4t6AVkcdVJIs3jdcw4neuiDThpHeLeNiuZgKEIOy7HHs+Zfz4iTRmu5IrHK + LwIYdSl6UeGnJNPE595PyB1HtUzUwEoUWuyzP062TGzGxfEvMjnFJ5bzm/dV9sOSNBtx + 308g== +X-Gm-Message-State: APjAAAUR5WDXsRNKCCMKSHatakaD4J0JzmZMzF3dOkiIj5/vqS01j3nF + 6aVr6nFQUuBmYJrMYEjaAwJqc6dm +X-Google-Smtp-Source: APXvYqwd9TOCUBNszoD7ZZhvAYwth50GqOLaqpKiC/HlGaXndFYzgPMhMhFr3nL9Gf6MfsBZ5Sho3Q== +X-Received: by 2002:adf:eb0f:: with SMTP id + s15mr12285481wrn.324.1563979177934; + Wed, 24 Jul 2019 07:39:37 -0700 (PDT) +Received: from localhost.localdomain ([212.36.34.46]) + by smtp.gmail.com with ESMTPSA id + n14sm84860651wra.75.2019.07.24.07.39.37 + (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); + Wed, 24 Jul 2019 07:39:37 -0700 (PDT) +From: Andrei Gherzan +To: u-boot@lists.denx.de +Date: Wed, 24 Jul 2019 15:39:08 +0100 +Message-Id: <20190724143911.29770-6-andrei@balena.io> +X-Mailer: git-send-email 2.22.0 +In-Reply-To: <20190724143911.29770-1-andrei@balena.io> +References: <20190716133803.1174-1-andrei@gherzan.ro> + <20190724143911.29770-1-andrei@balena.io> +MIME-Version: 1.0 +Cc: mbrugger@suse.com, Andrei Gherzan +Subject: [U-Boot] [PATCH v2 5/8] ARM: bcm283x: Include definition for + additional emmc clock +X-BeenThere: u-boot@lists.denx.de +X-Mailman-Version: 2.1.18 +Precedence: list +List-Id: U-Boot discussion +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +Content-Type: text/plain; charset="utf-8" +Errors-To: u-boot-bounces@lists.denx.de +Sender: "U-Boot" + +This clock has a different mbox ID so have this included in the relevant +header file. + +Signed-off-by: Andrei Gherzan +--- + arch/arm/mach-bcm283x/include/mach/mbox.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/arch/arm/mach-bcm283x/include/mach/mbox.h b/arch/arm/mach-bcm283x/include/mach/mbox.h +index e44c7577da..f2a98acddd 100644 +--- a/arch/arm/mach-bcm283x/include/mach/mbox.h ++++ b/arch/arm/mach-bcm283x/include/mach/mbox.h +@@ -230,6 +230,7 @@ struct bcm2835_mbox_tag_set_power_state { + #define BCM2835_MBOX_CLOCK_ID_SDRAM 8 + #define BCM2835_MBOX_CLOCK_ID_PIXEL 9 + #define BCM2835_MBOX_CLOCK_ID_PWM 10 ++#define BCM2835_MBOX_CLOCK_ID_EMMC2 12 + + struct bcm2835_mbox_tag_get_clock_rate { + struct bcm2835_mbox_tag_hdr tag_hdr; + +From patchwork Wed Jul 24 14:39:09 2019 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Patchwork-Submitter: Andrei Gherzan +X-Patchwork-Id: 1136365 +X-Patchwork-Delegate: matthias.bgg@gmail.com +Return-Path: +X-Original-To: incoming@patchwork.ozlabs.org +Delivered-To: patchwork-incoming@bilbo.ozlabs.org +Authentication-Results: ozlabs.org; + spf=none (mailfrom) smtp.mailfrom=lists.denx.de + (client-ip=81.169.180.215; helo=lists.denx.de; + envelope-from=u-boot-bounces@lists.denx.de; + receiver=) +Authentication-Results: ozlabs.org; + dmarc=none (p=none dis=none) header.from=balena.io +Received: from lists.denx.de (dione.denx.de [81.169.180.215]) + by ozlabs.org (Postfix) with ESMTP id 45tyjV5JXbz9sBF + for ; + Thu, 25 Jul 2019 00:42:06 +1000 (AEST) +Received: by lists.denx.de (Postfix, from userid 105) + id 77213C21C27; Wed, 24 Jul 2019 14:40:36 +0000 (UTC) +X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de +X-Spam-Level: +X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2 + autolearn=unavailable autolearn_force=no version=3.4.0 +Received: from lists.denx.de (localhost [IPv6:::1]) + by lists.denx.de (Postfix) with ESMTP id A24EDC21DB5; + Wed, 24 Jul 2019 14:40:00 +0000 (UTC) +Received: by lists.denx.de (Postfix, from userid 105) + id 4193AC21C2F; Wed, 24 Jul 2019 14:39:42 +0000 (UTC) +Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com + [209.85.221.68]) + by lists.denx.de (Postfix) with ESMTPS id AE825C21D4A + for ; Wed, 24 Jul 2019 14:39:39 +0000 (UTC) +Received: by mail-wr1-f68.google.com with SMTP id 31so47329072wrm.1 + for ; Wed, 24 Jul 2019 07:39:39 -0700 (PDT) +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=fpnN0uOMvR4DjRJfxVux4tdvICr5Rjygmvsk8TlIvnA=; + b=MQVZ2YY2EKhWHLLaavQarKM51ls7jOHZ7N8mWZpNRCJNQtRJfYkVDlHw5vbIV2dFXF + W6qAp6fnL+fb9/RHiw786uJCu/L1CZ95P9ksjyGYE62VQLWFE5OxDF2NGkoxZ0HGkqiw + cMAcpX5+Zn+/ZA6Q7OGOz1dZqASEH8mWaPI5TS1afkxMn5E14RKVHN6//bkvXwIpXL7d + 0M7zjoEQGuDlZK3PoRhxESbXrtznvm2PS2xiTdgtH5i9dJ24bbfjQulbBx9EMR++tB8O + e+SLxw9eT3N8XZwF0YD4XJRcFc8kwyiwhKFU2tuNJTC7pIkBSOeLxUUyJGsypxREq54n + 11GA== +X-Gm-Message-State: APjAAAXU6kbWgi4nhW5lhQR6pbZIhBdAkcKNmC1i59gWXdb8lL6dbHqL + Q2Ye3JGmLehlU2z4+7T/uXzHhO+V +X-Google-Smtp-Source: APXvYqyYzkP4kraoV8icuHlxBOcusLrizbOSQSILHq90ieWqGbICGdj7ZQRO5lX7n4DS1rr/nKThUQ== +X-Received: by 2002:adf:ea82:: with SMTP id s2mr82009745wrm.91.1563979179031; + Wed, 24 Jul 2019 07:39:39 -0700 (PDT) +Received: from localhost.localdomain ([212.36.34.46]) + by smtp.gmail.com with ESMTPSA id + n14sm84860651wra.75.2019.07.24.07.39.38 + (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); + Wed, 24 Jul 2019 07:39:38 -0700 (PDT) +From: Andrei Gherzan +To: u-boot@lists.denx.de +Date: Wed, 24 Jul 2019 15:39:09 +0100 +Message-Id: <20190724143911.29770-7-andrei@balena.io> +X-Mailer: git-send-email 2.22.0 +In-Reply-To: <20190724143911.29770-1-andrei@balena.io> +References: <20190716133803.1174-1-andrei@gherzan.ro> + <20190724143911.29770-1-andrei@balena.io> +MIME-Version: 1.0 +Cc: mbrugger@suse.com, Andrei Gherzan +Subject: [U-Boot] [PATCH v2 6/8] mmc: bcm283x: Add support for bcm2711 + device in bcm2835_sdhci +X-BeenThere: u-boot@lists.denx.de +X-Mailman-Version: 2.1.18 +Precedence: list +List-Id: U-Boot discussion +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +Content-Type: text/plain; charset="utf-8" +Errors-To: u-boot-bounces@lists.denx.de +Sender: "U-Boot" + +From: Matthias Brugger + +The bcm2711 has two emmc controllers. The difference is the clocks +they use. Add support for the second emmc controller. + +Signed-off-by: Matthias Brugger +Signed-off-by: Andrei Gherzan +--- + drivers/mmc/bcm2835_sdhci.c | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git a/drivers/mmc/bcm2835_sdhci.c b/drivers/mmc/bcm2835_sdhci.c +index 08bddd410e..e68dec3be7 100644 +--- a/drivers/mmc/bcm2835_sdhci.c ++++ b/drivers/mmc/bcm2835_sdhci.c +@@ -178,12 +178,13 @@ static int bcm2835_sdhci_probe(struct udevice *dev) + fdt_addr_t base; + int emmc_freq; + int ret; ++ int clock_id = (int)dev_get_driver_data(dev); + + base = devfdt_get_addr(dev); + if (base == FDT_ADDR_T_NONE) + return -EINVAL; + +- ret = bcm2835_get_mmc_clock(BCM2835_MBOX_CLOCK_ID_EMMC); ++ ret = bcm2835_get_mmc_clock(clock_id); + if (ret < 0) { + debug("%s: Failed to set MMC clock (err=%d)\n", __func__, ret); + return ret; +@@ -228,7 +229,14 @@ static int bcm2835_sdhci_probe(struct udevice *dev) + } + + static const struct udevice_id bcm2835_sdhci_match[] = { +- { .compatible = "brcm,bcm2835-sdhci" }, ++ { ++ .compatible = "brcm,bcm2835-sdhci", ++ .data = BCM2835_MBOX_CLOCK_ID_EMMC ++ }, ++ { ++ .compatible = "brcm,bcm2711-emmc2", ++ .data = BCM2835_MBOX_CLOCK_ID_EMMC2 ++ }, + { /* sentinel */ } + }; + + +From patchwork Wed Jul 24 14:39:10 2019 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Patchwork-Submitter: Andrei Gherzan +X-Patchwork-Id: 1136369 +X-Patchwork-Delegate: matthias.bgg@gmail.com +Return-Path: +X-Original-To: incoming@patchwork.ozlabs.org +Delivered-To: patchwork-incoming@bilbo.ozlabs.org +Authentication-Results: ozlabs.org; + spf=none (mailfrom) smtp.mailfrom=lists.denx.de + (client-ip=81.169.180.215; helo=lists.denx.de; + envelope-from=u-boot-bounces@lists.denx.de; + receiver=) +Authentication-Results: ozlabs.org; + dmarc=none (p=none dis=none) header.from=balena.io +Received: from lists.denx.de (dione.denx.de [81.169.180.215]) + by ozlabs.org (Postfix) with ESMTP id 45tyk04V3zz9s3l + for ; + Thu, 25 Jul 2019 00:42:32 +1000 (AEST) +Received: by lists.denx.de (Postfix, from userid 105) + id 47E81C21DD3; Wed, 24 Jul 2019 14:41:08 +0000 (UTC) +X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de +X-Spam-Level: +X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2 + autolearn=unavailable autolearn_force=no version=3.4.0 +Received: from lists.denx.de (localhost [IPv6:::1]) + by lists.denx.de (Postfix) with ESMTP id A7B62C21C93; + Wed, 24 Jul 2019 14:40:30 +0000 (UTC) +Received: by lists.denx.de (Postfix, from userid 105) + id 05EE7C21D65; Wed, 24 Jul 2019 14:39:43 +0000 (UTC) +Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com + [209.85.221.67]) + by lists.denx.de (Postfix) with ESMTPS id A0C53C21CB1 + for ; Wed, 24 Jul 2019 14:39:40 +0000 (UTC) +Received: by mail-wr1-f67.google.com with SMTP id p17so47250123wrf.11 + for ; Wed, 24 Jul 2019 07:39:40 -0700 (PDT) +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=vke+aeJLlm+hH0ZbApV2tQXwcQSNthXhQrHw3uTUjCY=; + b=fXeMysXcz5ZFzv+beEbqCcjHVfBZuIIVE7p40QdU2ckI7M3z1jdwMCXENGpwnVdMks + H+k4EDysfUSZmD9YGLyX+rFUMPgHEZm7DcxpQGDoT28zXRKo1I/5BQhEm5VHZYudmzLM + A9Juze34OYZ+qop/80ZSAARNy/grkz+9EL0hz+/cGoKbQM2vnYeK9IhqY1MT+Jnjaqeo + Avmh6DcXZN5MtJOGGt7TsXETUzeCZViAJDpgT+lIy8aFAABW4ZHBF6eZtgzd/aNn0dk7 + RJHyQlXxpKIeZGVzZz6kO+VFwHV++awYsZK1wzhqNDvAA0kGbkvgIWc1qOii+4j351tr + FmfA== +X-Gm-Message-State: APjAAAUddD7/P+xcAGZeEeanF39Kb1CjavSwOjql/I604nDwgzGThPdu + QltkJmJtpo31uSwBMKkalJwi1Xg3 +X-Google-Smtp-Source: APXvYqydROkNjRTwQxNzaMfPcjFShYCgunskcjaWkRPeJsf9HRFmaH/uThvtF9xRw5cFaHtr2ixI2w== +X-Received: by 2002:a5d:668e:: with SMTP id + l14mr31747640wru.156.1563979179920; + Wed, 24 Jul 2019 07:39:39 -0700 (PDT) +Received: from localhost.localdomain ([212.36.34.46]) + by smtp.gmail.com with ESMTPSA id + n14sm84860651wra.75.2019.07.24.07.39.39 + (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); + Wed, 24 Jul 2019 07:39:39 -0700 (PDT) +From: Andrei Gherzan +To: u-boot@lists.denx.de +Date: Wed, 24 Jul 2019 15:39:10 +0100 +Message-Id: <20190724143911.29770-8-andrei@balena.io> +X-Mailer: git-send-email 2.22.0 +In-Reply-To: <20190724143911.29770-1-andrei@balena.io> +References: <20190716133803.1174-1-andrei@gherzan.ro> + <20190724143911.29770-1-andrei@balena.io> +MIME-Version: 1.0 +Cc: mbrugger@suse.com, Andrei Gherzan +Subject: [U-Boot] [PATCH v2 7/8] RPI: Add memory map for bcm2838 +X-BeenThere: u-boot@lists.denx.de +X-Mailman-Version: 2.1.18 +Precedence: list +List-Id: U-Boot discussion +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +Content-Type: text/plain; charset="utf-8" +Errors-To: u-boot-bounces@lists.denx.de +Sender: "U-Boot" + +Define the memory map for the BCM2838 based on the dt configuration +available in the Raspberry Pi kernel fork. + +Signed-off-by: Andrei Gherzan +--- + board/raspberrypi/rpi/rpi.c | 27 ++++++++++++++++++++++++--- + 1 file changed, 24 insertions(+), 3 deletions(-) + +diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c +index 6d6f1ef39a..1c4fae9166 100644 +--- a/board/raspberrypi/rpi/rpi.c ++++ b/board/raspberrypi/rpi/rpi.c +@@ -249,7 +249,8 @@ static uint32_t rev_type; + static const struct rpi_model *model; + + #ifdef CONFIG_ARM64 +-static struct mm_region bcm2837_mem_map[] = { ++#ifndef CONFIG_BCM2838 ++static struct mm_region bcm283x_mem_map[] = { + { + .virt = 0x00000000UL, + .phys = 0x00000000UL, +@@ -268,8 +269,28 @@ static struct mm_region bcm2837_mem_map[] = { + 0, + } + }; +- +-struct mm_region *mem_map = bcm2837_mem_map; ++#else ++static struct mm_region bcm283x_mem_map[] = { ++ { ++ .virt = 0x00000000UL, ++ .phys = 0x00000000UL, ++ .size = 0xfe000000UL, ++ .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) | ++ PTE_BLOCK_INNER_SHARE ++ }, { ++ .virt = 0xfe000000UL, ++ .phys = 0xfe000000UL, ++ .size = 0x01800000UL, ++ .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | ++ PTE_BLOCK_NON_SHARE | ++ PTE_BLOCK_PXN | PTE_BLOCK_UXN ++ }, { ++ /* List terminator */ ++ 0, ++ } ++}; ++#endif ++struct mm_region *mem_map = bcm283x_mem_map; + #endif + + int dram_init(void) + +From patchwork Wed Jul 24 14:39:11 2019 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Patchwork-Submitter: Andrei Gherzan +X-Patchwork-Id: 1136370 +X-Patchwork-Delegate: matthias.bgg@gmail.com +Return-Path: +X-Original-To: incoming@patchwork.ozlabs.org +Delivered-To: patchwork-incoming@bilbo.ozlabs.org +Authentication-Results: ozlabs.org; + spf=none (mailfrom) smtp.mailfrom=lists.denx.de + (client-ip=81.169.180.215; helo=lists.denx.de; + envelope-from=u-boot-bounces@lists.denx.de; + receiver=) +Authentication-Results: ozlabs.org; + dmarc=none (p=none dis=none) header.from=balena.io +Received: from lists.denx.de (dione.denx.de [81.169.180.215]) + by ozlabs.org (Postfix) with ESMTP id 45tyk61mBqz9s3l + for ; + Thu, 25 Jul 2019 00:42:38 +1000 (AEST) +Received: by lists.denx.de (Postfix, from userid 105) + id EF268C21DA2; Wed, 24 Jul 2019 14:40:21 +0000 (UTC) +X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de +X-Spam-Level: +X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=unavailable + autolearn_force=no version=3.4.0 +Received: from lists.denx.de (localhost [IPv6:::1]) + by lists.denx.de (Postfix) with ESMTP id 18B41C21DDC; + Wed, 24 Jul 2019 14:39:52 +0000 (UTC) +Received: by lists.denx.de (Postfix, from userid 105) + id DD62DC21C2F; Wed, 24 Jul 2019 14:39:44 +0000 (UTC) +Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com + [209.85.128.66]) + by lists.denx.de (Postfix) with ESMTPS id 8735EC21DB3 + for ; Wed, 24 Jul 2019 14:39:41 +0000 (UTC) +Received: by mail-wm1-f66.google.com with SMTP id 207so42087264wma.1 + for ; Wed, 24 Jul 2019 07:39:41 -0700 (PDT) +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=Su0sVvS3yD62leuIKZb3pxg8i/NN5tZXXSx8RoqiHBw=; + b=d7yjVaKAs5z1TFruY3Dqyo5v+F+4E+6cfpsthOMt+m9MZeGD4gERwCAslKdO4akkyp + wWRBoQCMMMWzwpoRBvjczC5hM7xQ/pKqEZAJ9KP5gyzmlCmx+CznVjJGkVsbKE/9Mjz8 + 8fTflQbyCszmiwMdPOjMJnLHi5cbT1R0qbiwMeYPNkab9mmWczX7x6u9JfzS51kG3G3A + hD5QehF28N7XODXttdFd1kMGzEC+6xzJPdYrCcGCoGeOBkg3KiHS/dkB8sXp/tvwHQv/ + 4dPZmjtq5exSdZ0Mm2E5RsvISeMK6G8Iqv0PcUXUGYBQryXiw1DDve4wnDR1gw/YJNV0 + 07yQ== +X-Gm-Message-State: APjAAAVxgFnLbdj7oxAR7jyH5MO8StfPsSq/KejdOEq2tDuha3i9EwGn + dS6MsHWnNMhYVuzQdHZwaQ2aOYon +X-Google-Smtp-Source: APXvYqyVLBWemfnQgqJJ6fX0KGAaRRkuU+DwxqsmiT4cxbq4NFvAxBdWRSZ2PrRk7ZhY55qr3+jwcg== +X-Received: by 2002:a1c:a997:: with SMTP id + s145mr72938337wme.106.1563979180848; + Wed, 24 Jul 2019 07:39:40 -0700 (PDT) +Received: from localhost.localdomain ([212.36.34.46]) + by smtp.gmail.com with ESMTPSA id + n14sm84860651wra.75.2019.07.24.07.39.40 + (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); + Wed, 24 Jul 2019 07:39:40 -0700 (PDT) +From: Andrei Gherzan +To: u-boot@lists.denx.de +Date: Wed, 24 Jul 2019 15:39:11 +0100 +Message-Id: <20190724143911.29770-9-andrei@balena.io> +X-Mailer: git-send-email 2.22.0 +In-Reply-To: <20190724143911.29770-1-andrei@balena.io> +References: <20190716133803.1174-1-andrei@gherzan.ro> + <20190724143911.29770-1-andrei@balena.io> +MIME-Version: 1.0 +Cc: mbrugger@suse.com, Andrei Gherzan +Subject: [U-Boot] [PATCH v2 8/8] git-mailrc: Add rpi and bcm283x maintainer +X-BeenThere: u-boot@lists.denx.de +X-Mailman-Version: 2.1.18 +Precedence: list +List-Id: U-Boot discussion +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +Content-Type: text/plain; charset="utf-8" +Errors-To: u-boot-bounces@lists.denx.de +Sender: "U-Boot" + +Signed-off-by: Andrei Gherzan +Acked-by: Matthias Brugger +--- + doc/git-mailrc | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/doc/git-mailrc b/doc/git-mailrc +index a63b76befc..68110e1963 100644 +--- a/doc/git-mailrc ++++ b/doc/git-mailrc +@@ -35,6 +35,7 @@ alias mariosix Mario Six + alias masahiro Masahiro Yamada + alias mateusz Mateusz Kulikowski + alias maxime Maxime Ripard ++alias mbrugger Matthias Brugger + alias monstr Michal Simek + alias prom Minkyu Kang + alias ptomsich Philipp Tomsich +@@ -74,6 +75,9 @@ alias uniphier uboot, masahiro + alias zynq uboot, monstr + alias rockchip uboot, sjg, kevery, ptomsich + ++alias bcm283x uboot,mbrugger ++alias rpi uboot,mbrugger ++ + alias m68k uboot, alisonwang, angelo_ts + alias coldfire m68k + diff --git a/uboot-tools.spec b/uboot-tools.spec index faee16c..379c34f 100644 --- a/uboot-tools.spec +++ b/uboot-tools.spec @@ -27,6 +27,7 @@ Patch7: dragonboard-fixes.patch Patch8: ARM-tegra-Add-NVIDIA-Jetson-Nano.patch Patch9: arm-tegra-defaine-fdtfile-for-all-devices.patch Patch10: env-fix-build-error-for-envtools.patch +Patch11: Raspberry-Pi-32-64-support.patch BuildRequires: bc BuildRequires: dtc From ae1a05f516e15713e5973ff30c2c6229167e9083 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 27 Aug 2019 08:19:50 +0100 Subject: [PATCH 05/10] 2019.10 rc3 --- sources | 2 +- uboot-tools.spec | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sources b/sources index e52d8c7..a0d1eae 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (u-boot-2019.10-rc2.tar.bz2) = 5a9173a1bd945736c8e0c1797b4c8fdd9833fc4e04d6b0e562c2018884da9bc10c110231b690450fb2761e19cd19ab24fc8744000c901f416ba2936c8278799e +SHA512 (u-boot-2019.10-rc3.tar.bz2) = 598a6637fdbd62f30a3c4f73f0e89022c6c92b9ec93f4c4215547f54493ff17b2a0b127328ad6e1561e451b3cddca89f168f8adfe4cc59f8125fc70787d8cf4c diff --git a/uboot-tools.spec b/uboot-tools.spec index 379c34f..e192054 100644 --- a/uboot-tools.spec +++ b/uboot-tools.spec @@ -1,8 +1,8 @@ -%global candidate rc2 +%global candidate rc3 Name: uboot-tools Version: 2019.10 -Release: 0.2%{?candidate:.%{candidate}}%{?dist} +Release: 0.3%{?candidate:.%{candidate}}%{?dist} Summary: U-Boot utilities License: GPLv2+ BSD LGPL-2.1+ LGPL-2.0+ URL: http://www.denx.de/wiki/U-Boot @@ -48,7 +48,7 @@ BuildRequires: python2-libfdt BuildRequires: SDL-devel BuildRequires: swig %ifarch %{arm} aarch64 -#BuildRequires: vboot-utils +BuildRequires: vboot-utils %endif %ifarch aarch64 BuildRequires: arm-trusted-firmware-armv8 @@ -258,6 +258,9 @@ cp -p board/warp7/README builds/docs/README.warp7 %endif %changelog +* Tue Aug 27 2019 Peter Robinson 2019.10-0.3-rc3 +- 2019.10 RC3 + * Mon Aug 26 2019 Peter Robinson 2019.10-0.2-rc2 - Temporarily disable Chrome devices due to unexpected retirement of vboot-utils From 28ed29c8ec3cd2757c03c246481fd6bde023926f Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 27 Aug 2019 09:09:56 +0100 Subject: [PATCH 06/10] easylogo was dropped --- uboot-tools.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uboot-tools.spec b/uboot-tools.spec index e192054..cc13f9d 100644 --- a/uboot-tools.spec +++ b/uboot-tools.spec @@ -204,7 +204,7 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/ done %endif -for tool in bmp_logo dumpimage easylogo/easylogo env/fw_printenv fit_check_sign fit_info gdb/gdbcont gdb/gdbsend gen_eth_addr gen_ethaddr_crc img2srec mkenvimage mkimage mksunxiboot ncb proftool sunxi-spl-image-builder ubsha1 xway-swap-bytes +for tool in bmp_logo dumpimage env/fw_printenv fit_check_sign fit_info gdb/gdbcont gdb/gdbsend gen_eth_addr gen_ethaddr_crc img2srec mkenvimage mkimage mksunxiboot ncb proftool sunxi-spl-image-builder ubsha1 xway-swap-bytes do install -p -m 0755 builds/tools/$tool $RPM_BUILD_ROOT%{_bindir} done From 2984010404cdeec094ba941281ae9eb3bbafed30 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 27 Aug 2019 10:02:52 +0100 Subject: [PATCH 07/10] enable roc-rk3399-pc --- aarch64-boards | 1 + 1 file changed, 1 insertion(+) diff --git a/aarch64-boards b/aarch64-boards index f6a2000..7d8ae79 100644 --- a/aarch64-boards +++ b/aarch64-boards @@ -49,6 +49,7 @@ rock64-rk3328 rock960-rk3399 rock-pi-4-rk3399 rockpro64-rk3399 +roc-rk3399-pc rpi_3 rpi_4 sopine_baseboard From 5786b075f8aeea4902af99e73a0735840ed48052 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 27 Aug 2019 11:50:20 +0100 Subject: [PATCH 08/10] fennec-rk3288 was dropped --- arm-boards | 1 - 1 file changed, 1 deletion(-) diff --git a/arm-boards b/arm-boards index 76af0e2..0afa009 100644 --- a/arm-boards +++ b/arm-boards @@ -39,7 +39,6 @@ db-mv784mp-gp difrnce_dit4350 dserve_dsrv9703c evb-rk3229 -fennec-rk3288 firefly-rk3288 helios4 Hummingbird_A31 From 13e776d8d6714a4bc9df110e12885bf284977fef Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 11 Sep 2019 10:34:41 +0100 Subject: [PATCH 09/10] Minor fixes --- uboot-tools.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/uboot-tools.spec b/uboot-tools.spec index cc13f9d..37896e2 100644 --- a/uboot-tools.spec +++ b/uboot-tools.spec @@ -2,7 +2,7 @@ Name: uboot-tools Version: 2019.10 -Release: 0.3%{?candidate:.%{candidate}}%{?dist} +Release: 0.4%{?candidate:.%{candidate}}%{?dist} Summary: U-Boot utilities License: GPLv2+ BSD LGPL-2.1+ LGPL-2.0+ URL: http://www.denx.de/wiki/U-Boot @@ -44,7 +44,7 @@ BuildRequires: flex bison BuildRequires: openssl-devel BuildRequires: python2-devel BuildRequires: python2-setuptools -BuildRequires: python2-libfdt +#BuildRequires: python2-libfdt BuildRequires: SDL-devel BuildRequires: swig %ifarch %{arm} aarch64 @@ -258,6 +258,9 @@ cp -p board/warp7/README builds/docs/README.warp7 %endif %changelog +* Wed Sep 11 2019 Peter Robinson 2019.10-0.4-rc3 +- Minor fixes + * Tue Aug 27 2019 Peter Robinson 2019.10-0.3-rc3 - 2019.10 RC3 From 7f0a3a4eaa18a9246e4b70f2baf02c5dc18cccb1 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 23 Sep 2019 17:42:39 +0100 Subject: [PATCH 10/10] 2019.10 RC4 --- Raspberry-Pi-32-64-support.patch | 1155 ------------------------------ sources | 2 +- uboot-tools.spec | 8 +- 3 files changed, 6 insertions(+), 1159 deletions(-) delete mode 100644 Raspberry-Pi-32-64-support.patch diff --git a/Raspberry-Pi-32-64-support.patch b/Raspberry-Pi-32-64-support.patch deleted file mode 100644 index 38a094f..0000000 --- a/Raspberry-Pi-32-64-support.patch +++ /dev/null @@ -1,1155 +0,0 @@ -From patchwork Wed Jul 24 14:39:04 2019 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -X-Patchwork-Submitter: Andrei Gherzan -X-Patchwork-Id: 1136358 -X-Patchwork-Delegate: matthias.bgg@gmail.com -Return-Path: -X-Original-To: incoming@patchwork.ozlabs.org -Delivered-To: patchwork-incoming@bilbo.ozlabs.org -Authentication-Results: ozlabs.org; - spf=none (mailfrom) smtp.mailfrom=lists.denx.de - (client-ip=81.169.180.215; helo=lists.denx.de; - envelope-from=u-boot-bounces@lists.denx.de; - receiver=) -Authentication-Results: ozlabs.org; - dmarc=none (p=none dis=none) header.from=balena.io -Received: from lists.denx.de (dione.denx.de [81.169.180.215]) - by ozlabs.org (Postfix) with ESMTP id 45tyhH0gbgz9s8m - for ; - Thu, 25 Jul 2019 00:41:03 +1000 (AEST) -Received: by lists.denx.de (Postfix, from userid 105) - id 92844C21D9A; Wed, 24 Jul 2019 14:39:46 +0000 (UTC) -X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de -X-Spam-Level: -X-Spam-Status: No, score=0.8 required=5.0 tests=UPPERCASE_50_75 autolearn=no - autolearn_force=no version=3.4.0 -Received: from lists.denx.de (localhost [IPv6:::1]) - by lists.denx.de (Postfix) with ESMTP id 882B5C21D72; - Wed, 24 Jul 2019 14:39:40 +0000 (UTC) -Received: by lists.denx.de (Postfix, from userid 105) - id 7C7EBC21C27; Wed, 24 Jul 2019 14:39:35 +0000 (UTC) -Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com - [209.85.221.65]) - by lists.denx.de (Postfix) with ESMTPS id 2B1D6C21BE5 - for ; Wed, 24 Jul 2019 14:39:35 +0000 (UTC) -Received: by mail-wr1-f65.google.com with SMTP id x1so32293472wrr.9 - for ; Wed, 24 Jul 2019 07:39:35 -0700 (PDT) -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=8Z82pQdbffuUA8JpsYMwwHCjbZBONEoOwfFh2hjslOs=; - b=rJPUcmpkh37qDajtL1440DjXD+gxop4QeK685/B+RpJIrTVrBVPe9Z8ahOzM4t6MfA - R9KYo3KoDOOvp0dm6Ovih0rgEVLjUL9K+/tzqQi9Y3YbflK/VRA7WUuzKWq7o/732qqh - CLtDHeYCaaAepsl6TzeXSndNd74QoJJFlMtFUf2kDHV3ERIqIDvRd2LI1144GMTFOBjj - gkZr28fm0BVQPbHVN9p7mZ4vXcKUf2I2Wkje7P6EN6IJTrIcKZvcT2IpnzvsEdbPJ14r - 1JkPI3Bg7pf7iTVAcHDhZ0HWOxnuRuB3KzmC0WkOgYIWpjgUGdNCIys1VHusa8JGUmtz - X/OQ== -X-Gm-Message-State: APjAAAV4zaznNtIjQJuMF7dLBX4DR9QvnvmUcRzNftXStiuRuXXWnXS1 - MP7oLCr936klnQUkQAkOlyr/cP0s -X-Google-Smtp-Source: APXvYqxJiPSQ9vd5GlT71/+cluS1CRb303VcbpLDq5FS1UdhoChDRrXDGMI6wz5akinycJIMwNQZrg== -X-Received: by 2002:adf:f3d1:: with SMTP id g17mr58097903wrp.38.1563979174441; - Wed, 24 Jul 2019 07:39:34 -0700 (PDT) -Received: from localhost.localdomain ([212.36.34.46]) - by smtp.gmail.com with ESMTPSA id - n14sm84860651wra.75.2019.07.24.07.39.33 - (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); - Wed, 24 Jul 2019 07:39:34 -0700 (PDT) -From: Andrei Gherzan -To: u-boot@lists.denx.de -Date: Wed, 24 Jul 2019 15:39:04 +0100 -Message-Id: <20190724143911.29770-2-andrei@balena.io> -X-Mailer: git-send-email 2.22.0 -In-Reply-To: <20190724143911.29770-1-andrei@balena.io> -References: <20190716133803.1174-1-andrei@gherzan.ro> - <20190724143911.29770-1-andrei@balena.io> -MIME-Version: 1.0 -Cc: mbrugger@suse.com, Andrei Gherzan -Subject: [U-Boot] [PATCH v2 1/8] RPI: Add defconfigs for rpi4 (32/64) -X-BeenThere: u-boot@lists.denx.de -X-Mailman-Version: 2.1.18 -Precedence: list -List-Id: U-Boot discussion -List-Unsubscribe: , - -List-Archive: -List-Post: -List-Help: -List-Subscribe: , - -Content-Type: text/plain; charset="utf-8" -Errors-To: u-boot-bounces@lists.denx.de -Sender: "U-Boot" - -This defines a minimum defconfig for each of the two Raspberry Pi 4 -variants. One notable difference is that we don't have a embedded dt for -this board given that the fw supplies us with one which we can reuse. -Furthermore, the ram size is not queryable through mbox interface as the -maximum reported size is 1G. The fw patches the dt with the right -memory configuration and uboot uses it as it is. We avoid u-boot -touching this configuration by making sure CONFIG_ARCH_FIXUP_FDT_MEMORY -is deactivated. - -Signed-off-by: Andrei Gherzan ---- - configs/rpi_4_32b_defconfig | 33 +++++++++++++++++++++++++++++++++ - configs/rpi_4_defconfig | 33 +++++++++++++++++++++++++++++++++ - 2 files changed, 66 insertions(+) - create mode 100644 configs/rpi_4_32b_defconfig - create mode 100644 configs/rpi_4_defconfig - -diff --git a/configs/rpi_4_32b_defconfig b/configs/rpi_4_32b_defconfig -new file mode 100644 -index 0000000000..a31a617a5f ---- /dev/null -+++ b/configs/rpi_4_32b_defconfig -@@ -0,0 +1,33 @@ -+CONFIG_ARM=y -+CONFIG_ARCH_BCM283X=y -+CONFIG_SYS_TEXT_BASE=0x00008000 -+CONFIG_TARGET_RPI_4_32B=y -+CONFIG_SYS_MALLOC_F_LEN=0x2000 -+CONFIG_DISTRO_DEFAULTS=y -+CONFIG_NR_DRAM_BANKS=1 -+# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set -+CONFIG_OF_BOARD=y -+CONFIG_OF_BOARD_SETUP=y -+CONFIG_MISC_INIT_R=y -+# CONFIG_DISPLAY_CPUINFO is not set -+# CONFIG_DISPLAY_BOARDINFO is not set -+CONFIG_SYS_PROMPT="U-Boot> " -+# CONFIG_CMD_FLASH is not set -+CONFIG_CMD_GPIO=y -+CONFIG_CMD_MMC=y -+CONFIG_CMD_FS_UUID=y -+CONFIG_ENV_FAT_INTERFACE="mmc" -+CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" -+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y -+CONFIG_DM_KEYBOARD=y -+CONFIG_DM_MMC=y -+CONFIG_MMC_SDHCI=y -+CONFIG_MMC_SDHCI_BCM2835=y -+CONFIG_PINCTRL=y -+# CONFIG_PINCTRL_GENERIC is not set -+# CONFIG_REQUIRE_SERIAL_CONSOLE is not set -+CONFIG_DM_VIDEO=y -+CONFIG_SYS_WHITE_ON_BLACK=y -+CONFIG_CONSOLE_SCROLL_LINES=10 -+CONFIG_PHYS_TO_BUS=y -+CONFIG_OF_LIBFDT_OVERLAY=y -diff --git a/configs/rpi_4_defconfig b/configs/rpi_4_defconfig -new file mode 100644 -index 0000000000..da8c960a2a ---- /dev/null -+++ b/configs/rpi_4_defconfig -@@ -0,0 +1,33 @@ -+CONFIG_ARM=y -+CONFIG_ARCH_BCM283X=y -+CONFIG_SYS_TEXT_BASE=0x00080000 -+CONFIG_TARGET_RPI_4=y -+CONFIG_SYS_MALLOC_F_LEN=0x2000 -+CONFIG_DISTRO_DEFAULTS=y -+CONFIG_NR_DRAM_BANKS=1 -+# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set -+CONFIG_OF_BOARD=y -+CONFIG_OF_BOARD_SETUP=y -+CONFIG_MISC_INIT_R=y -+# CONFIG_DISPLAY_CPUINFO is not set -+# CONFIG_DISPLAY_BOARDINFO is not set -+CONFIG_SYS_PROMPT="U-Boot> " -+# CONFIG_CMD_FLASH is not set -+CONFIG_CMD_GPIO=y -+CONFIG_CMD_MMC=y -+CONFIG_CMD_FS_UUID=y -+CONFIG_ENV_FAT_INTERFACE="mmc" -+CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" -+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y -+CONFIG_DM_KEYBOARD=y -+CONFIG_DM_MMC=y -+CONFIG_MMC_SDHCI=y -+CONFIG_MMC_SDHCI_BCM2835=y -+CONFIG_PINCTRL=y -+# CONFIG_PINCTRL_GENERIC is not set -+# CONFIG_REQUIRE_SERIAL_CONSOLE is not set -+CONFIG_DM_VIDEO=y -+CONFIG_SYS_WHITE_ON_BLACK=y -+CONFIG_CONSOLE_SCROLL_LINES=10 -+CONFIG_PHYS_TO_BUS=y -+CONFIG_OF_LIBFDT_OVERLAY=y - -From patchwork Wed Jul 24 14:39:05 2019 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -X-Patchwork-Submitter: Andrei Gherzan -X-Patchwork-Id: 1136357 -X-Patchwork-Delegate: matthias.bgg@gmail.com -Return-Path: -X-Original-To: incoming@patchwork.ozlabs.org -Delivered-To: patchwork-incoming@bilbo.ozlabs.org -Authentication-Results: ozlabs.org; - spf=none (mailfrom) smtp.mailfrom=lists.denx.de - (client-ip=81.169.180.215; helo=lists.denx.de; - envelope-from=u-boot-bounces@lists.denx.de; - receiver=) -Authentication-Results: ozlabs.org; - dmarc=none (p=none dis=none) header.from=balena.io -Received: from lists.denx.de (dione.denx.de [81.169.180.215]) - by ozlabs.org (Postfix) with ESMTP id 45tygm6ldWz9s3l - for ; - Thu, 25 Jul 2019 00:40:36 +1000 (AEST) -Received: by lists.denx.de (Postfix, from userid 105) - id 9DA33C21CB6; Wed, 24 Jul 2019 14:39:59 +0000 (UTC) -X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de -X-Spam-Level: -X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2 - autolearn=unavailable autolearn_force=no version=3.4.0 -Received: from lists.denx.de (localhost [IPv6:::1]) - by lists.denx.de (Postfix) with ESMTP id 17CAEC21D8E; - Wed, 24 Jul 2019 14:39:47 +0000 (UTC) -Received: by lists.denx.de (Postfix, from userid 105) - id 82DD4C21CB6; Wed, 24 Jul 2019 14:39:36 +0000 (UTC) -Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com - [209.85.221.67]) - by lists.denx.de (Postfix) with ESMTPS id 01AFFC21BE5 - for ; Wed, 24 Jul 2019 14:39:36 +0000 (UTC) -Received: by mail-wr1-f67.google.com with SMTP id 31so47328827wrm.1 - for ; Wed, 24 Jul 2019 07:39:36 -0700 (PDT) -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=SBRknuqaA8nrsEqGUKyxns0jOTIIj2fE4uzSYMyIGew=; - b=PM1drqcqaap81ZOvnmAJY7X232GJ1xovWSwf0Gfii33S1JHlV0lXbcT6pHy/MY5C1Y - GVqDd9jEF6nKvHAGx2xHd2df1KTAaYpuxqmmo89okoq1FQ80/gwzWj+AZJ/AsoZHiR0W - Jo/QZmK8NjcG9xVEPkdvq2kYg7V7FGrTQgKFCn8y4tSk6rdFXH6x71luCFr9GTiHqmes - XE5UGqaitR84yV9d5U4NL8pNnZbhtyxT8YYgkRyRbtOTwYi44C0XYsVwHP4G8DSjMjeE - 5jdjVUB8rmMki3Bqtj5aGkS0F+k/RvLiQPKbkssavqHl24M4ohWNlZ4fI9VXzg+4DJjZ - aT7g== -X-Gm-Message-State: APjAAAXvh2LHWYIbEeX1TSDzEtnms+hdW6mVhDH8RRCsABLlzzPSCiUf - 8um70SOfA7+T6IFVzjiHE/2q21x6 -X-Google-Smtp-Source: APXvYqzpQ+14M+bTmm58qDfrEm+q5psg5hqSSHCmXarzdL9SPFCPF5TlXBFq2NrJt8Zn5k7Cm+vgzQ== -X-Received: by 2002:adf:e444:: with SMTP id t4mr83713613wrm.262.1563979175247; - Wed, 24 Jul 2019 07:39:35 -0700 (PDT) -Received: from localhost.localdomain ([212.36.34.46]) - by smtp.gmail.com with ESMTPSA id - n14sm84860651wra.75.2019.07.24.07.39.34 - (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); - Wed, 24 Jul 2019 07:39:34 -0700 (PDT) -From: Andrei Gherzan -To: u-boot@lists.denx.de -Date: Wed, 24 Jul 2019 15:39:05 +0100 -Message-Id: <20190724143911.29770-3-andrei@balena.io> -X-Mailer: git-send-email 2.22.0 -In-Reply-To: <20190724143911.29770-1-andrei@balena.io> -References: <20190716133803.1174-1-andrei@gherzan.ro> - <20190724143911.29770-1-andrei@balena.io> -MIME-Version: 1.0 -Cc: mbrugger@suse.com, Andrei Gherzan -Subject: [U-Boot] [PATCH v2 2/8] ARM: bcm283x: Add BCM283x_BASE define -X-BeenThere: u-boot@lists.denx.de -X-Mailman-Version: 2.1.18 -Precedence: list -List-Id: U-Boot discussion -List-Unsubscribe: , - -List-Archive: -List-Post: -List-Help: -List-Subscribe: , - -Content-Type: text/plain; charset="utf-8" -Errors-To: u-boot-bounces@lists.denx.de -Sender: "U-Boot" - -From: Matthias Brugger - -Devices of bcm283x have different base address, depending if they are on -bcm2835 or bcm2836/7. Use BCM283x_BASE depending on the SoC you want to -build and only add the offset in the header files. - -Signed-off-by: Matthias Brugger -Signed-off-by: Andrei Gherzan ---- - arch/arm/mach-bcm283x/Kconfig | 5 +++++ - arch/arm/mach-bcm283x/include/mach/mbox.h | 6 +----- - arch/arm/mach-bcm283x/include/mach/sdhci.h | 6 +----- - arch/arm/mach-bcm283x/include/mach/timer.h | 6 +----- - arch/arm/mach-bcm283x/include/mach/wdog.h | 6 +----- - 5 files changed, 9 insertions(+), 20 deletions(-) - -diff --git a/arch/arm/mach-bcm283x/Kconfig b/arch/arm/mach-bcm283x/Kconfig -index 3eb5a9a897..8e69914a83 100644 ---- a/arch/arm/mach-bcm283x/Kconfig -+++ b/arch/arm/mach-bcm283x/Kconfig -@@ -141,4 +141,9 @@ config SYS_SOC - config SYS_CONFIG_NAME - default "rpi" - -+config BCM283x_BASE -+ hex -+ default "0x20000000" if BCM2835 -+ default "0x3f000000" if BCM2836 || BCM2837 -+ - endmenu -diff --git a/arch/arm/mach-bcm283x/include/mach/mbox.h b/arch/arm/mach-bcm283x/include/mach/mbox.h -index e3a893e49c..e44c7577da 100644 ---- a/arch/arm/mach-bcm283x/include/mach/mbox.h -+++ b/arch/arm/mach-bcm283x/include/mach/mbox.h -@@ -37,11 +37,7 @@ - - /* Raw mailbox HW */ - --#ifndef CONFIG_BCM2835 --#define BCM2835_MBOX_PHYSADDR 0x3f00b880 --#else --#define BCM2835_MBOX_PHYSADDR 0x2000b880 --#endif -+#define BCM2835_MBOX_PHYSADDR (CONFIG_BCM283x_BASE + 0x0000b880) - - struct bcm2835_mbox_regs { - u32 read; -diff --git a/arch/arm/mach-bcm283x/include/mach/sdhci.h b/arch/arm/mach-bcm283x/include/mach/sdhci.h -index 5cb6ec3340..b443c379d8 100644 ---- a/arch/arm/mach-bcm283x/include/mach/sdhci.h -+++ b/arch/arm/mach-bcm283x/include/mach/sdhci.h -@@ -6,11 +6,7 @@ - #ifndef _BCM2835_SDHCI_H_ - #define _BCM2835_SDHCI_H_ - --#ifndef CONFIG_BCM2835 --#define BCM2835_SDHCI_BASE 0x3f300000 --#else --#define BCM2835_SDHCI_BASE 0x20300000 --#endif -+#define BCM2835_SDHCI_BASE (CONFIG_BCM283x_BASE + 0x00300000) - - int bcm2835_sdhci_init(u32 regbase, u32 emmc_freq); - -diff --git a/arch/arm/mach-bcm283x/include/mach/timer.h b/arch/arm/mach-bcm283x/include/mach/timer.h -index 56b0c356bb..014355e759 100644 ---- a/arch/arm/mach-bcm283x/include/mach/timer.h -+++ b/arch/arm/mach-bcm283x/include/mach/timer.h -@@ -6,11 +6,7 @@ - #ifndef _BCM2835_TIMER_H - #define _BCM2835_TIMER_H - --#ifndef CONFIG_BCM2835 --#define BCM2835_TIMER_PHYSADDR 0x3f003000 --#else --#define BCM2835_TIMER_PHYSADDR 0x20003000 --#endif -+#define BCM2835_TIMER_PHYSADDR (CONFIG_BCM283x_BASE + 0x00003000) - - #define BCM2835_TIMER_CS_M3 (1 << 3) - #define BCM2835_TIMER_CS_M2 (1 << 2) -diff --git a/arch/arm/mach-bcm283x/include/mach/wdog.h b/arch/arm/mach-bcm283x/include/mach/wdog.h -index 99c88e5df7..8292b3cf1f 100644 ---- a/arch/arm/mach-bcm283x/include/mach/wdog.h -+++ b/arch/arm/mach-bcm283x/include/mach/wdog.h -@@ -6,11 +6,7 @@ - #ifndef _BCM2835_WDOG_H - #define _BCM2835_WDOG_H - --#ifndef CONFIG_BCM2835 --#define BCM2835_WDOG_PHYSADDR 0x3f100000 --#else --#define BCM2835_WDOG_PHYSADDR 0x20100000 --#endif -+#define BCM2835_WDOG_PHYSADDR (CONFIG_BCM283x_BASE + 0x00100000) - - struct bcm2835_wdog_regs { - u32 unknown0[7]; - -From patchwork Wed Jul 24 14:39:06 2019 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -X-Patchwork-Submitter: Andrei Gherzan -X-Patchwork-Id: 1136372 -X-Patchwork-Delegate: matthias.bgg@gmail.com -Return-Path: -X-Original-To: incoming@patchwork.ozlabs.org -Delivered-To: patchwork-incoming@bilbo.ozlabs.org -Authentication-Results: ozlabs.org; - spf=none (mailfrom) smtp.mailfrom=lists.denx.de - (client-ip=81.169.180.215; helo=lists.denx.de; - envelope-from=u-boot-bounces@lists.denx.de; - receiver=) -Authentication-Results: ozlabs.org; - dmarc=none (p=none dis=none) header.from=balena.io -Received: from lists.denx.de (dione.denx.de [81.169.180.215]) - by ozlabs.org (Postfix) with ESMTP id 45tyl70FC2z9s3l - for ; - Thu, 25 Jul 2019 00:43:30 +1000 (AEST) -Received: by lists.denx.de (Postfix, from userid 105) - id A8034C21DF3; Wed, 24 Jul 2019 14:40:46 +0000 (UTC) -X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de -X-Spam-Level: -X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2 - autolearn=unavailable autolearn_force=no version=3.4.0 -Received: from lists.denx.de (localhost [IPv6:::1]) - by lists.denx.de (Postfix) with ESMTP id 4C777C21DCA; - Wed, 24 Jul 2019 14:40:10 +0000 (UTC) -Received: by lists.denx.de (Postfix, from userid 105) - id 474FDC21D74; Wed, 24 Jul 2019 14:39:39 +0000 (UTC) -Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com - [209.85.128.68]) - by lists.denx.de (Postfix) with ESMTPS id 55C9DC21D4A - for ; Wed, 24 Jul 2019 14:39:37 +0000 (UTC) -Received: by mail-wm1-f68.google.com with SMTP id s15so20507009wmj.3 - for ; Wed, 24 Jul 2019 07:39:37 -0700 (PDT) -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=pWvZ588J48xOgvZOVW9fhkWibsiRtNBVuM4VBynrLQw=; - b=Am1Me0M/J3HedD2FzOBBvEpBhsNfG5psGW0Lap+uSDun9LynEo+RqAgmLAAp3KtUFD - vUkieSMQZAjAIyzy8ySvUjuVA8iEUPN8wbo55HZ+3X5HfhgsbMwu70KZDA9UBw1T4v6V - CE1pyL9enGgcwdDiTcXztZo57iM/vq1B6HilY8J27ZJFb9fJNH4L7IxE4O/febLJ4ljc - micbK/014Ibg6DqlmHbBh4akENSDlXOrQLqMC8FdK0lsJIP7EH9Xqc6MubvgCzyhvS89 - xPFsmuRVAZVvpnQ6+mcSidfeiyYCMXh2IE8wgKExlyysSAjkZPC8Z+1H2qOnvOz+XEjX - GVrg== -X-Gm-Message-State: APjAAAVcUgx+4UkyQKJDr3/tCu0zV2vBZk5reX2ukIrxHlkjQSBTYuSa - Napy/FHrIjVsWObEdv0xTsrwwqT8 -X-Google-Smtp-Source: APXvYqz1dOMBUWbTH/jK138AvmFcmCjdMc9s6oLE6NbSPeUiM4M0S3istSFU+IBlBRGqC2zlitzAQg== -X-Received: by 2002:a7b:cc86:: with SMTP id p6mr69114900wma.123.1563979176511; - Wed, 24 Jul 2019 07:39:36 -0700 (PDT) -Received: from localhost.localdomain ([212.36.34.46]) - by smtp.gmail.com with ESMTPSA id - n14sm84860651wra.75.2019.07.24.07.39.35 - (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); - Wed, 24 Jul 2019 07:39:35 -0700 (PDT) -From: Andrei Gherzan -To: u-boot@lists.denx.de -Date: Wed, 24 Jul 2019 15:39:06 +0100 -Message-Id: <20190724143911.29770-4-andrei@balena.io> -X-Mailer: git-send-email 2.22.0 -In-Reply-To: <20190724143911.29770-1-andrei@balena.io> -References: <20190716133803.1174-1-andrei@gherzan.ro> - <20190724143911.29770-1-andrei@balena.io> -MIME-Version: 1.0 -Cc: mbrugger@suse.com, Andrei Gherzan -Subject: [U-Boot] [PATCH v2 3/8] ARM: bcm283x: Define configs for RaspberryPi 4 -X-BeenThere: u-boot@lists.denx.de -X-Mailman-Version: 2.1.18 -Precedence: list -List-Id: U-Boot discussion -List-Unsubscribe: , - -List-Archive: -List-Post: -List-Help: -List-Subscribe: , - -Content-Type: text/plain; charset="utf-8" -Errors-To: u-boot-bounces@lists.denx.de -Sender: "U-Boot" - -Define two target configs for Raspberry Pi 4 (32 and 64bit) and the -corresponding BCM2838* configs. - -Be aware of the current limitation in firmware which requires an -explicit configuration to force the arm in 64bit mode when the -respective target is used. - -Signed-off-by: Andrei Gherzan -Signed-off-by: Matthias Brugger ---- - arch/arm/mach-bcm283x/Kconfig | 62 +++++++++++++++++++++++++++++++++++ - 1 file changed, 62 insertions(+) - -diff --git a/arch/arm/mach-bcm283x/Kconfig b/arch/arm/mach-bcm283x/Kconfig -index 8e69914a83..09a5b42bbb 100644 ---- a/arch/arm/mach-bcm283x/Kconfig -+++ b/arch/arm/mach-bcm283x/Kconfig -@@ -26,6 +26,23 @@ config BCM2837_64B - select BCM2837 - select ARM64 - -+config BCM2838 -+ bool "Broadcom BCM2838 SoC support" -+ depends on ARCH_BCM283X -+ -+config BCM2838_32B -+ bool "Broadcom BCM2838 SoC 32-bit support" -+ depends on ARCH_BCM283X -+ select BCM2838 -+ select ARMV7_LPAE -+ select CPU_V7A -+ -+config BCM2838_64B -+ bool "Broadcom BCM2838 SoC 64-bit support" -+ depends on ARCH_BCM283X -+ select BCM2838 -+ select ARM64 -+ - menu "Broadcom BCM283X family" - depends on ARCH_BCM283X - -@@ -127,6 +144,50 @@ config TARGET_RPI_3 - This option creates a build targeting the ARMv8/AArch64 ISA. - select BCM2837_64B - -+config TARGET_RPI_4_32B -+ bool "Raspberry Pi 4 32-bit build" -+ help -+ Support for all BCM2838-based Raspberry Pi variants, such as -+ the RPi 4 model B, in AArch32 (32-bit) mode. -+ -+ This option assumes the VideoCore firmware is configured to use the -+ mini UART (rather than PL011) for the serial console. This is the -+ default on the RPi 4. To enable the UART console, the following non- -+ default option must be present in config.txt: enable_uart=1. This is -+ required for U-Boot to operate correctly, even if you only care -+ about the HDMI/usbkbd console. -+ -+ Due to hardware incompatibilities, this can't be used with -+ BCM283/5/6/7. -+ -+ This option creates a build targeting the ARMv7/AArch32 ISA. -+ select BCM2838_32B -+ -+config TARGET_RPI_4 -+ bool "Raspberry Pi 4 64-bit build" -+ help -+ Support for all BCM2838-based Raspberry Pi variants, such as -+ the RPi 4 model B, in AArch64 (64-bit) mode. -+ -+ This option assumes the VideoCore firmware is configured to use the -+ mini UART (rather than PL011) for the serial console. This is the -+ default on the RPi 4. To enable the UART console, the following non- -+ default option must be present in config.txt: enable_uart=1. This is -+ required for U-Boot to operate correctly, even if you only care -+ about the HDMI/usbkbd console. -+ -+ Due to hardware incompatibilities, this can't be used with -+ BCM283/5/6/7. -+ -+ Also, due to a bug in firmware, switching to 64bit mode doesn't -+ happen automatically based on the kernel's image filename. See -+ https://github.com/raspberrypi/firmware/issues/1193 for more details. -+ Until that is resolved, the configuration (config.txt) needs to -+ explicitly set: arm_64bit=1. -+ -+ This option creates a build targeting the ARMv8/AArch64 ISA. -+ select BCM2838_64B -+ - endchoice - - config SYS_BOARD -@@ -145,5 +206,6 @@ config BCM283x_BASE - hex - default "0x20000000" if BCM2835 - default "0x3f000000" if BCM2836 || BCM2837 -+ default "0xfe000000" if BCM2838 - - endmenu - -From patchwork Wed Jul 24 14:39:07 2019 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -X-Patchwork-Submitter: Andrei Gherzan -X-Patchwork-Id: 1136366 -X-Patchwork-Delegate: matthias.bgg@gmail.com -Return-Path: -X-Original-To: incoming@patchwork.ozlabs.org -Delivered-To: patchwork-incoming@bilbo.ozlabs.org -Authentication-Results: ozlabs.org; - spf=none (mailfrom) smtp.mailfrom=lists.denx.de - (client-ip=81.169.180.215; helo=lists.denx.de; - envelope-from=u-boot-bounces@lists.denx.de; - receiver=) -Authentication-Results: ozlabs.org; - dmarc=none (p=none dis=none) header.from=balena.io -Received: from lists.denx.de (dione.denx.de [81.169.180.215]) - by ozlabs.org (Postfix) with ESMTP id 45tyjX1rBvz9s3l - for ; - Thu, 25 Jul 2019 00:42:08 +1000 (AEST) -Received: by lists.denx.de (Postfix, from userid 105) - id F1D99C21CB6; Wed, 24 Jul 2019 14:40:11 +0000 (UTC) -X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de -X-Spam-Level: -X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2 - autolearn=unavailable autolearn_force=no version=3.4.0 -Received: from lists.denx.de (localhost [IPv6:::1]) - by lists.denx.de (Postfix) with ESMTP id 937A0C21D65; - Wed, 24 Jul 2019 14:39:51 +0000 (UTC) -Received: by lists.denx.de (Postfix, from userid 105) - id 748BCC21C2F; Wed, 24 Jul 2019 14:39:40 +0000 (UTC) -Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com - [209.85.128.68]) - by lists.denx.de (Postfix) with ESMTPS id CE175C21C29 - for ; Wed, 24 Jul 2019 14:39:37 +0000 (UTC) -Received: by mail-wm1-f68.google.com with SMTP id a15so42072601wmj.5 - for ; Wed, 24 Jul 2019 07:39:37 -0700 (PDT) -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=u/X0NAp+r55Bugx2HDgeaVfXBeYCSiyWcV7zL0w2yXE=; - b=meBOAW1SzAbuPxzp+nYt716FpccdfeH1Xh3xWr+zMzkGW0O6P+hkYAjOsYmnzj/5rX - WNazbP1wNvSVBowPChoHa1zwn2I8PhxW9EDSfNkECgfLCYdPettoGRQ94zsUSZAkp4dD - FJkwXFsPDQX4UoFpLxN7fhbkYqdcezpK7kv2ijiYnQR9z/RfadD4yVQHLYt+M6UsmWph - FjXmBWf8Dqj0HniyCpAFBQclBp2LF6Cf3teLv0SKjJfkyJnfnB2D26Sig1t5Z1JIRw8h - +2J1FXpChqug7KpnKuQNHWz1P/yhSY/b+dPHkLABO1yCQ9N5+IvUCw+KXXd8o3RtpwuS - UnjA== -X-Gm-Message-State: APjAAAULyjSTt+VemoBBXMausXImPmWbP6ymxMkyPmdzjRXNS/pvDSjw - SvFvIJXwqw2UxgfJbVQsZf3L04kE -X-Google-Smtp-Source: APXvYqwDVdWVyjv8DnkgBTqEwcrcxXXF1Xof6TjgZnG7RMtXzWC3l2a8f4Awp1bVLNcspHnduMBWqg== -X-Received: by 2002:a1c:a909:: with SMTP id s9mr74064408wme.20.1563979177108; - Wed, 24 Jul 2019 07:39:37 -0700 (PDT) -Received: from localhost.localdomain ([212.36.34.46]) - by smtp.gmail.com with ESMTPSA id - n14sm84860651wra.75.2019.07.24.07.39.36 - (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); - Wed, 24 Jul 2019 07:39:36 -0700 (PDT) -From: Andrei Gherzan -To: u-boot@lists.denx.de -Date: Wed, 24 Jul 2019 15:39:07 +0100 -Message-Id: <20190724143911.29770-5-andrei@balena.io> -X-Mailer: git-send-email 2.22.0 -In-Reply-To: <20190724143911.29770-1-andrei@balena.io> -References: <20190716133803.1174-1-andrei@gherzan.ro> - <20190724143911.29770-1-andrei@balena.io> -MIME-Version: 1.0 -Cc: mbrugger@suse.com, Andrei Gherzan -Subject: [U-Boot] [PATCH v2 4/8] RPI: Add entry for Raspberry Pi 4 model B -X-BeenThere: u-boot@lists.denx.de -X-Mailman-Version: 2.1.18 -Precedence: list -List-Id: U-Boot discussion -List-Unsubscribe: , - -List-Archive: -List-Post: -List-Help: -List-Subscribe: , - -Content-Type: text/plain; charset="utf-8" -Errors-To: u-boot-bounces@lists.denx.de -Sender: "U-Boot" - -The Raspebrry Pi 4 uses the new revision code scheme as documented by -the foundation. This change adds an entry for this board as well. - -Signed-off-by: Andrei Gherzan ---- - board/raspberrypi/rpi/rpi.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c -index 617c892dde..6d6f1ef39a 100644 ---- a/board/raspberrypi/rpi/rpi.c -+++ b/board/raspberrypi/rpi/rpi.c -@@ -148,6 +148,11 @@ static const struct rpi_model rpi_models_new_scheme[] = { - DTB_DIR "bcm2837-rpi-cm3.dtb", - false, - }, -+ [0x11] = { -+ "4 Model B", -+ DTB_DIR "bcm2711-rpi-4-b.dtb", -+ true, -+ }, - }; - - static const struct rpi_model rpi_models_old_scheme[] = { - -From patchwork Wed Jul 24 14:39:08 2019 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -X-Patchwork-Submitter: Andrei Gherzan -X-Patchwork-Id: 1136373 -X-Patchwork-Delegate: matthias.bgg@gmail.com -Return-Path: -X-Original-To: incoming@patchwork.ozlabs.org -Delivered-To: patchwork-incoming@bilbo.ozlabs.org -Authentication-Results: ozlabs.org; - spf=none (mailfrom) smtp.mailfrom=lists.denx.de - (client-ip=81.169.180.215; helo=lists.denx.de; - envelope-from=u-boot-bounces@lists.denx.de; - receiver=) -Authentication-Results: ozlabs.org; - dmarc=none (p=none dis=none) header.from=balena.io -Received: from lists.denx.de (dione.denx.de [81.169.180.215]) - by ozlabs.org (Postfix) with ESMTP id 45tyl91yqVz9s3l - for ; - Thu, 25 Jul 2019 00:43:33 +1000 (AEST) -Received: by lists.denx.de (Postfix, from userid 105) - id 0991BC21D74; Wed, 24 Jul 2019 14:40:59 +0000 (UTC) -X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de -X-Spam-Level: -X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=unavailable - autolearn_force=no version=3.4.0 -Received: from lists.denx.de (localhost [IPv6:::1]) - by lists.denx.de (Postfix) with ESMTP id 118D3C21D8E; - Wed, 24 Jul 2019 14:40:25 +0000 (UTC) -Received: by lists.denx.de (Postfix, from userid 105) - id 3020BC21DA2; Wed, 24 Jul 2019 14:39:40 +0000 (UTC) -Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com - [209.85.221.65]) - by lists.denx.de (Postfix) with ESMTPS id 9468EC21C4A - for ; Wed, 24 Jul 2019 14:39:38 +0000 (UTC) -Received: by mail-wr1-f65.google.com with SMTP id r1so47270575wrl.7 - for ; Wed, 24 Jul 2019 07:39:38 -0700 (PDT) -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=INTj2ZkmrgCvQnwXSkRkNgGGyv8wKd+4Dp1WiNdZg9A=; - b=Q12tNYAAjgCy4zkzIOEnY6VGsX14oy+bwAD75RZPvG/KwLZEgoIWaH67glrnxVMKCW - lnIUiim0jTu+lUQws/OaHw3Nl55HUaXoZMrKZ50vANqXzk0brozRNLBsZTBmFZGlyrP4 - 1ftizkEJMJr74KxyuZBbSHmN5gMxoEH/r6V8DZ1b8dH5RXr0J4hEuoeDiKT26fxfOpMk - dLXJd/Mx/4t6AVkcdVJIs3jdcw4neuiDThpHeLeNiuZgKEIOy7HHs+Zfz4iTRmu5IrHK - LwIYdSl6UeGnJNPE595PyB1HtUzUwEoUWuyzP062TGzGxfEvMjnFJ5bzm/dV9sOSNBtx - 308g== -X-Gm-Message-State: APjAAAUR5WDXsRNKCCMKSHatakaD4J0JzmZMzF3dOkiIj5/vqS01j3nF - 6aVr6nFQUuBmYJrMYEjaAwJqc6dm -X-Google-Smtp-Source: APXvYqwd9TOCUBNszoD7ZZhvAYwth50GqOLaqpKiC/HlGaXndFYzgPMhMhFr3nL9Gf6MfsBZ5Sho3Q== -X-Received: by 2002:adf:eb0f:: with SMTP id - s15mr12285481wrn.324.1563979177934; - Wed, 24 Jul 2019 07:39:37 -0700 (PDT) -Received: from localhost.localdomain ([212.36.34.46]) - by smtp.gmail.com with ESMTPSA id - n14sm84860651wra.75.2019.07.24.07.39.37 - (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); - Wed, 24 Jul 2019 07:39:37 -0700 (PDT) -From: Andrei Gherzan -To: u-boot@lists.denx.de -Date: Wed, 24 Jul 2019 15:39:08 +0100 -Message-Id: <20190724143911.29770-6-andrei@balena.io> -X-Mailer: git-send-email 2.22.0 -In-Reply-To: <20190724143911.29770-1-andrei@balena.io> -References: <20190716133803.1174-1-andrei@gherzan.ro> - <20190724143911.29770-1-andrei@balena.io> -MIME-Version: 1.0 -Cc: mbrugger@suse.com, Andrei Gherzan -Subject: [U-Boot] [PATCH v2 5/8] ARM: bcm283x: Include definition for - additional emmc clock -X-BeenThere: u-boot@lists.denx.de -X-Mailman-Version: 2.1.18 -Precedence: list -List-Id: U-Boot discussion -List-Unsubscribe: , - -List-Archive: -List-Post: -List-Help: -List-Subscribe: , - -Content-Type: text/plain; charset="utf-8" -Errors-To: u-boot-bounces@lists.denx.de -Sender: "U-Boot" - -This clock has a different mbox ID so have this included in the relevant -header file. - -Signed-off-by: Andrei Gherzan ---- - arch/arm/mach-bcm283x/include/mach/mbox.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/arch/arm/mach-bcm283x/include/mach/mbox.h b/arch/arm/mach-bcm283x/include/mach/mbox.h -index e44c7577da..f2a98acddd 100644 ---- a/arch/arm/mach-bcm283x/include/mach/mbox.h -+++ b/arch/arm/mach-bcm283x/include/mach/mbox.h -@@ -230,6 +230,7 @@ struct bcm2835_mbox_tag_set_power_state { - #define BCM2835_MBOX_CLOCK_ID_SDRAM 8 - #define BCM2835_MBOX_CLOCK_ID_PIXEL 9 - #define BCM2835_MBOX_CLOCK_ID_PWM 10 -+#define BCM2835_MBOX_CLOCK_ID_EMMC2 12 - - struct bcm2835_mbox_tag_get_clock_rate { - struct bcm2835_mbox_tag_hdr tag_hdr; - -From patchwork Wed Jul 24 14:39:09 2019 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -X-Patchwork-Submitter: Andrei Gherzan -X-Patchwork-Id: 1136365 -X-Patchwork-Delegate: matthias.bgg@gmail.com -Return-Path: -X-Original-To: incoming@patchwork.ozlabs.org -Delivered-To: patchwork-incoming@bilbo.ozlabs.org -Authentication-Results: ozlabs.org; - spf=none (mailfrom) smtp.mailfrom=lists.denx.de - (client-ip=81.169.180.215; helo=lists.denx.de; - envelope-from=u-boot-bounces@lists.denx.de; - receiver=) -Authentication-Results: ozlabs.org; - dmarc=none (p=none dis=none) header.from=balena.io -Received: from lists.denx.de (dione.denx.de [81.169.180.215]) - by ozlabs.org (Postfix) with ESMTP id 45tyjV5JXbz9sBF - for ; - Thu, 25 Jul 2019 00:42:06 +1000 (AEST) -Received: by lists.denx.de (Postfix, from userid 105) - id 77213C21C27; Wed, 24 Jul 2019 14:40:36 +0000 (UTC) -X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de -X-Spam-Level: -X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2 - autolearn=unavailable autolearn_force=no version=3.4.0 -Received: from lists.denx.de (localhost [IPv6:::1]) - by lists.denx.de (Postfix) with ESMTP id A24EDC21DB5; - Wed, 24 Jul 2019 14:40:00 +0000 (UTC) -Received: by lists.denx.de (Postfix, from userid 105) - id 4193AC21C2F; Wed, 24 Jul 2019 14:39:42 +0000 (UTC) -Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com - [209.85.221.68]) - by lists.denx.de (Postfix) with ESMTPS id AE825C21D4A - for ; Wed, 24 Jul 2019 14:39:39 +0000 (UTC) -Received: by mail-wr1-f68.google.com with SMTP id 31so47329072wrm.1 - for ; Wed, 24 Jul 2019 07:39:39 -0700 (PDT) -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=fpnN0uOMvR4DjRJfxVux4tdvICr5Rjygmvsk8TlIvnA=; - b=MQVZ2YY2EKhWHLLaavQarKM51ls7jOHZ7N8mWZpNRCJNQtRJfYkVDlHw5vbIV2dFXF - W6qAp6fnL+fb9/RHiw786uJCu/L1CZ95P9ksjyGYE62VQLWFE5OxDF2NGkoxZ0HGkqiw - cMAcpX5+Zn+/ZA6Q7OGOz1dZqASEH8mWaPI5TS1afkxMn5E14RKVHN6//bkvXwIpXL7d - 0M7zjoEQGuDlZK3PoRhxESbXrtznvm2PS2xiTdgtH5i9dJ24bbfjQulbBx9EMR++tB8O - e+SLxw9eT3N8XZwF0YD4XJRcFc8kwyiwhKFU2tuNJTC7pIkBSOeLxUUyJGsypxREq54n - 11GA== -X-Gm-Message-State: APjAAAXU6kbWgi4nhW5lhQR6pbZIhBdAkcKNmC1i59gWXdb8lL6dbHqL - Q2Ye3JGmLehlU2z4+7T/uXzHhO+V -X-Google-Smtp-Source: APXvYqyYzkP4kraoV8icuHlxBOcusLrizbOSQSILHq90ieWqGbICGdj7ZQRO5lX7n4DS1rr/nKThUQ== -X-Received: by 2002:adf:ea82:: with SMTP id s2mr82009745wrm.91.1563979179031; - Wed, 24 Jul 2019 07:39:39 -0700 (PDT) -Received: from localhost.localdomain ([212.36.34.46]) - by smtp.gmail.com with ESMTPSA id - n14sm84860651wra.75.2019.07.24.07.39.38 - (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); - Wed, 24 Jul 2019 07:39:38 -0700 (PDT) -From: Andrei Gherzan -To: u-boot@lists.denx.de -Date: Wed, 24 Jul 2019 15:39:09 +0100 -Message-Id: <20190724143911.29770-7-andrei@balena.io> -X-Mailer: git-send-email 2.22.0 -In-Reply-To: <20190724143911.29770-1-andrei@balena.io> -References: <20190716133803.1174-1-andrei@gherzan.ro> - <20190724143911.29770-1-andrei@balena.io> -MIME-Version: 1.0 -Cc: mbrugger@suse.com, Andrei Gherzan -Subject: [U-Boot] [PATCH v2 6/8] mmc: bcm283x: Add support for bcm2711 - device in bcm2835_sdhci -X-BeenThere: u-boot@lists.denx.de -X-Mailman-Version: 2.1.18 -Precedence: list -List-Id: U-Boot discussion -List-Unsubscribe: , - -List-Archive: -List-Post: -List-Help: -List-Subscribe: , - -Content-Type: text/plain; charset="utf-8" -Errors-To: u-boot-bounces@lists.denx.de -Sender: "U-Boot" - -From: Matthias Brugger - -The bcm2711 has two emmc controllers. The difference is the clocks -they use. Add support for the second emmc controller. - -Signed-off-by: Matthias Brugger -Signed-off-by: Andrei Gherzan ---- - drivers/mmc/bcm2835_sdhci.c | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/drivers/mmc/bcm2835_sdhci.c b/drivers/mmc/bcm2835_sdhci.c -index 08bddd410e..e68dec3be7 100644 ---- a/drivers/mmc/bcm2835_sdhci.c -+++ b/drivers/mmc/bcm2835_sdhci.c -@@ -178,12 +178,13 @@ static int bcm2835_sdhci_probe(struct udevice *dev) - fdt_addr_t base; - int emmc_freq; - int ret; -+ int clock_id = (int)dev_get_driver_data(dev); - - base = devfdt_get_addr(dev); - if (base == FDT_ADDR_T_NONE) - return -EINVAL; - -- ret = bcm2835_get_mmc_clock(BCM2835_MBOX_CLOCK_ID_EMMC); -+ ret = bcm2835_get_mmc_clock(clock_id); - if (ret < 0) { - debug("%s: Failed to set MMC clock (err=%d)\n", __func__, ret); - return ret; -@@ -228,7 +229,14 @@ static int bcm2835_sdhci_probe(struct udevice *dev) - } - - static const struct udevice_id bcm2835_sdhci_match[] = { -- { .compatible = "brcm,bcm2835-sdhci" }, -+ { -+ .compatible = "brcm,bcm2835-sdhci", -+ .data = BCM2835_MBOX_CLOCK_ID_EMMC -+ }, -+ { -+ .compatible = "brcm,bcm2711-emmc2", -+ .data = BCM2835_MBOX_CLOCK_ID_EMMC2 -+ }, - { /* sentinel */ } - }; - - -From patchwork Wed Jul 24 14:39:10 2019 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -X-Patchwork-Submitter: Andrei Gherzan -X-Patchwork-Id: 1136369 -X-Patchwork-Delegate: matthias.bgg@gmail.com -Return-Path: -X-Original-To: incoming@patchwork.ozlabs.org -Delivered-To: patchwork-incoming@bilbo.ozlabs.org -Authentication-Results: ozlabs.org; - spf=none (mailfrom) smtp.mailfrom=lists.denx.de - (client-ip=81.169.180.215; helo=lists.denx.de; - envelope-from=u-boot-bounces@lists.denx.de; - receiver=) -Authentication-Results: ozlabs.org; - dmarc=none (p=none dis=none) header.from=balena.io -Received: from lists.denx.de (dione.denx.de [81.169.180.215]) - by ozlabs.org (Postfix) with ESMTP id 45tyk04V3zz9s3l - for ; - Thu, 25 Jul 2019 00:42:32 +1000 (AEST) -Received: by lists.denx.de (Postfix, from userid 105) - id 47E81C21DD3; Wed, 24 Jul 2019 14:41:08 +0000 (UTC) -X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de -X-Spam-Level: -X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2 - autolearn=unavailable autolearn_force=no version=3.4.0 -Received: from lists.denx.de (localhost [IPv6:::1]) - by lists.denx.de (Postfix) with ESMTP id A7B62C21C93; - Wed, 24 Jul 2019 14:40:30 +0000 (UTC) -Received: by lists.denx.de (Postfix, from userid 105) - id 05EE7C21D65; Wed, 24 Jul 2019 14:39:43 +0000 (UTC) -Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com - [209.85.221.67]) - by lists.denx.de (Postfix) with ESMTPS id A0C53C21CB1 - for ; Wed, 24 Jul 2019 14:39:40 +0000 (UTC) -Received: by mail-wr1-f67.google.com with SMTP id p17so47250123wrf.11 - for ; Wed, 24 Jul 2019 07:39:40 -0700 (PDT) -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=vke+aeJLlm+hH0ZbApV2tQXwcQSNthXhQrHw3uTUjCY=; - b=fXeMysXcz5ZFzv+beEbqCcjHVfBZuIIVE7p40QdU2ckI7M3z1jdwMCXENGpwnVdMks - H+k4EDysfUSZmD9YGLyX+rFUMPgHEZm7DcxpQGDoT28zXRKo1I/5BQhEm5VHZYudmzLM - A9Juze34OYZ+qop/80ZSAARNy/grkz+9EL0hz+/cGoKbQM2vnYeK9IhqY1MT+Jnjaqeo - Avmh6DcXZN5MtJOGGt7TsXETUzeCZViAJDpgT+lIy8aFAABW4ZHBF6eZtgzd/aNn0dk7 - RJHyQlXxpKIeZGVzZz6kO+VFwHV++awYsZK1wzhqNDvAA0kGbkvgIWc1qOii+4j351tr - FmfA== -X-Gm-Message-State: APjAAAUddD7/P+xcAGZeEeanF39Kb1CjavSwOjql/I604nDwgzGThPdu - QltkJmJtpo31uSwBMKkalJwi1Xg3 -X-Google-Smtp-Source: APXvYqydROkNjRTwQxNzaMfPcjFShYCgunskcjaWkRPeJsf9HRFmaH/uThvtF9xRw5cFaHtr2ixI2w== -X-Received: by 2002:a5d:668e:: with SMTP id - l14mr31747640wru.156.1563979179920; - Wed, 24 Jul 2019 07:39:39 -0700 (PDT) -Received: from localhost.localdomain ([212.36.34.46]) - by smtp.gmail.com with ESMTPSA id - n14sm84860651wra.75.2019.07.24.07.39.39 - (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); - Wed, 24 Jul 2019 07:39:39 -0700 (PDT) -From: Andrei Gherzan -To: u-boot@lists.denx.de -Date: Wed, 24 Jul 2019 15:39:10 +0100 -Message-Id: <20190724143911.29770-8-andrei@balena.io> -X-Mailer: git-send-email 2.22.0 -In-Reply-To: <20190724143911.29770-1-andrei@balena.io> -References: <20190716133803.1174-1-andrei@gherzan.ro> - <20190724143911.29770-1-andrei@balena.io> -MIME-Version: 1.0 -Cc: mbrugger@suse.com, Andrei Gherzan -Subject: [U-Boot] [PATCH v2 7/8] RPI: Add memory map for bcm2838 -X-BeenThere: u-boot@lists.denx.de -X-Mailman-Version: 2.1.18 -Precedence: list -List-Id: U-Boot discussion -List-Unsubscribe: , - -List-Archive: -List-Post: -List-Help: -List-Subscribe: , - -Content-Type: text/plain; charset="utf-8" -Errors-To: u-boot-bounces@lists.denx.de -Sender: "U-Boot" - -Define the memory map for the BCM2838 based on the dt configuration -available in the Raspberry Pi kernel fork. - -Signed-off-by: Andrei Gherzan ---- - board/raspberrypi/rpi/rpi.c | 27 ++++++++++++++++++++++++--- - 1 file changed, 24 insertions(+), 3 deletions(-) - -diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c -index 6d6f1ef39a..1c4fae9166 100644 ---- a/board/raspberrypi/rpi/rpi.c -+++ b/board/raspberrypi/rpi/rpi.c -@@ -249,7 +249,8 @@ static uint32_t rev_type; - static const struct rpi_model *model; - - #ifdef CONFIG_ARM64 --static struct mm_region bcm2837_mem_map[] = { -+#ifndef CONFIG_BCM2838 -+static struct mm_region bcm283x_mem_map[] = { - { - .virt = 0x00000000UL, - .phys = 0x00000000UL, -@@ -268,8 +269,28 @@ static struct mm_region bcm2837_mem_map[] = { - 0, - } - }; -- --struct mm_region *mem_map = bcm2837_mem_map; -+#else -+static struct mm_region bcm283x_mem_map[] = { -+ { -+ .virt = 0x00000000UL, -+ .phys = 0x00000000UL, -+ .size = 0xfe000000UL, -+ .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) | -+ PTE_BLOCK_INNER_SHARE -+ }, { -+ .virt = 0xfe000000UL, -+ .phys = 0xfe000000UL, -+ .size = 0x01800000UL, -+ .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | -+ PTE_BLOCK_NON_SHARE | -+ PTE_BLOCK_PXN | PTE_BLOCK_UXN -+ }, { -+ /* List terminator */ -+ 0, -+ } -+}; -+#endif -+struct mm_region *mem_map = bcm283x_mem_map; - #endif - - int dram_init(void) - -From patchwork Wed Jul 24 14:39:11 2019 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -X-Patchwork-Submitter: Andrei Gherzan -X-Patchwork-Id: 1136370 -X-Patchwork-Delegate: matthias.bgg@gmail.com -Return-Path: -X-Original-To: incoming@patchwork.ozlabs.org -Delivered-To: patchwork-incoming@bilbo.ozlabs.org -Authentication-Results: ozlabs.org; - spf=none (mailfrom) smtp.mailfrom=lists.denx.de - (client-ip=81.169.180.215; helo=lists.denx.de; - envelope-from=u-boot-bounces@lists.denx.de; - receiver=) -Authentication-Results: ozlabs.org; - dmarc=none (p=none dis=none) header.from=balena.io -Received: from lists.denx.de (dione.denx.de [81.169.180.215]) - by ozlabs.org (Postfix) with ESMTP id 45tyk61mBqz9s3l - for ; - Thu, 25 Jul 2019 00:42:38 +1000 (AEST) -Received: by lists.denx.de (Postfix, from userid 105) - id EF268C21DA2; Wed, 24 Jul 2019 14:40:21 +0000 (UTC) -X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de -X-Spam-Level: -X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=unavailable - autolearn_force=no version=3.4.0 -Received: from lists.denx.de (localhost [IPv6:::1]) - by lists.denx.de (Postfix) with ESMTP id 18B41C21DDC; - Wed, 24 Jul 2019 14:39:52 +0000 (UTC) -Received: by lists.denx.de (Postfix, from userid 105) - id DD62DC21C2F; Wed, 24 Jul 2019 14:39:44 +0000 (UTC) -Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com - [209.85.128.66]) - by lists.denx.de (Postfix) with ESMTPS id 8735EC21DB3 - for ; Wed, 24 Jul 2019 14:39:41 +0000 (UTC) -Received: by mail-wm1-f66.google.com with SMTP id 207so42087264wma.1 - for ; Wed, 24 Jul 2019 07:39:41 -0700 (PDT) -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=Su0sVvS3yD62leuIKZb3pxg8i/NN5tZXXSx8RoqiHBw=; - b=d7yjVaKAs5z1TFruY3Dqyo5v+F+4E+6cfpsthOMt+m9MZeGD4gERwCAslKdO4akkyp - wWRBoQCMMMWzwpoRBvjczC5hM7xQ/pKqEZAJ9KP5gyzmlCmx+CznVjJGkVsbKE/9Mjz8 - 8fTflQbyCszmiwMdPOjMJnLHi5cbT1R0qbiwMeYPNkab9mmWczX7x6u9JfzS51kG3G3A - hD5QehF28N7XODXttdFd1kMGzEC+6xzJPdYrCcGCoGeOBkg3KiHS/dkB8sXp/tvwHQv/ - 4dPZmjtq5exSdZ0Mm2E5RsvISeMK6G8Iqv0PcUXUGYBQryXiw1DDve4wnDR1gw/YJNV0 - 07yQ== -X-Gm-Message-State: APjAAAVxgFnLbdj7oxAR7jyH5MO8StfPsSq/KejdOEq2tDuha3i9EwGn - dS6MsHWnNMhYVuzQdHZwaQ2aOYon -X-Google-Smtp-Source: APXvYqyVLBWemfnQgqJJ6fX0KGAaRRkuU+DwxqsmiT4cxbq4NFvAxBdWRSZ2PrRk7ZhY55qr3+jwcg== -X-Received: by 2002:a1c:a997:: with SMTP id - s145mr72938337wme.106.1563979180848; - Wed, 24 Jul 2019 07:39:40 -0700 (PDT) -Received: from localhost.localdomain ([212.36.34.46]) - by smtp.gmail.com with ESMTPSA id - n14sm84860651wra.75.2019.07.24.07.39.40 - (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); - Wed, 24 Jul 2019 07:39:40 -0700 (PDT) -From: Andrei Gherzan -To: u-boot@lists.denx.de -Date: Wed, 24 Jul 2019 15:39:11 +0100 -Message-Id: <20190724143911.29770-9-andrei@balena.io> -X-Mailer: git-send-email 2.22.0 -In-Reply-To: <20190724143911.29770-1-andrei@balena.io> -References: <20190716133803.1174-1-andrei@gherzan.ro> - <20190724143911.29770-1-andrei@balena.io> -MIME-Version: 1.0 -Cc: mbrugger@suse.com, Andrei Gherzan -Subject: [U-Boot] [PATCH v2 8/8] git-mailrc: Add rpi and bcm283x maintainer -X-BeenThere: u-boot@lists.denx.de -X-Mailman-Version: 2.1.18 -Precedence: list -List-Id: U-Boot discussion -List-Unsubscribe: , - -List-Archive: -List-Post: -List-Help: -List-Subscribe: , - -Content-Type: text/plain; charset="utf-8" -Errors-To: u-boot-bounces@lists.denx.de -Sender: "U-Boot" - -Signed-off-by: Andrei Gherzan -Acked-by: Matthias Brugger ---- - doc/git-mailrc | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/doc/git-mailrc b/doc/git-mailrc -index a63b76befc..68110e1963 100644 ---- a/doc/git-mailrc -+++ b/doc/git-mailrc -@@ -35,6 +35,7 @@ alias mariosix Mario Six - alias masahiro Masahiro Yamada - alias mateusz Mateusz Kulikowski - alias maxime Maxime Ripard -+alias mbrugger Matthias Brugger - alias monstr Michal Simek - alias prom Minkyu Kang - alias ptomsich Philipp Tomsich -@@ -74,6 +75,9 @@ alias uniphier uboot, masahiro - alias zynq uboot, monstr - alias rockchip uboot, sjg, kevery, ptomsich - -+alias bcm283x uboot,mbrugger -+alias rpi uboot,mbrugger -+ - alias m68k uboot, alisonwang, angelo_ts - alias coldfire m68k - diff --git a/sources b/sources index a0d1eae..1786971 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (u-boot-2019.10-rc3.tar.bz2) = 598a6637fdbd62f30a3c4f73f0e89022c6c92b9ec93f4c4215547f54493ff17b2a0b127328ad6e1561e451b3cddca89f168f8adfe4cc59f8125fc70787d8cf4c +SHA512 (u-boot-2019.10-rc4.tar.bz2) = 7cda21db747ec99eed5f51e1f2dffc91bca0515354ff6449a7c2dad87b0d10120bd619590cf523cb3a68814c65a3b51fced45984dfb0cf8a46b129aaac0b5204 diff --git a/uboot-tools.spec b/uboot-tools.spec index 37896e2..0f2392a 100644 --- a/uboot-tools.spec +++ b/uboot-tools.spec @@ -1,8 +1,8 @@ -%global candidate rc3 +%global candidate rc4 Name: uboot-tools Version: 2019.10 -Release: 0.4%{?candidate:.%{candidate}}%{?dist} +Release: 0.5%{?candidate:.%{candidate}}%{?dist} Summary: U-Boot utilities License: GPLv2+ BSD LGPL-2.1+ LGPL-2.0+ URL: http://www.denx.de/wiki/U-Boot @@ -27,7 +27,6 @@ Patch7: dragonboard-fixes.patch Patch8: ARM-tegra-Add-NVIDIA-Jetson-Nano.patch Patch9: arm-tegra-defaine-fdtfile-for-all-devices.patch Patch10: env-fix-build-error-for-envtools.patch -Patch11: Raspberry-Pi-32-64-support.patch BuildRequires: bc BuildRequires: dtc @@ -258,6 +257,9 @@ cp -p board/warp7/README builds/docs/README.warp7 %endif %changelog +* Mon Sep 23 2019 Peter Robinson 2019.10-0.5-rc4 +- 2019.10 RC4 + * Wed Sep 11 2019 Peter Robinson 2019.10-0.4-rc3 - Minor fixes