From patchwork Thu Dec 19 17:00:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 1213560 X-Patchwork-Delegate: trini@ti.com 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; 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="Bbf6hyMp"; 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 47dymx4D6Qz9sPc for ; Fri, 20 Dec 2019 04:00:32 +1100 (AEDT) Received: from phobos.denx.de (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B1A12814C4; Thu, 19 Dec 2019 18:00:26 +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="Bbf6hyMp"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8601E814EE; Thu, 19 Dec 2019 18:00:24 +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.0 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) (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 EE48C814C4 for ; Thu, 19 Dec 2019 18:00:20 +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-wm1-x344.google.com with SMTP id t14so6374836wmi.5 for ; Thu, 19 Dec 2019 09:00:20 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=5ya0pSY0tRvAxlSOdNXv/nmIc9HZsxbs5thuSZv15Ng=; b=Bbf6hyMpTHLMYJw7sclGKZKYSdGCqiFEBQ5pwSGvHthLaMfix9oIGbZxOz12/zlC06 +8eeiL3rL0hLtK7qhFZvdg77SneFdHjlVTQnABOnA58OQAC0AqDQMEmjQk1yz7jv22Re 9PBBCMdil9uJWzqqIYhnKnlCY8HwjdtXRO+ALWJK45b4iVfWL8IiVTxnrvaiC5Z2DMyT rcTPlRrYD59P9QfHKA59rn1YlMkvgJQuD9p4mYou0F0x00pLhtd63IF172UcCfLvg4Dh 2SjC0pQDTg8zcDvNOoOlkh6yU6dldt1lSIZ0tZfqfkQ4MJ5SL4dvYwxrOhb/wfRiWVJZ oDMQ== 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 :in-reply-to:references:mime-version:content-transfer-encoding; bh=5ya0pSY0tRvAxlSOdNXv/nmIc9HZsxbs5thuSZv15Ng=; b=I0Kgs41Gn00Rgag3A5Il9YEMRunO0COqeIoBKWvBlinf30zkAZD69OYmEdpE8qYCJW 6376X/FUbTDRvgKMGxCQbR3uHHCfIi7rxlrW/Hn4biFJAHk1IAhpiG38WZldetvEIfKa CYRhYUOjeLG8q4nEgJ+rNPlJUujK5BEuy32rcgsKRFov2XnWcghZdzIUQliRiaxLTCn+ my3+iwnZS0IzL0QjqRFlC+JH8vRHOyQTBOOo/Q/RBic2MFL6A8Aaa4zOwR17AeEr4Ef/ bST6XrCUBrz3U+Fa9eouZ+PUict9sy5QAs6QaoDY2f41YC9Sis+Q9zmbBKRJPzTS9oYz /8tA== X-Gm-Message-State: APjAAAUUoaba/mXvwng2xYAmL+Ugnu94NEqgOzUiMhKrAsYu+HAgbe47 NZGq1+7+gA6gxuk1lXk8GtUhriRKt/uDpg== X-Google-Smtp-Source: APXvYqwV1M3absZyDY9P44GPRtXMGY8Mmb5c98XyUV8Bc4Ay8shNhu0hiRu+bYCI1iGz9vhaHhqAFw== X-Received: by 2002:a1c:3d07:: with SMTP id k7mr11890940wma.79.1576774820214; Thu, 19 Dec 2019 09:00:20 -0800 (PST) Received: from localhost (nat-35.starnet.cz. [178.255.168.35]) by smtp.gmail.com with ESMTPSA id p15sm6700648wma.40.2019.12.19.09.00.18 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 19 Dec 2019 09:00:19 -0800 (PST) From: Michal Simek To: u-boot@lists.denx.de, git@xilinx.com Subject: [PATCH 1/2] arm64: zynqmp: Rename fw_dtb variable to fdt_blob Date: Thu, 19 Dec 2019 18:00:14 +0100 Message-Id: <9f9cefff358d8b0d6001d88914683a1330fdcbec.1576774810.git.michal.simek@xilinx.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.26 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ibai Erkiaga Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.101.4 at phobos.denx.de X-Virus-Status: Clean The reason for this change is just get in sync with board_fdt_blob_setup() available at lib/fdtdec.c. Signed-off-by: Michal Simek --- board/xilinx/common/board.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/board/xilinx/common/board.c b/board/xilinx/common/board.c index 1c28263cb889..62dafe0f9058 100644 --- a/board/xilinx/common/board.c +++ b/board/xilinx/common/board.c @@ -40,13 +40,13 @@ int zynq_board_read_rom_ethaddr(unsigned char *ethaddr) #if defined(CONFIG_OF_BOARD) void *board_fdt_blob_setup(void) { - static void *fw_dtb = (void *)CONFIG_XILINX_OF_BOARD_DTB_ADDR; + static void *fdt_blob = (void *)CONFIG_XILINX_OF_BOARD_DTB_ADDR; - if (fdt_magic(fw_dtb) != FDT_MAGIC) { - printf("DTB is not passed via %p\n", fw_dtb); + if (fdt_magic(fdt_blob) != FDT_MAGIC) { + printf("DTB is not passed via %p\n", fdt_blob); return NULL; } - return fw_dtb; + return fdt_blob; } #endif