From patchwork Tue Feb 2 12:40:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 1434616 X-Patchwork-Delegate: monstr@monstr.eu Return-Path: 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=) 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.a=rsa-sha256 header.s=20150623 header.b=iu2ICvuM; 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 4DVPYN2QL0z9sWX for ; Tue, 2 Feb 2021 23:40:29 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8A4FD801D8; Tue, 2 Feb 2021 13:40:15 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=xilinx.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=monstr-eu.20150623.gappssmtp.com header.i=@monstr-eu.20150623.gappssmtp.com header.b="iu2ICvuM"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E5F1D80404; Tue, 2 Feb 2021 13:40:13 +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=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) (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 629508006D for ; Tue, 2 Feb 2021 13:40:10 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=xilinx.com Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=monstr@monstr.eu Received: by mail-ej1-x62e.google.com with SMTP id a9so11338859ejr.2 for ; Tue, 02 Feb 2021 04:40:10 -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=dfkGX320tIHJ66WC+K5UHMOrgJnKqBfV3aACYY3Kvlk=; b=iu2ICvuM5uOmUVg1SzfCGcA7X2IjD68zfR35iJd2SH3bsjbJRN9wxwFO7SMXOFhH8c pBtWySRG9hZEJMb27N+5PLOA3JoPm+AXhOAQ1DXcjvhxz2uD4XnKSKeekqWDSV9gl/Tk v+Bkww4PAWbykrUPmiBVcDmQB8lNoFb0N9yn5cjJz89UZk0PK7JFqr7abTgQKoPbPZ79 W/GLqUs9VDB5wex/LoJCNB1kOKkh8R1TsPLWyOEDEfhTE0vFjl7V27sVjAnqJqeth+N8 yBrETSuKUM9T9IrPcvtgKiX0ETOlJe5W4e3P4AdpRjijR6YPPALEPsGpWYE7jX1oV29i I04w== 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=dfkGX320tIHJ66WC+K5UHMOrgJnKqBfV3aACYY3Kvlk=; b=dZnMzJfQNOig56nS4l2MBlCSn0UOExt9BGyXFaQ/RPle21K1Qh3njs9WRwOAjmHq3q CXJgpxjwUtp2sStm5zJw32b6qJ05P9RHAr5766brqUoipO+fzE+Cz4tM1ZIXxfmZm29V f02abcR3pYYpO2/8su9PWpS6RNh6Oo9NIFIJZbY+nRXgIlmBGiblNEGNnvVdi5X0iKq7 iImudnZMCx5/yM411gXCKv87We+MuMkAFpgFJsrYijAda+93xtz5+ro/1LNqmokC9YRq AqzbCMqzn992SllBmtbOolrg++mrI9xmdHBMIr2oheudhQfTI2TpUp8Zg2cTacrLxR76 Ls5g== X-Gm-Message-State: AOAM533906oLZtYxqwq3H13dUX6sLXkqJMxHJAwEUs6eMV7/3HWBEGvS IZkb2kOdq3qUp3adPhJwizet6Z1Ctg3w7BhW X-Google-Smtp-Source: ABdhPJw+Hr+GSC4fu88zCIOie+KAjBY1ugNtbW/rXmznASB6MMfYbQa6UaqJcxr8QN7tg5v2gZCkjQ== X-Received: by 2002:a17:906:bfcc:: with SMTP id us12mr21970173ejb.163.1612269609751; Tue, 02 Feb 2021 04:40:09 -0800 (PST) Received: from localhost (nat-35.starnet.cz. [178.255.168.35]) by smtp.gmail.com with ESMTPSA id qh13sm9444708ejb.33.2021.02.02.04.40.08 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 02 Feb 2021 04:40:09 -0800 (PST) From: Michal Simek To: u-boot@lists.denx.de, git@xilinx.com Subject: [PATCH] xilinx: common: Fix CONFIG_XILINX_OF_BOARD_DTB_ADDR handling for ZynqMP Date: Tue, 2 Feb 2021 13:40:04 +0100 Message-Id: <293ee42e0378ace583f78a93e60b15ab05a8eb79.1612269601.git.michal.simek@xilinx.com> X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean Fix bug introduced by commit listed below. It is for cases where Versal or ZynqMP don't have DDR mapped. Later SPL was also excluded by commit a672b9871b57 ("xilinx: common: Do not touch CONFIG_XILINX_OF_BOARD_DTB_ADDR in SPL"). Fixes: 506009fc1022 ("xilinx: common: Change macro handling in board_fdt_blob_setup()") Signed-off-by: Michal Simek --- board/xilinx/common/board.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/xilinx/common/board.c b/board/xilinx/common/board.c index 4df10bf18941..a2f2fde64b65 100644 --- a/board/xilinx/common/board.c +++ b/board/xilinx/common/board.c @@ -326,7 +326,7 @@ void *board_fdt_blob_setup(void) if (!IS_ENABLED(CONFIG_SPL_BUILD) && !IS_ENABLED(CONFIG_VERSAL_NO_DDR) && - !IS_ENABLED(CONFIG_VERSAL_NO_DDR)) { + !IS_ENABLED(CONFIG_ZYNQMP_NO_DDR)) { fdt_blob = (void *)CONFIG_XILINX_OF_BOARD_DTB_ADDR; if (fdt_magic(fdt_blob) == FDT_MAGIC)