From patchwork Thu Feb 13 13:53:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 1237491 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=85.214.62.61; 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.a=rsa-sha256 header.s=20150623 header.b=ec7TUIWY; 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 48JHzL4Vtfz9s3x for ; Fri, 14 Feb 2020 00:53:34 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id EA3DB81215; Thu, 13 Feb 2020 14:53:28 +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="ec7TUIWY"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7F0DC81225; Thu, 13 Feb 2020 14:53:27 +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,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) (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 516B981211 for ; Thu, 13 Feb 2020 14:53:24 +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-x342.google.com with SMTP id a6so6846945wme.2 for ; Thu, 13 Feb 2020 05:53:24 -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=4MCDzw/dmF5TLxP9bmboP+KBIzKaVIpJ1RvsM1ekYVs=; b=ec7TUIWYtAHzFIXt6dNm632aWX5UQkWXWt2mxxvbUVR/O9JGi5Ocok2mPMCAiVFfI9 e/tTXi1P6NBDhVq6+rTYDGFL0Dsj7u5zlIOasshL62eJaiFn7RteJHV1B16GVtGIbZBi zQkhqhlR745pT4pvNiakVvVzkOchTSxNjwqJesM9Gl7hpX3tuX8wy59twKmTflPPq+9q NCvuUNwL6tSlw2ZuZis3EFn29tw5bt5do+ArX4fOtv7lSR7MG+Kmzhx0MC/hAq65+rol NzJG2pgo6YNPioe1ihfYPbevHU3IqH8ORquntBV3K9Umz9W35ywwX57E5vi0toFbP7WA Wl+g== 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=4MCDzw/dmF5TLxP9bmboP+KBIzKaVIpJ1RvsM1ekYVs=; b=lMHJG4wJ1Z7VV/ld90vxGP1S2hOBaaNdOnMYDShbxqpwih/44pGjBNgu4u95zz5Aaq Uub/Z+EFCt9NSWqUvdLxJeRpJhFayOyn5ZRVxjHV7eGGgO6XZkVAVH2ENYGBdAbYjS9Q BSgNqhDYpK3B9iasu7GUDzidv4GYpTeLcx6vMjjomIsU/WKF2w3MAuzJntCfZ0/HB/xy 3uZJ4UX7tw9fOttyqi4VWoaDRR2JlCosV+KdxaUoxA5OPFA+K5H8L1IaOVz0o/DaZKbI TMuORQiH+tn4p2VdOW4BpK5Qb5VBu0TGBTMLcbUrqmT2yadC1NP1wr1PypPy4H0Nq/72 TWOA== X-Gm-Message-State: APjAAAXIVLQCSKfp2kFhZSC7GV4GOjJezKitm+mWh3JFzSiE95bVBWnz mxDgy9b0BXYbcAOA+RVH8KppBdmRfv9fgA== X-Google-Smtp-Source: APXvYqwNFue6ugx04/FqZw9o5hfPdQ8g+GuNe6zd94thdahMr29dTju93P28ITldraEN0hdW8gchng== X-Received: by 2002:a1c:1d13:: with SMTP id d19mr6286720wmd.163.1581602003523; Thu, 13 Feb 2020 05:53:23 -0800 (PST) Received: from localhost (nat-35.starnet.cz. [178.255.168.35]) by smtp.gmail.com with ESMTPSA id q130sm3420107wme.19.2020.02.13.05.53.22 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 13 Feb 2020 05:53:22 -0800 (PST) From: Michal Simek To: u-boot@lists.denx.de, git@xilinx.com Cc: Michal Simek Subject: [PATCH] arm: xilinx: Fill DEVICE_TREE directly in Makefiles Date: Thu, 13 Feb 2020 14:53:18 +0100 Message-Id: X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.1 at phobos.denx.de X-Virus-Status: Clean DEVICE_TREE variable is not exported from dts/Makefile that's why it is necessary to setup directly before use. Fixes: 312f2c5b14fa ("arm: xilinx: Use device tree which can be passed on cmd line") Signed-off-by: Michal Simek --- It was found by more intensive testing. Another option would be to move DEVICE_TREE setup from dts/Makefile to Makefile but I didn't find the right place for it. --- board/xilinx/zynq/Makefile | 5 +++++ board/xilinx/zynqmp/Makefile | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/board/xilinx/zynq/Makefile b/board/xilinx/zynq/Makefile index 6a2acee108fa..096a7aceb939 100644 --- a/board/xilinx/zynq/Makefile +++ b/board/xilinx/zynq/Makefile @@ -13,6 +13,11 @@ spl/board/xilinx/zynq/ps_init_gpl.o board/xilinx/zynq/ps_init_gpl.o: $(PS_INIT_F $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ endif +DEVICE_TREE ?= $(CONFIG_DEFAULT_DEVICE_TREE:"%"=%) +ifeq ($(DEVICE_TREE),) +DEVICE_TREE := unset +endif + ifeq ($(init-objs),) hw-platform-y :=$(shell echo $(DEVICE_TREE)) init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/ps7_init_gpl.c),\ diff --git a/board/xilinx/zynqmp/Makefile b/board/xilinx/zynqmp/Makefile index 174f4ed24be3..398c6aaa452a 100644 --- a/board/xilinx/zynqmp/Makefile +++ b/board/xilinx/zynqmp/Makefile @@ -13,6 +13,11 @@ spl/board/xilinx/zynqmp/ps_init_gpl.o board/xilinx/zynqmp/ps_init_gpl.o: $(PS_IN $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ endif +DEVICE_TREE ?= $(CONFIG_DEFAULT_DEVICE_TREE:"%"=%) +ifeq ($(DEVICE_TREE),) +DEVICE_TREE := unset +endif + ifeq ($(init-objs),) hw-platform-y :=$(shell echo $(DEVICE_TREE)) init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/psu_init_gpl.c),\