From patchwork Tue Dec 11 15:02:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 153474 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp716759ljp; Tue, 11 Dec 2018 07:03:10 -0800 (PST) X-Google-Smtp-Source: AFSGD/XokkRph/7/U55kgQPrs464DDpkKWfsCy83yK2K049F77dyQXxZIXGGBXdTkl/Pou8TQGRN X-Received: by 2002:a63:6ac5:: with SMTP id f188mr15000125pgc.165.1544540589918; Tue, 11 Dec 2018 07:03:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544540589; cv=none; d=google.com; s=arc-20160816; b=wDuiP9/zWWBy2spBIHl1QHHa/Gl22+uNZ+Xwsgpgt0q176u6bJFF8KD7Zd6zH7s1hH P+upyDbXW5P86BCWBtJIIV+2eOBF4QPYmtWFeIEFJ1AtdN5O0SE7kHMIgFREN7xgJGj/ Qrpkq2xlQpmOWP18vWJTZ622DQqFtYmdmKewLO63XbnZUOYfPG0c0kEWextTVEIAppX+ 4XOOaoZViKrSRznTwC8FabFICozdtMd9vVTysavWtQJVQpItRvWFfKsp2F9QHM/VgxO2 GtVjdhD5QIwwtHsox11FElE4pkfZRCrpf31rcG6PqCc1LMkIQpZVqa6YTNnvDJMWByK+ b/XQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=otmC0+V5H9XlleKrhG3hDnrm7ikRPw3PWyQR11YJNuo=; b=oV0/xdY493G0xqUbju+fxQCXL+Eru/s/otsmOQhuIYiBhgIW89psnfZaSfUxbKyXK9 iDuZogQbTMZRPtsUSaWkzMo4fMsrG7Z6fv+NUZX/hpPT95nf23yFfQXwQka6cMU+sPyP ogGUW6YDXMFIkJsQowKnojai1ny5iVuk+c3SiBjhGy4odNmVmjiDATSnF033Xg3ohH3D 3WRMk8oov4FzIkx23jPaIDpMjMTDC4XRjB0ewQ9cosEi+7kl0/1xf64hUKLSzKiOP4wj c6rplNVdlRw/aEUTMUXoGYhbP5auGwUlDPfj7BUaaSPI5TRMjwb8+GEfOUnNg1RMt6Ma KG8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=h6T7T5st; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id h9si13092209plb.180.2018.12.11.07.03.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Dec 2018 07:03:09 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=h6T7T5st; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id C75012119A468; Tue, 11 Dec 2018 07:02:53 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:4864:20::341; helo=mail-wm1-x341.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id B5A492119A463 for ; Tue, 11 Dec 2018 07:02:52 -0800 (PST) Received: by mail-wm1-x341.google.com with SMTP id s14so2570952wmh.1 for ; Tue, 11 Dec 2018 07:02:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uX/MFtY34yzjH1xeIMnGAFWHl/nXb40goBQ/ge3jsQs=; b=h6T7T5stOzJaWNQUMj7H7jOdhUj6LGxY6Wf17mIHUZnLR74o3lsCtKMwZylVGxh0uW vc27Du18oTSop10usKVZIgn9uo8n7p1OKK430rVSZNjL//duNX3ti28dPiljsh1GKkSN SGsAYsY7YL63hByMBIfh/Uy88LNfcg6vAkExg= 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=uX/MFtY34yzjH1xeIMnGAFWHl/nXb40goBQ/ge3jsQs=; b=iVwyclv+TPOS5qG1pvXtulqDe93B04E8nKRDGS0VucPL0xPOCjU8ZKcxLDtgJ2lKy4 VpeSgF5gBcOLw0CyIQkLBohfQ27odmETmMb5RsNar2bwYDDU3MnIOpOAtbyJK5i9xY2W MAcZeUuVLWA12hSVNPh5mzpffstOyQ+SvGdOo8G4DWZPEGfEM3DRWxy4JIjWh07CwGC8 pwhs3fpJGLqc61QzNnk4UKMcTtDMsbYbPu7NQmwhnxzzpA4WST4RjSlqV2I/cEW80C+u uXQBZsvCS8/+wVisRF4gFCJlJdre4S+XiXeHLTKz4wdzkrGl2DGB8okyRjI0IlI5/Gr4 Hx+A== X-Gm-Message-State: AA+aEWZWGAzlc8DVRr6rQGp+4nmnrRtWHspTeZTyRvP2/6Q5KYXbUOqk KzRriCUbz21UUCHvy4eComoSD4dnOgnJOA== X-Received: by 2002:a1c:9692:: with SMTP id y140mr2749471wmd.67.1544540570442; Tue, 11 Dec 2018 07:02:50 -0800 (PST) Received: from harold.home ([2a01:cb1d:112:6f00:8c3:6b9d:cbc9:58c6]) by smtp.gmail.com with ESMTPSA id o9sm285793wmh.3.2018.12.11.07.02.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Dec 2018 07:02:49 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Tue, 11 Dec 2018 16:02:37 +0100 Message-Id: <20181211150237.32275-7-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181211150237.32275-1-ard.biesheuvel@linaro.org> References: <20181211150237.32275-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Subject: [edk2] [PATCH edk2-platforms 6/6] Platform/AMD/OverdriveBoard: build device tree from source X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alan@softiron.co.uk Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Instead of incorporating the prebuilt device tree binary as a FREEFORM FFS file into the build, define a module that contains the source so that the device tree compiler is invoked at build time. The original .dts file is moved into the new module, and cleaned up a little so that explicit phandle properties are dropped, and unused clocks and other redudant pieces are removed as well. The existing prebuilt binary is deleted. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- Platform/AMD/OverdriveBoard/OverdriveBoard.dsc | 1 + Platform/LeMaker/CelloBoard/CelloBoard.dsc | 1 + Platform/AMD/OverdriveBoard/OverdriveBoard.fdf | 10 +- Platform/LeMaker/CelloBoard/CelloBoard.fdf | 9 +- Platform/AMD/OverdriveBoard/DeviceTree/OverdriveBoard.inf | 28 ++++ Platform/AMD/OverdriveBoard/{FdtBlob/styx-overdrive.dts => DeviceTree/OverdriveBoard.dts} | 140 ++++++-------------- Platform/AMD/OverdriveBoard/FdtBlob/styx-overdrive.dtb | Bin 9357 -> 0 bytes 7 files changed, 81 insertions(+), 108 deletions(-) diff --git a/Platform/AMD/OverdriveBoard/FdtBlob/styx-overdrive.dtb b/Platform/AMD/OverdriveBoard/FdtBlob/styx-overdrive.dtb deleted file mode 100644 index c8e5fd980bce305186214aab10a7d399faa22500..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9357 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 + interrupt-parent = <&gic>; #address-cells = <0x2>; #size-cells = <0x2>; - interrupt-controller@e1101000 { + gic: interrupt-controller@e1101000 { compatible = "arm,gic-400", "arm,cortex-a15-gic"; interrupt-controller; #interrupt-cells = <0x3>; @@ -35,15 +35,11 @@ <0x0 0xe1160000 0x0 0x2000>; interrupts = <0x1 0x9 0xf04>; ranges = <0x0 0x0 0x0 0xe1100000 0x0 0x100000>; - linux,phandle = <0x1>; - phandle = <0x1>; - v2m@e0080000 { + msi: v2m@e0080000 { compatible = "arm,gic-v2m-frame"; msi-controller; reg = <0x0 0x80000 0x0 0x1000>; - linux,phandle = <0x4>; - phandle = <0x4>; }; }; @@ -67,59 +63,25 @@ */ dma-ranges = <0x0 0x0 0x0 0x0 0x100 0x0>; - clk100mhz_0 { - compatible = "fixed-clock"; - #clock-cells = <0x0>; - clock-frequency = <100000000>; - clock-output-names = "adl3clk_100mhz"; - }; - - clk375mhz { - compatible = "fixed-clock"; - #clock-cells = <0x0>; - clock-frequency = <375000000>; - clock-output-names = "ccpclk_375mhz"; - }; - - clk333mhz { + sata_clk: clk333mhz { compatible = "fixed-clock"; #clock-cells = <0x0>; clock-frequency = <333000000>; clock-output-names = "sataclk_333mhz"; - linux,phandle = <0x2>; - phandle = <0x2>; }; - clk500mhz_0 { - compatible = "fixed-clock"; - #clock-cells = <0x0>; - clock-frequency = <500000000>; - clock-output-names = "pcieclk_500mhz"; - }; - - clk500mhz_1 { - compatible = "fixed-clock"; - #clock-cells = <0x0>; - clock-frequency = <500000000>; - clock-output-names = "dmaclk_500mhz"; - }; - - clk250mhz_4 { + i2c_clk: clk250mhz_4 { compatible = "fixed-clock"; #clock-cells = <0x0>; clock-frequency = <250000000>; clock-output-names = "miscclk_250mhz"; - linux,phandle = <0xd>; - phandle = <0xd>; }; - clk100mhz_1 { + apb_clk: clk100mhz_1 { compatible = "fixed-clock"; #clock-cells = <0x0>; clock-frequency = <100000000>; clock-output-names = "uartspiclk_100mhz"; - linux,phandle = <0x3>; - phandle = <0x3>; }; sata0_smmu: smmu@e0200000 { @@ -152,7 +114,7 @@ compatible = "snps,dwc-ahci"; reg = <0x0 0xe0300000 0x0 0xf0000>; interrupts = <0x0 0x163 0x4>; - clocks = <0x2>; + clocks = <&sata_clk>; dma-coherent; iommus = <&sata0_smmu 0x00 0x1f>; /* 0-31 */ }; @@ -162,7 +124,7 @@ compatible = "snps,dwc-ahci"; reg = <0x0 0xe0d00000 0x0 0xf0000>; interrupts = <0x0 0x162 0x4>; - clocks = <0x2>; + clocks = <&sata_clk>; dma-coherent; iommus = <&sata1_smmu 0x00 0x1f>; /* 0-31 */ }; @@ -171,21 +133,21 @@ compatible = "snps,designware-i2c"; reg = <0x0 0xe1000000 0x0 0x1000>; interrupts = <0x0 0x165 0x4>; - clocks = <0xd>; + clocks = <&i2c_clk>; }; i2c@e0050000 { compatible = "snps,designware-i2c"; reg = <0x0 0xe0050000 0x0 0x1000>; interrupts = <0x0 0x154 0x4>; - clocks = <0xd>; + clocks = <&i2c_clk>; }; serial@e1010000 { compatible = "arm,pl011", "arm,primecell"; reg = <0x0 0xe1010000 0x0 0x1000>; interrupts = <0x0 0x148 0x4>; - clocks = <0x3 0x3>; + clocks = <&apb_clk &apb_clk>; clock-names = "uartclk", "apb_pclk"; }; @@ -194,7 +156,7 @@ reg = <0x0 0xe1020000 0x0 0x1000>; spi-controller; interrupts = <0x0 0x14a 0x4>; - clocks = <0x3>; + clocks = <&apb_clk>; clock-names = "apb_pclk"; }; @@ -203,7 +165,7 @@ reg = <0x0 0xe1030000 0x0 0x1000>; spi-controller; interrupts = <0x0 0x149 0x4>; - clocks = <0x3>; + clocks = <&apb_clk>; clock-names = "apb_pclk"; num-cs = <0x1>; #address-cells = <0x1>; @@ -230,7 +192,7 @@ interrupt-controller; #interrupt-cells = <0x2>; interrupts = <0x0 0x166 0x4>; - clocks = <0x3>; + clocks = <&apb_clk>; clock-names = "apb_pclk"; }; @@ -243,7 +205,7 @@ interrupt-controller; #interrupt-cells = <0x2>; interrupts = <0x0 0x16e 0x4>; - clocks = <0x3>; + clocks = <&apb_clk>; clock-names = "apb_pclk"; }; @@ -256,7 +218,7 @@ interrupt-controller; #interrupt-cells = <0x2>; interrupts = <0x0 0x16d 0x4>; - clocks = <0x3>; + clocks = <&apb_clk>; clock-names = "apb_pclk"; }; @@ -268,7 +230,7 @@ interrupt-controller; #interrupt-cells = <0x2>; interrupts = <0x0 0x169 0x4>; - clocks = <0x3>; + clocks = <&apb_clk>; clock-names = "apb_pclk"; }; @@ -288,23 +250,23 @@ iommu-map = <0x0 &pcie_smmu 0x0 0x10000>; device_type = "pci"; bus-range = <0x0 0x7f>; - msi-parent = <0x4>; + msi-parent = <&msi>; reg = <0x0 0xf0000000 0x0 0x10000000>; interrupt-map-mask = <0xff00 0x0 0x0 0x7>; - interrupt-map = <0x1100 0x0 0x0 0x1 0x1 0x0 0x0 0x0 0x120 0x1>, - <0x1100 0x0 0x0 0x2 0x1 0x0 0x0 0x0 0x121 0x1>, - <0x1100 0x0 0x0 0x3 0x1 0x0 0x0 0x0 0x122 0x1>, - <0x1100 0x0 0x0 0x4 0x1 0x0 0x0 0x0 0x123 0x1>, + interrupt-map = <0x1100 0x0 0x0 0x1 &gic 0x0 0x0 0x0 0x120 0x1>, + <0x1100 0x0 0x0 0x2 &gic 0x0 0x0 0x0 0x121 0x1>, + <0x1100 0x0 0x0 0x3 &gic 0x0 0x0 0x0 0x122 0x1>, + <0x1100 0x0 0x0 0x4 &gic 0x0 0x0 0x0 0x123 0x1>, - <0x1200 0x0 0x0 0x1 0x1 0x0 0x0 0x0 0x124 0x1>, - <0x1200 0x0 0x0 0x2 0x1 0x0 0x0 0x0 0x125 0x1>, - <0x1200 0x0 0x0 0x3 0x1 0x0 0x0 0x0 0x126 0x1>, - <0x1200 0x0 0x0 0x4 0x1 0x0 0x0 0x0 0x127 0x1>, + <0x1200 0x0 0x0 0x1 &gic 0x0 0x0 0x0 0x124 0x1>, + <0x1200 0x0 0x0 0x2 &gic 0x0 0x0 0x0 0x125 0x1>, + <0x1200 0x0 0x0 0x3 &gic 0x0 0x0 0x0 0x126 0x1>, + <0x1200 0x0 0x0 0x4 &gic 0x0 0x0 0x0 0x127 0x1>, - <0x1300 0x0 0x0 0x1 0x1 0x0 0x0 0x0 0x128 0x1>, - <0x1300 0x0 0x0 0x2 0x1 0x0 0x0 0x0 0x129 0x1>, - <0x1300 0x0 0x0 0x3 0x1 0x0 0x0 0x0 0x12a 0x1>, - <0x1300 0x0 0x0 0x4 0x1 0x0 0x0 0x0 0x12b 0x1>; + <0x1300 0x0 0x0 0x1 &gic 0x0 0x0 0x0 0x128 0x1>, + <0x1300 0x0 0x0 0x2 &gic 0x0 0x0 0x0 0x129 0x1>, + <0x1300 0x0 0x0 0x3 &gic 0x0 0x0 0x0 0x12a 0x1>, + <0x1300 0x0 0x0 0x4 &gic 0x0 0x0 0x0 0x12b 0x1>; dma-coherent; dma-ranges = <0x43000000 0x0 0x0 0x0 0x0 0x100 0x0>; ranges = <0x1000000 0x0 0x00000000 0x0 0xefff0000 0x00 0x00010000>, /* I/O Memory (size=64K) */ @@ -352,43 +314,35 @@ reg-spacing = <4>; }; - clk250mhz_0 { + xgmacclk0_dma: clk250mhz_0 { compatible = "fixed-clock"; #clock-cells = <0x0>; clock-frequency = <250000000>; clock-output-names = "xgmacclk0_dma_250mhz"; - linux,phandle = <0x5>; - phandle = <0x5>; }; - clk250mhz_1 { + xgmacclk0_ptp: clk250mhz_1 { compatible = "fixed-clock"; #clock-cells = <0x0>; clock-frequency = <250000000>; clock-output-names = "xgmacclk0_ptp_250mhz"; - linux,phandle = <0x6>; - phandle = <0x6>; }; - clk250mhz_2 { + xgmacclk1_dma: clk250mhz_2 { compatible = "fixed-clock"; #clock-cells = <0x0>; clock-frequency = <250000000>; clock-output-names = "xgmacclk1_dma_250mhz"; - linux,phandle = <0x7>; - phandle = <0x7>; }; - clk250mhz_3 { + xgmacclk1_ptp: clk250mhz_3 { compatible = "fixed-clock"; #clock-cells = <0x0>; clock-frequency = <250000000>; clock-output-names = "xgmacclk1_ptp_250mhz"; - linux,phandle = <0x8>; - phandle = <0x8>; }; - phy@e1240800 { + xgmac0_phy: phy@e1240800 { status = "disabled"; compatible = "amd,xgbe-phy-seattle-v1a"; reg = <0x0 0xe1240800 0x0 0x0400>, /* SERDES RX/TX0 */ @@ -402,11 +356,9 @@ amd,serdes-tx-amp = <0xf 0xf 0xa>; amd,serdes-dfe-tap-config = <0x3 0x3 0x1>; amd,serdes-dfe-tap-enable = <0x0 0x0 0x7f>; - linux,phandle = <0x9>; - phandle = <0x9>; }; - phy@e1240c00 { + xgmac1_phy: phy@e1240c00 { status = "disabled"; compatible = "amd,xgbe-phy-seattle-v1a"; reg = <0x0 0xe1240c00 0x0 0x0400>, /* SERDES RX/TX0 */ @@ -420,8 +372,6 @@ amd,serdes-tx-amp = <0xf 0xf 0xa>; amd,serdes-dfe-tap-config = <0x3 0x3 0x1>; amd,serdes-dfe-tap-enable = <0x0 0x0 0x7f>; - linux,phandle = <0xa>; - phandle = <0xa>; }; xgmac0_smmu: smmu@e0600000 { @@ -461,14 +411,12 @@ <0x0 0x15d 0x1>; amd,per-channel-interrupt; mac-address = [02 a1 a2 a3 a4 a5]; - clocks = <0x5 0x6>; + clocks = <&xgmacclk0_dma &xgmacclk0_ptp>; clock-names = "dma_clk", "ptp_clk"; - phy-handle = <0x9>; + phy-handle = <&xgmac0_phy>; phy-mode = "xgmii"; dma-coherent; iommus = <&xgmac0_smmu 0x00 0x1f>; /* 0-31 */ - linux,phandle = <0xb>; - phandle = <0xb>; }; xgmac@e0900000 { @@ -482,25 +430,17 @@ <0x0 0x158 0x1>; amd,per-channel-interrupt; mac-address = [02 b1 b2 b3 b4 b5]; - clocks = <0x7 0x8>; + clocks = <&xgmacclk1_dma &xgmacclk1_ptp>; clock-names = "dma_clk", "ptp_clk"; - phy-handle = <0xa>; + phy-handle = <&xgmac1_phy>; phy-mode = "xgmii"; dma-coherent; iommus = <&xgmac1_smmu 0x00 0x1f>; /* 0-31 */ - linux,phandle = <0xc>; - phandle = <0xc>; }; }; chosen { stdout-path = "/smb/serial@e1010000"; - /* Note: - * Linux support for pci-probe-only DT is not - * stable. Disable this for now and let Linux - * take care of the resource assignment. - */ - // linux,pci-probe-only; }; psci {