v2020.04 rc1
This commit is contained in:
Peter Robinson
parent
d332b4c202
commit
85b5f80fcd
File diff suppressed because it is too large
Load Diff
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (u-boot-2020.01.tar.bz2) = 073d4e0234095c1bda1ffa7a648972aa4530d106ee1a73035e0501b1aba2951653582c8b7bcf338d4e95012fa67e75f97b7e1fbac5cc764d609b671ef29617f7
|
||||
SHA512 (u-boot-2020.04-rc1.tar.bz2) = 06c6974a7d04258d6c05bb43ae8e03dbea5f290f07ed457be01927f68d825a80825e0157fa4a7df6e47a035f119075779c059d23c2d4545ec72212f1c22d3cbf
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
#global candidate rc5
|
||||
%global candidate rc1
|
||||
|
||||
Name: uboot-tools
|
||||
Version: 2020.01
|
||||
Release: 1%{?candidate:.%{candidate}}%{?dist}
|
||||
Version: 2020.04
|
||||
Release: 0.1%{?candidate:.%{candidate}}%{?dist}
|
||||
Summary: U-Boot utilities
|
||||
License: GPLv2+ BSD LGPL-2.1+ LGPL-2.0+
|
||||
URL: http://www.denx.de/wiki/U-Boot
|
||||
|
|
@ -26,9 +26,7 @@ Patch5: rpi-Enable-using-the-DT-provided-by-the-Raspberry-Pi.patch
|
|||
Patch6: dragonboard-fixes.patch
|
||||
Patch7: ARM-tegra-Add-NVIDIA-Jetson-Nano.patch
|
||||
Patch8: arm-tegra-defaine-fdtfile-for-all-devices.patch
|
||||
Patch9: zynqmp-Add-support-for-u-boot.itb-generation-with-ATF.patch
|
||||
Patch10: zynqmp-Do-not-assing-MIO34-that-early-on-zcu100.patch
|
||||
Patch11: wandboard-Fix-the-DM_PMIC-conversion.patch
|
||||
Patch12: Ethernet-support-for-Raspberry-Pi-4.patch
|
||||
|
||||
BuildRequires: bc
|
||||
BuildRequires: dtc
|
||||
|
|
@ -250,6 +248,9 @@ cp -p board/warp7/README builds/docs/README.warp7
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Wed Jan 29 2020 Peter Robinson <pbrobinson@fedoraproject.org> 2020.04-0.1-rc1
|
||||
- 2020.04 RC1
|
||||
|
||||
* Tue Jan 7 2020 Peter Robinson <pbrobinson@fedoraproject.org> 2020.01-1
|
||||
- 2020.01
|
||||
|
||||
|
|
|
|||
|
|
@ -1,298 +0,0 @@
|
|||
From patchwork Tue Dec 10 09:32:59 2019
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
X-Patchwork-Submitter: Fabio Estevam <festevam@gmail.com>
|
||||
X-Patchwork-Id: 1206991
|
||||
X-Patchwork-Delegate: sbabic@denx.de
|
||||
Return-Path: <u-boot-bounces@lists.denx.de>
|
||||
X-Original-To: incoming@patchwork.ozlabs.org
|
||||
Delivered-To: patchwork-incoming@bilbo.ozlabs.org
|
||||
Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized)
|
||||
smtp.mailfrom=lists.denx.de
|
||||
(client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01;
|
||||
helo=phobos.denx.de;
|
||||
envelope-from=u-boot-bounces@lists.denx.de;
|
||||
receiver=<UNKNOWN>)
|
||||
Authentication-Results: ozlabs.org;
|
||||
dmarc=fail (p=none dis=none) header.from=gmail.com
|
||||
Authentication-Results: ozlabs.org;
|
||||
dkim=fail reason="signature verification failed" (2048-bit key;
|
||||
unprotected) header.d=gmail.com header.i=@gmail.com
|
||||
header.b="cvQwwEgd"; dkim-atps=neutral
|
||||
Received: from phobos.denx.de (phobos.denx.de
|
||||
[IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01])
|
||||
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
|
||||
key-exchange X25519 server-signature RSA-PSS (4096 bits)
|
||||
server-digest SHA256) (No client certificate requested)
|
||||
by ozlabs.org (Postfix) with ESMTPS id 47XFH65yXWz9sR0
|
||||
for <incoming@patchwork.ozlabs.org>;
|
||||
Tue, 10 Dec 2019 20:33:22 +1100 (AEDT)
|
||||
Received: from phobos.denx.de (localhost [IPv6:::1])
|
||||
by phobos.denx.de (Postfix) with ESMTP id D7B2E815E1;
|
||||
Tue, 10 Dec 2019 10:33:15 +0100 (CET)
|
||||
Authentication-Results: phobos.denx.de;
|
||||
dmarc=fail (p=none dis=none) header.from=gmail.com
|
||||
Authentication-Results: phobos.denx.de;
|
||||
spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de
|
||||
Authentication-Results: phobos.denx.de;
|
||||
dkim=fail reason="signature verification failed" (2048-bit key;
|
||||
unprotected) header.d=gmail.com header.i=@gmail.com
|
||||
header.b="cvQwwEgd"; dkim-atps=neutral
|
||||
Received: by phobos.denx.de (Postfix, from userid 109)
|
||||
id 4752C8074A; Tue, 10 Dec 2019 10:33:14 +0100 (CET)
|
||||
X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de
|
||||
X-Spam-Level:
|
||||
X-Spam-Status: No, score=-0.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
|
||||
DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE autolearn=ham
|
||||
autolearn_force=no version=3.4.2
|
||||
Received: from mail-vs1-xe44.google.com (mail-vs1-xe44.google.com
|
||||
[IPv6:2607:f8b0:4864:20::e44])
|
||||
(using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits))
|
||||
(No client certificate requested)
|
||||
by phobos.denx.de (Postfix) with ESMTPS id 937E28074A
|
||||
for <u-boot@lists.denx.de>; Tue, 10 Dec 2019 10:33:11 +0100 (CET)
|
||||
Authentication-Results: phobos.denx.de;
|
||||
dmarc=pass (p=none dis=none) header.from=gmail.com
|
||||
Authentication-Results: phobos.denx.de;
|
||||
spf=pass smtp.mailfrom=festevam@gmail.com
|
||||
Received: by mail-vs1-xe44.google.com with SMTP id x4so12516773vsx.10
|
||||
for <u-boot@lists.denx.de>; Tue, 10 Dec 2019 01:33:11 -0800 (PST)
|
||||
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
|
||||
h=from:to:cc:subject:date:message-id;
|
||||
bh=mpTV9oyDpdcbibHXq3CRpa1/KhlaRlmW+uWx2mbu2C0=;
|
||||
b=cvQwwEgdb0cUfPdifzUOq/iEL9XwLazg63lgVN27j8pQhuqD4CnxE7P4E1kAmm4GrL
|
||||
ioli46uO/Zn7MutAHpZh141SUmltl5XyJkK/xfwHSYwTpWLiwGzieEfLxpOTOCmJDolI
|
||||
W5wZbT1C04618Y3UCGlEZ9L7ETfaYqT7cOEjUBpSsArGNViCrIToVeVW+z8oTAsT51XE
|
||||
CrVdNSDOXV3jRQzBEC1l+eZD5hAXFVPHY6sErfv+y8b94/la+HA5yaRmlVg30fosnxxq
|
||||
BcbV0kO/8Kl1VgIOnxr4pVy+NsG8sFJ5zjQgsaGGFVwL9xx1Z8my0q0JlKFOs63K8GD+
|
||||
1Yuw==
|
||||
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;
|
||||
bh=mpTV9oyDpdcbibHXq3CRpa1/KhlaRlmW+uWx2mbu2C0=;
|
||||
b=M1zPCQgH6lX7Ng689GJcnZQWOuEhk0MKOHRBbE702r7lq579f9ACwlpW4sAmLS/gqs
|
||||
BTRpErFG2yHcK95YAJOjx+QeT5weQJShAp1r7sLKIqBoxxi9oYzMYt+vO4oYENcsOdoL
|
||||
fxbXhR9mT2GVpedrncf3P4Js8xMU/Og14n63mRSCzjI0z9kmFpjlIbhFEAoXIeYYrUTO
|
||||
JF/fjPHdOAyuFSG2r0JSuyh2ewrHBhqmpdc09iJalFiYzd2fMWiK4z4FDopwmSzW2+LQ
|
||||
qFXPcppjuUWNSFf/WVdxN4a1pXzmCvlyo+wUVCinBll219AvEmP5UQwfGVfv4g2qOGJ2
|
||||
+uaw==
|
||||
X-Gm-Message-State: APjAAAWEqUYJ4RzYMv6viS7n184rIuw6EoDe0lHixKjw8y7hOeos8Jwk
|
||||
j+sKufWbN2myuE6gHKRWXTM=
|
||||
X-Google-Smtp-Source: APXvYqxvZbxUyC1WljEkppgxN57/lcAdqYBto/WMiBhA6sqkc/bvP209jENc0g48Nw4H6RjWmlXc8w==
|
||||
X-Received: by 2002:a67:ff85:: with SMTP id v5mr23836021vsq.42.1575970390329;
|
||||
Tue, 10 Dec 2019 01:33:10 -0800 (PST)
|
||||
Received: from fabio-Latitude-E5450.nxp.com ([2804:14c:482:5bb::1])
|
||||
by smtp.gmail.com with ESMTPSA id
|
||||
k192sm1820253vke.40.2019.12.10.01.33.07
|
||||
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
|
||||
Tue, 10 Dec 2019 01:33:09 -0800 (PST)
|
||||
From: Fabio Estevam <festevam@gmail.com>
|
||||
To: sbabic@denx.de
|
||||
Subject: [PATCH v3 1/2] wandboard: Fix the DM_PMIC conversion
|
||||
Date: Tue, 10 Dec 2019 06:32:59 -0300
|
||||
Message-Id: <20191210093300.31692-1-festevam@gmail.com>
|
||||
X-Mailer: git-send-email 2.17.1
|
||||
X-BeenThere: u-boot@lists.denx.de
|
||||
X-Mailman-Version: 2.1.26
|
||||
Precedence: list
|
||||
List-Id: U-Boot discussion <u-boot.lists.denx.de>
|
||||
List-Unsubscribe: <https://lists.denx.de/options/u-boot>,
|
||||
<mailto:u-boot-request@lists.denx.de?subject=unsubscribe>
|
||||
List-Archive: <https://lists.denx.de/pipermail/u-boot/>
|
||||
List-Post: <mailto:u-boot@lists.denx.de>
|
||||
List-Help: <mailto:u-boot-request@lists.denx.de?subject=help>
|
||||
List-Subscribe: <https://lists.denx.de/listinfo/u-boot>,
|
||||
<mailto:u-boot-request@lists.denx.de?subject=subscribe>
|
||||
Cc: u-boot@lists.denx.de, uboot-imx@nxp.com, trini@konsulko.com
|
||||
Errors-To: u-boot-bounces@lists.denx.de
|
||||
Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
|
||||
X-Virus-Scanned: clamav-milter 0.101.4 at phobos.denx.de
|
||||
X-Virus-Status: Clean
|
||||
|
||||
Commit ec837c82d709 ("imx6: wandboard: convert to DM_PMIC")
|
||||
caused the following pmic_get() error:
|
||||
|
||||
CPU: Freescale i.MX6QP rev1.0 at 792 MHz
|
||||
Reset cause: POR
|
||||
DRAM: 2 GiB
|
||||
PMIC: pmic_get() ret -19
|
||||
...
|
||||
|
||||
and since the PMIC presence is used to determine the board D1 revision,
|
||||
the following error is seen when booting a board rev D1:
|
||||
|
||||
WARNING: Could not determine dtb to use
|
||||
|
||||
and the kernel does not boot at all.
|
||||
|
||||
Fix the regression by passing "pfuze100@8" as the correct parameter
|
||||
to the pmic_get() function in the DM case.
|
||||
|
||||
Fixes: ec837c82d709 ("imx6: wandboard: convert to DM_PMIC")
|
||||
Signed-off-by: Fabio Estevam <festevam@gmail.com>
|
||||
---
|
||||
Changes since v2:
|
||||
- None
|
||||
|
||||
board/wandboard/wandboard.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/board/wandboard/wandboard.c b/board/wandboard/wandboard.c
|
||||
index 6c1e4ef27d..b2f961a7f0 100644
|
||||
--- a/board/wandboard/wandboard.c
|
||||
+++ b/board/wandboard/wandboard.c
|
||||
@@ -363,7 +363,7 @@ int power_init_board(void)
|
||||
|
||||
puts("PMIC: ");
|
||||
|
||||
- ret = pmic_get("pfuze100", &dev);
|
||||
+ ret = pmic_get("pfuze100@8", &dev);
|
||||
if (ret < 0) {
|
||||
printf("pmic_get() ret %d\n", ret);
|
||||
return 0;
|
||||
|
||||
From patchwork Tue Dec 10 09:33:00 2019
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
X-Patchwork-Submitter: Fabio Estevam <festevam@gmail.com>
|
||||
X-Patchwork-Id: 1206992
|
||||
X-Patchwork-Delegate: sbabic@denx.de
|
||||
Return-Path: <u-boot-bounces@lists.denx.de>
|
||||
X-Original-To: incoming@patchwork.ozlabs.org
|
||||
Delivered-To: patchwork-incoming@bilbo.ozlabs.org
|
||||
Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized)
|
||||
smtp.mailfrom=lists.denx.de
|
||||
(client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01;
|
||||
helo=phobos.denx.de;
|
||||
envelope-from=u-boot-bounces@lists.denx.de;
|
||||
receiver=<UNKNOWN>)
|
||||
Authentication-Results: ozlabs.org;
|
||||
dmarc=fail (p=none dis=none) header.from=gmail.com
|
||||
Authentication-Results: ozlabs.org;
|
||||
dkim=fail reason="signature verification failed" (2048-bit key;
|
||||
unprotected) header.d=gmail.com header.i=@gmail.com
|
||||
header.b="YrPr8jxV"; dkim-atps=neutral
|
||||
Received: from phobos.denx.de (phobos.denx.de
|
||||
[IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01])
|
||||
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
|
||||
key-exchange X25519 server-signature RSA-PSS (4096 bits))
|
||||
(No client certificate requested)
|
||||
by ozlabs.org (Postfix) with ESMTPS id 47XFHB3qzgz9sR0
|
||||
for <incoming@patchwork.ozlabs.org>;
|
||||
Tue, 10 Dec 2019 20:33:26 +1100 (AEDT)
|
||||
Received: from phobos.denx.de (localhost [IPv6:::1])
|
||||
by phobos.denx.de (Postfix) with ESMTP id BC5CA81644;
|
||||
Tue, 10 Dec 2019 10:33:19 +0100 (CET)
|
||||
Authentication-Results: phobos.denx.de;
|
||||
dmarc=fail (p=none dis=none) header.from=gmail.com
|
||||
Authentication-Results: phobos.denx.de;
|
||||
spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de
|
||||
Authentication-Results: phobos.denx.de;
|
||||
dkim=fail reason="signature verification failed" (2048-bit key;
|
||||
unprotected) header.d=gmail.com header.i=@gmail.com
|
||||
header.b="YrPr8jxV"; dkim-atps=neutral
|
||||
Received: by phobos.denx.de (Postfix, from userid 109)
|
||||
id C408A8163A; Tue, 10 Dec 2019 10:33:17 +0100 (CET)
|
||||
X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de
|
||||
X-Spam-Level:
|
||||
X-Spam-Status: No, score=-0.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
|
||||
DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE autolearn=ham
|
||||
autolearn_force=no version=3.4.2
|
||||
Received: from mail-vs1-xe43.google.com (mail-vs1-xe43.google.com
|
||||
[IPv6:2607:f8b0:4864:20::e43])
|
||||
(using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits))
|
||||
(No client certificate requested)
|
||||
by phobos.denx.de (Postfix) with ESMTPS id E87DF8074A
|
||||
for <u-boot@lists.denx.de>; Tue, 10 Dec 2019 10:33:14 +0100 (CET)
|
||||
Authentication-Results: phobos.denx.de;
|
||||
dmarc=pass (p=none dis=none) header.from=gmail.com
|
||||
Authentication-Results: phobos.denx.de;
|
||||
spf=pass smtp.mailfrom=festevam@gmail.com
|
||||
Received: by mail-vs1-xe43.google.com with SMTP id p21so12536232vsq.6
|
||||
for <u-boot@lists.denx.de>; Tue, 10 Dec 2019 01:33:14 -0800 (PST)
|
||||
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
|
||||
h=from:to:cc:subject:date:message-id:in-reply-to:references;
|
||||
bh=fFiExeVHQEMtju9XljEZntJtMc/qzkpL8xAT5PDzV60=;
|
||||
b=YrPr8jxVxXbzcZcfasnoGn8a6WeAPvhbfZ0+ZEqRpLUxnVpM4LQsPdTrMiyHGUO6TJ
|
||||
7jdurrMAwK0N4MygABLhGjjU4DExjGT3XpwTf1cqWdK7FLmO7sjWeOIrV+gAvUqqPZgJ
|
||||
7AAoPDQx3eV3owS87svBd7wDi1M8nJGyuNDh/HSyBFHiwSyV142Tdq17Fjp9qFX1LhMc
|
||||
TjGHMtLNLH2XhClWrKZz+10pQRN0kzdI2Xxai73zFprKsp3MfDww35YX8J9LY9F5/s43
|
||||
mKHgO4EECxOhts/c6xnDIqjl6O9JIajFH9G9azxjZq6/yjbgowe4LEQrlas9y0JKA3s/
|
||||
GK/g==
|
||||
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;
|
||||
bh=fFiExeVHQEMtju9XljEZntJtMc/qzkpL8xAT5PDzV60=;
|
||||
b=s0vxHMIufABFR1mGa7wa9NVYGHlj3GR65sLCrAX28gyg6ztQ4dlECQ0CTO3HHnoVoo
|
||||
v6fosk95hoaXI75Bj08HKgCns6k+nvnrIfV/e22t8vPFtQz0CuJy7B9ti1CHMc1OXK79
|
||||
pMvHWoFRXele0KgexW0JS5XomOBmcd7eE25j9awGzpeRS5LFOvoGhSXb1ktBPga3EYBp
|
||||
qJ5lSA/TWesX7MH3DhzHP5g4GXvtsMTSPPJ8DFI+rvnMBIcDpbeLsGkZAmxFIZCiI33e
|
||||
ieKIJyCdPEgBA+hz7RK3Hi7sQWdKgZILDsVuT9mUQlHgQWsohpnuCvZYdCOAFIHAI/RK
|
||||
lbjg==
|
||||
X-Gm-Message-State: APjAAAV3AN3eAp5IKWxxBay0ZTJknz5Mc1WZ+95+Xsnj5JpxngNPrUWg
|
||||
El3hLQb+aMhCtHfAe1nVWSc=
|
||||
X-Google-Smtp-Source: APXvYqzYkDB7SE8lunA3rRIRTpj90F7DGCbF2B95IgKftA+fSdoxrEfuAazokN+CbP57SXacBYGCSA==
|
||||
X-Received: by 2002:a67:f84e:: with SMTP id
|
||||
b14mr23964564vsp.126.1575970393704;
|
||||
Tue, 10 Dec 2019 01:33:13 -0800 (PST)
|
||||
Received: from fabio-Latitude-E5450.nxp.com ([2804:14c:482:5bb::1])
|
||||
by smtp.gmail.com with ESMTPSA id
|
||||
k192sm1820253vke.40.2019.12.10.01.33.10
|
||||
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
|
||||
Tue, 10 Dec 2019 01:33:13 -0800 (PST)
|
||||
From: Fabio Estevam <festevam@gmail.com>
|
||||
To: sbabic@denx.de
|
||||
Subject: [PATCH v3 2/2] wandboard: Remove repeated PMIC string
|
||||
Date: Tue, 10 Dec 2019 06:33:00 -0300
|
||||
Message-Id: <20191210093300.31692-2-festevam@gmail.com>
|
||||
X-Mailer: git-send-email 2.17.1
|
||||
In-Reply-To: <20191210093300.31692-1-festevam@gmail.com>
|
||||
References: <20191210093300.31692-1-festevam@gmail.com>
|
||||
X-BeenThere: u-boot@lists.denx.de
|
||||
X-Mailman-Version: 2.1.26
|
||||
Precedence: list
|
||||
List-Id: U-Boot discussion <u-boot.lists.denx.de>
|
||||
List-Unsubscribe: <https://lists.denx.de/options/u-boot>,
|
||||
<mailto:u-boot-request@lists.denx.de?subject=unsubscribe>
|
||||
List-Archive: <https://lists.denx.de/pipermail/u-boot/>
|
||||
List-Post: <mailto:u-boot@lists.denx.de>
|
||||
List-Help: <mailto:u-boot-request@lists.denx.de?subject=help>
|
||||
List-Subscribe: <https://lists.denx.de/listinfo/u-boot>,
|
||||
<mailto:u-boot-request@lists.denx.de?subject=subscribe>
|
||||
Cc: u-boot@lists.denx.de, uboot-imx@nxp.com, trini@konsulko.com
|
||||
Errors-To: u-boot-bounces@lists.denx.de
|
||||
Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
|
||||
X-Virus-Scanned: clamav-milter 0.101.4 at phobos.denx.de
|
||||
X-Virus-Status: Clean
|
||||
|
||||
After the conversion to DM_PMIC the following output is seen:
|
||||
|
||||
PMIC: PMIC: PFUZE100 ID=0x10
|
||||
|
||||
Remove the unnecessary PMIC string from the board file to
|
||||
avoid the repetead string.
|
||||
|
||||
Signed-off-by: Fabio Estevam <festevam@gmail.com>
|
||||
---
|
||||
Changes since v2:
|
||||
- None
|
||||
|
||||
board/wandboard/wandboard.c | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/board/wandboard/wandboard.c b/board/wandboard/wandboard.c
|
||||
index 7209cc8211..e386ad2cc1 100644
|
||||
--- a/board/wandboard/wandboard.c
|
||||
+++ b/board/wandboard/wandboard.c
|
||||
@@ -361,8 +361,6 @@ int power_init_board(void)
|
||||
struct udevice *dev;
|
||||
int reg, ret;
|
||||
|
||||
- puts("PMIC: ");
|
||||
-
|
||||
ret = pmic_get("pfuze100@8", &dev);
|
||||
if (ret < 0) {
|
||||
printf("pmic_get() ret %d\n", ret);
|
||||
|
|
@ -1,286 +0,0 @@
|
|||
From patchwork Thu Dec 5 08:46:57 2019
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
X-Patchwork-Submitter: Michal Simek <michal.simek@xilinx.com>
|
||||
X-Patchwork-Id: 1204536
|
||||
Return-Path: <u-boot-bounces@lists.denx.de>
|
||||
X-Original-To: incoming@patchwork.ozlabs.org
|
||||
Delivered-To: patchwork-incoming@bilbo.ozlabs.org
|
||||
Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized)
|
||||
smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61;
|
||||
helo=phobos.denx.de;
|
||||
envelope-from=u-boot-bounces@lists.denx.de;
|
||||
receiver=<UNKNOWN>)
|
||||
Authentication-Results: ozlabs.org;
|
||||
dmarc=none (p=none dis=none) header.from=xilinx.com
|
||||
Authentication-Results: ozlabs.org;
|
||||
dkim=fail reason="signature verification failed" (2048-bit key;
|
||||
unprotected) header.d=monstr-eu.20150623.gappssmtp.com
|
||||
header.i=@monstr-eu.20150623.gappssmtp.com
|
||||
header.b="F7yFmrcr"; dkim-atps=neutral
|
||||
Received: from phobos.denx.de (phobos.denx.de [85.214.62.61])
|
||||
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
|
||||
key-exchange X25519 server-signature RSA-PSS (4096 bits))
|
||||
(No client certificate requested)
|
||||
by ozlabs.org (Postfix) with ESMTPS id 47T8mj1rxFz9sPT
|
||||
for <incoming@patchwork.ozlabs.org>;
|
||||
Thu, 5 Dec 2019 19:59:49 +1100 (AEDT)
|
||||
Received: by phobos.denx.de (Postfix, from userid 109)
|
||||
id DC15F81730; Thu, 5 Dec 2019 09:59:15 +0100 (CET)
|
||||
X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mail.denx.de
|
||||
X-Spam-Level:
|
||||
X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED,
|
||||
MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS,
|
||||
URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2
|
||||
Received: from phobos.denx.de (localhost [IPv6:::1])
|
||||
by phobos.denx.de (Postfix) with ESMTP id AD3C281702;
|
||||
Thu, 5 Dec 2019 09:47:37 +0100 (CET)
|
||||
Authentication-Results: mail.denx.de;
|
||||
dmarc=none (p=none dis=none) header.from=xilinx.com
|
||||
Authentication-Results: mail.denx.de;
|
||||
spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de
|
||||
Authentication-Results: mail.denx.de;
|
||||
dkim=fail reason="signature verification failed" (2048-bit key;
|
||||
unprotected) header.d=monstr-eu.20150623.gappssmtp.com
|
||||
header.i=@monstr-eu.20150623.gappssmtp.com
|
||||
header.b="F7yFmrcr"; dkim-atps=neutral
|
||||
Received: by phobos.denx.de (Postfix, from userid 109)
|
||||
id EFEE0816D6; Thu, 5 Dec 2019 09:47:35 +0100 (CET)
|
||||
Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com
|
||||
[209.85.128.68])
|
||||
(using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits))
|
||||
(No client certificate requested)
|
||||
by phobos.denx.de (Postfix) with ESMTPS id 13F3481702
|
||||
for <u-boot@lists.denx.de>; Thu, 5 Dec 2019 09:47:05 +0100 (CET)
|
||||
Authentication-Results: mail.denx.de;
|
||||
dmarc=none (p=none dis=none) header.from=xilinx.com
|
||||
Authentication-Results: mail.denx.de; spf=none smtp.mailfrom=monstr@monstr.eu
|
||||
Received: by mail-wm1-f68.google.com with SMTP id p9so2672948wmc.2
|
||||
for <u-boot@lists.denx.de>; Thu, 05 Dec 2019 00:47:05 -0800 (PST)
|
||||
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
|
||||
d=monstr-eu.20150623.gappssmtp.com; s=20150623;
|
||||
h=sender:from:to:cc:subject:date:message-id:mime-version
|
||||
:content-transfer-encoding;
|
||||
bh=zKC9njDJvxTe218gXlGDt/iSWcQwlzyEn/MHFrB1GUk=;
|
||||
b=F7yFmrcrJYGseyeuyhzqQujaDM8FvSqw3O1Pfmlh+SK6+tZ7BLQ6+XIDpi5DQAIzHs
|
||||
9Oe0co+RlaN+ypuEKw69o+zmaAHwbQoupL2LBoVJkAcVDseWpjatJtapzpyfUVqhfUaw
|
||||
XRFXuVzSyRx64eELCzcR7Hl5ioK9Q7Y/tjvV07IHac4Uc8N0N/LS66Rj/49Reo4DGIhT
|
||||
ThR6PDhriY0ANIDa8KnxQpQBiMuSuC4lTz3BuDMM/7LbS4r7Yy89EC+4wwXE4ZzXYAsO
|
||||
Kykj/rvg7d+BW8O1g3bxbDQVy/5IVDqslArlUH6xZpNOKDxwfLAvkAIvQiV/YJlNC1hQ
|
||||
f+OQ==
|
||||
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
|
||||
d=1e100.net; s=20161025;
|
||||
h=x-gm-message-state:sender:from:to:cc:subject:date:message-id
|
||||
:mime-version:content-transfer-encoding;
|
||||
bh=zKC9njDJvxTe218gXlGDt/iSWcQwlzyEn/MHFrB1GUk=;
|
||||
b=W2HsrghOni524RBbGxTnERtM2TNSUjmMhNi98cPFIy39d+LzzF1vxLBvF16jtovKsF
|
||||
DVYBg8lVrIEeaD1/XjcNmN7mk4LdWuwBnhUpAEVSQ3ccrxqMGSAud4vaduMo2czlBNWq
|
||||
m85KtYJctifHGMThcX9fwwr3+VmZIZ46ZUyXVuGSEqr7lZK/Nrnn7dH+v5hfYR60KhtI
|
||||
1yxf6vkuoC+Z89WfQGiM2JMCnlmVy7ety6+s6b1PYRyf1FQbt4MmZ4ywRAfSuAtY4NUD
|
||||
XmDp+8lDrpa08LjlJxBbKqeKS+Eeh2pKDkOwInuxWiLDOgZ7fAT3LG5Uq+1GDGbNfKs9
|
||||
xtlA==
|
||||
X-Gm-Message-State: APjAAAUFPoTdro6+fDkKW4xky4+l2r/NtdDEuEaU72qNICk1Wlu+706B
|
||||
tYlmosjzcX01d6VDfvz1eDIGZy20ca8=
|
||||
X-Google-Smtp-Source: APXvYqzdmCVgU6CmN6exvPPKe9MZLPRPrinxyPtHvAnw7yyB3wd7uJyGYyFkZXVKepilUtZDhUtjHg==
|
||||
X-Received: by 2002:a7b:cc0c:: with SMTP id f12mr3835348wmh.5.1575535624294;
|
||||
Thu, 05 Dec 2019 00:47:04 -0800 (PST)
|
||||
Received: from localhost (nat-35.starnet.cz. [178.255.168.35])
|
||||
by smtp.gmail.com with ESMTPSA id
|
||||
a7sm11805025wrr.50.2019.12.05.00.47.03
|
||||
(version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);
|
||||
Thu, 05 Dec 2019 00:47:03 -0800 (PST)
|
||||
From: Michal Simek <michal.simek@xilinx.com>
|
||||
To: u-boot@lists.denx.de,
|
||||
git@xilinx.com,
|
||||
pbrobinson@gmail.com
|
||||
Subject: [PATCH v2] arm64: zynqmp: Add support for u-boot.itb generation with
|
||||
ATF
|
||||
Date: Thu, 5 Dec 2019 09:46:57 +0100
|
||||
Message-Id: <311b20ae349e6a93714c227df5907667d1cb9463.1575535613.git.michal.simek@xilinx.com>
|
||||
X-Mailer: git-send-email 2.24.0
|
||||
MIME-Version: 1.0
|
||||
X-BeenThere: u-boot@lists.denx.de
|
||||
X-Mailman-Version: 2.1.26
|
||||
Precedence: list
|
||||
List-Id: U-Boot discussion <u-boot.lists.denx.de>
|
||||
List-Unsubscribe: <https://lists.denx.de/options/u-boot>,
|
||||
<mailto:u-boot-request@lists.denx.de?subject=unsubscribe>
|
||||
List-Archive: <https://lists.denx.de/pipermail/u-boot/>
|
||||
List-Post: <mailto:u-boot@lists.denx.de>
|
||||
List-Help: <mailto:u-boot-request@lists.denx.de?subject=help>
|
||||
List-Subscribe: <https://lists.denx.de/listinfo/u-boot>,
|
||||
<mailto:u-boot-request@lists.denx.de?subject=subscribe>
|
||||
Cc: Marek Vasut <marex@denx.de>, Stefan Roese <sr@denx.de>
|
||||
Errors-To: u-boot-bounces@lists.denx.de
|
||||
Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
|
||||
X-Virus-Scanned: clamav-milter 0.101.4 at mail.denx.de
|
||||
X-Virus-Status: Clean
|
||||
|
||||
Follow i.MX, Sunxi, RISC-V and Rockchip to generate u-boot.itb which
|
||||
includes U-Boot proper, ATF and DTBs in FIT format. ZynqMP supports FIT for
|
||||
quite a long time but with using out of tree solution. The patch is filling
|
||||
this gap.
|
||||
|
||||
Tested on zcu102, zcu104 and zcu100/Ultra96.
|
||||
|
||||
zcu100/Ultra96 v2.2 ATF build by:
|
||||
make DEBUG=0 ZYNQMP_CONSOLE=cadence1 RESET_TO_BL31=1 PLAT=zynqmp bl31
|
||||
|
||||
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
|
||||
---
|
||||
|
||||
Changes in v2:
|
||||
- Exchange u-boot/atf in config section
|
||||
- Use default ATF baseaddr from mainline
|
||||
- Update commit message
|
||||
|
||||
Kconfig | 3 +-
|
||||
arch/arm/mach-zynqmp/mkimage_fit_atf.sh | 99 +++++++++++++++++++++++++
|
||||
include/configs/xilinx_zynqmp.h | 6 +-
|
||||
3 files changed, 106 insertions(+), 2 deletions(-)
|
||||
create mode 100755 arch/arm/mach-zynqmp/mkimage_fit_atf.sh
|
||||
|
||||
diff --git a/Kconfig b/Kconfig
|
||||
index e22417ec4471..7efafffec0a4 100644
|
||||
--- a/Kconfig
|
||||
+++ b/Kconfig
|
||||
@@ -253,7 +253,7 @@ config BUILD_TARGET
|
||||
default "u-boot-spl.kwb" if ARCH_MVEBU && SPL
|
||||
default "u-boot-elf.srec" if RCAR_GEN3
|
||||
default "u-boot.itb" if SPL_LOAD_FIT && (ARCH_ROCKCHIP || \
|
||||
- ARCH_SUNXI || RISCV)
|
||||
+ ARCH_SUNXI || RISCV || ARCH_ZYNQMP)
|
||||
default "u-boot.kwb" if KIRKWOOD
|
||||
default "u-boot-with-spl.bin" if ARCH_AT91 && SPL_NAND_SUPPORT
|
||||
default "u-boot-with-spl.imx" if ARCH_MX6 && SPL
|
||||
@@ -481,6 +481,7 @@ config SPL_FIT_GENERATOR
|
||||
depends on SPL_FIT
|
||||
default "board/sunxi/mksunxi_fit_atf.sh" if SPL_LOAD_FIT && ARCH_SUNXI
|
||||
default "arch/arm/mach-rockchip/make_fit_atf.py" if SPL_LOAD_FIT && ARCH_ROCKCHIP
|
||||
+ default "arch/arm/mach-zynqmp/mkimage_fit_atf.sh" if SPL_LOAD_FIT && ARCH_ZYNQMP
|
||||
default "arch/riscv/lib/mkimage_fit_opensbi.sh" if SPL_LOAD_FIT && RISCV
|
||||
help
|
||||
Specifies a (platform specific) script file to generate the FIT
|
||||
diff --git a/arch/arm/mach-zynqmp/mkimage_fit_atf.sh b/arch/arm/mach-zynqmp/mkimage_fit_atf.sh
|
||||
new file mode 100755
|
||||
index 000000000000..c50aba45ca5c
|
||||
--- /dev/null
|
||||
+++ b/arch/arm/mach-zynqmp/mkimage_fit_atf.sh
|
||||
@@ -0,0 +1,99 @@
|
||||
+#!/bin/sh
|
||||
+# SPDX-License-Identifier: GPL-2.0+
|
||||
+#
|
||||
+# script to generate FIT image source for Xilinx ZynqMP boards with
|
||||
+# ARM Trusted Firmware and multiple device trees (given on the command line)
|
||||
+#
|
||||
+# usage: $0 <dt_name> [<dt_name> [<dt_name] ...]
|
||||
+
|
||||
+BL33="u-boot-nodtb.bin"
|
||||
+[ -z "$BL31" ] && BL31="bl31.bin"
|
||||
+[ -z "$ATF_LOAD_ADDR" ] && ATF_LOAD_ADDR="0xfffea000"
|
||||
+[ -z "$BL33_LOAD_ADDR" ] && BL33_LOAD_ADDR="0x8000000"
|
||||
+
|
||||
+if [ ! -f $BL31 ]; then
|
||||
+ echo "ERROR: BL31 file $BL31 NOT found" >&2
|
||||
+else
|
||||
+ echo "$BL31 size: " >&2
|
||||
+ ls -lct $BL31 | awk '{print $5}' >&2
|
||||
+fi
|
||||
+
|
||||
+
|
||||
+
|
||||
+cat << __HEADER_EOF
|
||||
+/dts-v1/;
|
||||
+
|
||||
+/ {
|
||||
+ description = "Configuration to load ATF before U-Boot";
|
||||
+
|
||||
+ images {
|
||||
+ uboot {
|
||||
+ description = "U-Boot (64-bit)";
|
||||
+ data = /incbin/("$BL33");
|
||||
+ type = "firmware";
|
||||
+ os = "u-boot";
|
||||
+ arch = "arm64";
|
||||
+ compression = "none";
|
||||
+ load = <$BL33_LOAD_ADDR>;
|
||||
+ hash {
|
||||
+ algo = "md5";
|
||||
+ };
|
||||
+ };
|
||||
+ atf {
|
||||
+ description = "ARM Trusted Firmware";
|
||||
+ data = /incbin/("$BL31");
|
||||
+ type = "firmware";
|
||||
+ os = "arm-trusted-firmware";
|
||||
+ arch = "arm64";
|
||||
+ compression = "none";
|
||||
+ load = <$ATF_LOAD_ADDR>;
|
||||
+ entry = <$ATF_LOAD_ADDR>;
|
||||
+ hash {
|
||||
+ algo = "md5";
|
||||
+ };
|
||||
+ };
|
||||
+__HEADER_EOF
|
||||
+
|
||||
+cnt=1
|
||||
+for dtname in $*
|
||||
+do
|
||||
+ cat << __FDT_IMAGE_EOF
|
||||
+ fdt_$cnt {
|
||||
+ description = "$(basename $dtname .dtb)";
|
||||
+ data = /incbin/("$dtname");
|
||||
+ type = "flat_dt";
|
||||
+ arch = "arm64";
|
||||
+ compression = "none";
|
||||
+ hash {
|
||||
+ algo = "md5";
|
||||
+ };
|
||||
+ };
|
||||
+__FDT_IMAGE_EOF
|
||||
+cnt=$((cnt+1))
|
||||
+done
|
||||
+
|
||||
+cat << __CONF_HEADER_EOF
|
||||
+ };
|
||||
+ configurations {
|
||||
+ default = "config_1";
|
||||
+
|
||||
+__CONF_HEADER_EOF
|
||||
+
|
||||
+cnt=1
|
||||
+for dtname in $*
|
||||
+do
|
||||
+cat << __CONF_SECTION1_EOF
|
||||
+ config_$cnt {
|
||||
+ description = "$(basename $dtname .dtb)";
|
||||
+ firmware = "atf";
|
||||
+ loadables = "uboot";
|
||||
+ fdt = "fdt_$cnt";
|
||||
+ };
|
||||
+__CONF_SECTION1_EOF
|
||||
+cnt=$((cnt+1))
|
||||
+done
|
||||
+
|
||||
+cat << __ITS_EOF
|
||||
+ };
|
||||
+};
|
||||
+__ITS_EOF
|
||||
diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
|
||||
index ee1ceebf1291..e7eb8dbfcb45 100644
|
||||
--- a/include/configs/xilinx_zynqmp.h
|
||||
+++ b/include/configs/xilinx_zynqmp.h
|
||||
@@ -243,7 +243,11 @@
|
||||
# define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0 /* unused */
|
||||
# define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 0 /* unused */
|
||||
# define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR 0 /* unused */
|
||||
-# define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"
|
||||
+# if defined(CONFIG_SPL_LOAD_FIT)
|
||||
+# define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.itb"
|
||||
+# else
|
||||
+# define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"
|
||||
+# endif
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_DFU)
|
||||
|
|
@ -1,199 +0,0 @@
|
|||
From patchwork Tue Dec 3 15:33:26 2019
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
X-Patchwork-Submitter: Michal Simek <michal.simek@xilinx.com>
|
||||
X-Patchwork-Id: 1203761
|
||||
Return-Path: <u-boot-bounces@lists.denx.de>
|
||||
X-Original-To: incoming@patchwork.ozlabs.org
|
||||
Delivered-To: patchwork-incoming@bilbo.ozlabs.org
|
||||
Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized)
|
||||
smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61;
|
||||
helo=phobos.denx.de;
|
||||
envelope-from=u-boot-bounces@lists.denx.de;
|
||||
receiver=<UNKNOWN>)
|
||||
Authentication-Results: ozlabs.org;
|
||||
dmarc=none (p=none dis=none) header.from=xilinx.com
|
||||
Authentication-Results: ozlabs.org;
|
||||
dkim=fail reason="signature verification failed" (2048-bit key;
|
||||
unprotected) header.d=monstr-eu.20150623.gappssmtp.com
|
||||
header.i=@monstr-eu.20150623.gappssmtp.com
|
||||
header.b="xsfGCcKd"; dkim-atps=neutral
|
||||
Received: from phobos.denx.de (phobos.denx.de [85.214.62.61])
|
||||
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
|
||||
key-exchange X25519 server-signature RSA-PSS (4096 bits))
|
||||
(No client certificate requested)
|
||||
by ozlabs.org (Postfix) with ESMTPS id 47S60l4q2Xz9sP6
|
||||
for <incoming@patchwork.ozlabs.org>;
|
||||
Wed, 4 Dec 2019 02:51:35 +1100 (AEDT)
|
||||
Received: by phobos.denx.de (Postfix, from userid 109)
|
||||
id 918E181706; Tue, 3 Dec 2019 16:51:32 +0100 (CET)
|
||||
X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mail.denx.de
|
||||
X-Spam-Level:
|
||||
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED,
|
||||
MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS,
|
||||
URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2
|
||||
Received: from phobos.denx.de (localhost [IPv6:::1])
|
||||
by phobos.denx.de (Postfix) with ESMTP id CFCEB81715;
|
||||
Tue, 3 Dec 2019 16:34:34 +0100 (CET)
|
||||
Authentication-Results: mail.denx.de;
|
||||
dmarc=none (p=none dis=none) header.from=xilinx.com
|
||||
Authentication-Results: mail.denx.de;
|
||||
spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de
|
||||
Authentication-Results: mail.denx.de;
|
||||
dkim=fail reason="signature verification failed" (2048-bit key;
|
||||
unprotected) header.d=monstr-eu.20150623.gappssmtp.com
|
||||
header.i=@monstr-eu.20150623.gappssmtp.com
|
||||
header.b="xsfGCcKd"; dkim-atps=neutral
|
||||
Received: by phobos.denx.de (Postfix, from userid 109)
|
||||
id 71E9081740; Tue, 3 Dec 2019 16:34:33 +0100 (CET)
|
||||
Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com
|
||||
[209.85.221.68])
|
||||
(using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits))
|
||||
(No client certificate requested)
|
||||
by phobos.denx.de (Postfix) with ESMTPS id 3B4538173D
|
||||
for <u-boot@lists.denx.de>; Tue, 3 Dec 2019 16:33:29 +0100 (CET)
|
||||
Authentication-Results: mail.denx.de;
|
||||
dmarc=none (p=none dis=none) header.from=xilinx.com
|
||||
Authentication-Results: mail.denx.de; spf=none smtp.mailfrom=monstr@monstr.eu
|
||||
Received: by mail-wr1-f68.google.com with SMTP id y11so4206551wrt.6
|
||||
for <u-boot@lists.denx.de>; Tue, 03 Dec 2019 07:33:29 -0800 (PST)
|
||||
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
|
||||
d=monstr-eu.20150623.gappssmtp.com; s=20150623;
|
||||
h=sender:from:to:subject:date:message-id:mime-version
|
||||
:content-transfer-encoding;
|
||||
bh=FY3wavUSlq3LqJpduWDlDfRQ23fa0sS7k2hYmp1W4v4=;
|
||||
b=xsfGCcKdlKNSq7/5D1KjuXn2SIyh08im6EI3N/tLYCXIe2AMeGGcrFJgXbwKrFcmW5
|
||||
cJ3I6vxbLI6lLb9+Y1Qn3I86If7jjs3FMfcwupdbEevBO178wLgaSTVGTkJZx6nLP38s
|
||||
vyzBYOZ7rDRdARwPKqUaEjNBnjXj6cLSF6vSlcOYsClRq5AOQjtmMjCg5Spnh3vL6C6S
|
||||
Uw7A4ec8egIepK0I8wWcVKDCrz7BzKzPkMkA8TwrM9MyudwHdyLkSOv/K1drj9r7Bxle
|
||||
++0OBo+6nbg4VSJrS3J1BOqSVTru8AQmqlEklfil0A8vfrKUF9BAV0z6yrU6oDOvxmb7
|
||||
oBGQ==
|
||||
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
|
||||
d=1e100.net; s=20161025;
|
||||
h=x-gm-message-state:sender:from:to:subject:date:message-id
|
||||
:mime-version:content-transfer-encoding;
|
||||
bh=FY3wavUSlq3LqJpduWDlDfRQ23fa0sS7k2hYmp1W4v4=;
|
||||
b=HFOn3PHDfuhrO27I3b9eZtbbFdyMus2JuR88KxfnfeovLmu3VzD2GO2k1v0bbfJrFJ
|
||||
3FUyyRMSjuTa8/xEaL/XB7Abmtw35VxtO9rcxq4Xbb5d8zi8tQVrpX63zzQZE1+hGfp1
|
||||
Zc0EL6lV2d1U2XkHCiPrSDySeUrfGohM7pNRrdLk0x5+dlsHuaX5r2PGWfnzkIsT9xhj
|
||||
+hPttUIHpgVXxS6xId42gcSLku1BHdCebYIs8ro3A4Ewu2xCdqyjLBctfWKtCcyvt3AY
|
||||
1a/nuS9rgJ3nlFwxKtv340qv/UCp/3W0U3JbYG6Cnc6DvKq72eOPuqnPnyjDa1VQAlZA
|
||||
q6gA==
|
||||
X-Gm-Message-State: APjAAAV9fDxe7+YuhbTRQ7FQZxhVH1IaMTTvFGz12nutmEBO1FHu5PVR
|
||||
RmfQmTY6L3fXPK4lQ+WtrOep+s2H8w4Weg==
|
||||
X-Google-Smtp-Source: APXvYqxj+/69azSDe/nIwdR/hsgHatKZBL8p8CGOPp1Hku4BlIp/V3L90lAwr5VQJtUY+c5KmukFLQ==
|
||||
X-Received: by 2002:adf:dc86:: with SMTP id r6mr6287782wrj.68.1575387208549;
|
||||
Tue, 03 Dec 2019 07:33:28 -0800 (PST)
|
||||
Received: from localhost (nat-35.starnet.cz. [178.255.168.35])
|
||||
by smtp.gmail.com with ESMTPSA id
|
||||
h17sm4245700wrs.18.2019.12.03.07.33.27
|
||||
(version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);
|
||||
Tue, 03 Dec 2019 07:33:27 -0800 (PST)
|
||||
From: Michal Simek <michal.simek@xilinx.com>
|
||||
To: u-boot@lists.denx.de,
|
||||
git@xilinx.com,
|
||||
pbrobinson@gmail.com
|
||||
Subject: [PATCH v2] arm64: zynqmp: Do not assing MIO34 that early on zcu100
|
||||
Date: Tue, 3 Dec 2019 16:33:26 +0100
|
||||
Message-Id: <175608f69633f3876bebdde1c2f7b9cf54b61716.1575387200.git.michal.simek@xilinx.com>
|
||||
X-Mailer: git-send-email 2.24.0
|
||||
MIME-Version: 1.0
|
||||
X-BeenThere: u-boot@lists.denx.de
|
||||
X-Mailman-Version: 2.1.26
|
||||
Precedence: list
|
||||
List-Id: U-Boot discussion <u-boot.lists.denx.de>
|
||||
List-Unsubscribe: <https://lists.denx.de/options/u-boot>,
|
||||
<mailto:u-boot-request@lists.denx.de?subject=unsubscribe>
|
||||
List-Archive: <https://lists.denx.de/pipermail/u-boot/>
|
||||
List-Post: <mailto:u-boot@lists.denx.de>
|
||||
List-Help: <mailto:u-boot-request@lists.denx.de?subject=help>
|
||||
List-Subscribe: <https://lists.denx.de/listinfo/u-boot>,
|
||||
<mailto:u-boot-request@lists.denx.de?subject=subscribe>
|
||||
Errors-To: u-boot-bounces@lists.denx.de
|
||||
Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
|
||||
X-Virus-Scanned: clamav-milter 0.101.4 at mail.denx.de
|
||||
X-Virus-Status: Clean
|
||||
|
||||
MIO34 is connected to POWER_KILL signal. When MIO configuration is done in
|
||||
psu_init() and this pin is assigned to PMU but PMU configuration is not
|
||||
loaded yet. PMU gpio output is high that means board is powered off
|
||||
immediately.
|
||||
The patch is fixing this sequence that MIO34 stays assing to ps gpio IP.
|
||||
PMU config is loaded in SPL and then pin assigned to PMU through
|
||||
psu_post_config_data().
|
||||
|
||||
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
|
||||
---
|
||||
|
||||
Changes in v2:
|
||||
- add missing declaration in header
|
||||
|
||||
arch/arm/mach-zynqmp/include/mach/psu_init_gpl.h | 1 +
|
||||
arch/arm/mach-zynqmp/psu_spl_init.c | 9 +++++++++
|
||||
arch/arm/mach-zynqmp/spl.c | 1 +
|
||||
board/xilinx/zynqmp/zynqmp-zcu100-revC/psu_init_gpl.c | 7 ++++++-
|
||||
4 files changed, 17 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch/arm/mach-zynqmp/include/mach/psu_init_gpl.h b/arch/arm/mach-zynqmp/include/mach/psu_init_gpl.h
|
||||
index 15e54c049387..e37acda2f89e 100644
|
||||
--- a/arch/arm/mach-zynqmp/include/mach/psu_init_gpl.h
|
||||
+++ b/arch/arm/mach-zynqmp/include/mach/psu_init_gpl.h
|
||||
@@ -21,5 +21,6 @@ void prog_reg(unsigned long addr, unsigned long mask,
|
||||
unsigned long shift, unsigned long value);
|
||||
|
||||
int psu_init(void);
|
||||
+unsigned long psu_post_config_data(void);
|
||||
|
||||
#endif /* _PSU_INIT_GPL_H_ */
|
||||
diff --git a/arch/arm/mach-zynqmp/psu_spl_init.c b/arch/arm/mach-zynqmp/psu_spl_init.c
|
||||
index b357de32358c..b6abdfd608ee 100644
|
||||
--- a/arch/arm/mach-zynqmp/psu_spl_init.c
|
||||
+++ b/arch/arm/mach-zynqmp/psu_spl_init.c
|
||||
@@ -77,3 +77,12 @@ __weak int psu_init(void)
|
||||
*/
|
||||
return -1;
|
||||
}
|
||||
+
|
||||
+__weak unsigned long psu_post_config_data(void)
|
||||
+{
|
||||
+ /*
|
||||
+ * This function is overridden by the one in
|
||||
+ * board/xilinx/zynqmp/(platform)/psu_init_gpl.c, if it exists.
|
||||
+ */
|
||||
+ return 0;
|
||||
+}
|
||||
diff --git a/arch/arm/mach-zynqmp/spl.c b/arch/arm/mach-zynqmp/spl.c
|
||||
index 6ba42bb42f62..6551b33f42d0 100644
|
||||
--- a/arch/arm/mach-zynqmp/spl.c
|
||||
+++ b/arch/arm/mach-zynqmp/spl.c
|
||||
@@ -60,6 +60,7 @@ void spl_board_init(void)
|
||||
preloader_console_init();
|
||||
ps_mode_reset(MODE_RESET);
|
||||
board_init();
|
||||
+ psu_post_config_data();
|
||||
}
|
||||
#endif
|
||||
|
||||
diff --git a/board/xilinx/zynqmp/zynqmp-zcu100-revC/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zcu100-revC/psu_init_gpl.c
|
||||
index e1fdabaeb9d1..585b3afc218a 100644
|
||||
--- a/board/xilinx/zynqmp/zynqmp-zcu100-revC/psu_init_gpl.c
|
||||
+++ b/board/xilinx/zynqmp/zynqmp-zcu100-revC/psu_init_gpl.c
|
||||
@@ -409,7 +409,6 @@ static unsigned long psu_mio_init_data(void)
|
||||
psu_mask_write(0xFF18007C, 0x000000FEU, 0x00000000U);
|
||||
psu_mask_write(0xFF180080, 0x000000FEU, 0x00000008U);
|
||||
psu_mask_write(0xFF180084, 0x000000FEU, 0x00000008U);
|
||||
- psu_mask_write(0xFF180088, 0x000000FEU, 0x00000008U);
|
||||
psu_mask_write(0xFF18008C, 0x000000FEU, 0x00000000U);
|
||||
psu_mask_write(0xFF180090, 0x000000FEU, 0x00000000U);
|
||||
psu_mask_write(0xFF180094, 0x000000FEU, 0x00000000U);
|
||||
@@ -990,3 +989,9 @@ int psu_init(void)
|
||||
return 1;
|
||||
return 0;
|
||||
}
|
||||
+
|
||||
+unsigned long psu_post_config_data(void)
|
||||
+{
|
||||
+ psu_mask_write(0xFF180088, 0x000000FEU, 0x00000008U);
|
||||
+ return 0;
|
||||
+}
|
||||
Loading…
Reference in New Issue