From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michal Simek Date: Tue, 18 Feb 2020 13:20:43 +0100 Subject: [PATCH 13/16] arm64: zynqmp: Fix addresses in partition definitions In-Reply-To: References: Message-ID: List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Node name should be @

which is not how partitions are described. Issue was found by running dtbs_check as: flash at 0: 'partition at qspi-device-tree', 'partition at qspi-fsbl-uboot', 'partition at qspi-linux', 'partition at qspi-rootfs' do not match any of the regexes: ... Signed-off-by: Michal Simek --- arch/arm/dts/zynqmp-zc1232-revA.dts | 8 ++++---- arch/arm/dts/zynqmp-zc1254-revA.dts | 8 ++++---- arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts | 8 ++++---- arch/arm/dts/zynqmp-zc1751-xm018-dc4.dts | 8 ++++---- arch/arm/dts/zynqmp-zcu102-revA.dts | 8 ++++---- arch/arm/dts/zynqmp-zcu104-revA.dts | 8 ++++---- arch/arm/dts/zynqmp-zcu104-revC.dts | 8 ++++---- arch/arm/dts/zynqmp-zcu106-revA.dts | 8 ++++---- arch/arm/dts/zynqmp-zcu111-revA.dts | 8 ++++---- arch/arm/dts/zynqmp-zcu1275-revA.dts | 8 ++++---- arch/arm/dts/zynqmp-zcu1275-revB.dts | 8 ++++---- 11 files changed, 44 insertions(+), 44 deletions(-) diff --git a/arch/arm/dts/zynqmp-zc1232-revA.dts b/arch/arm/dts/zynqmp-zc1232-revA.dts index 87152afc32f5..cdd1c688abc8 100644 --- a/arch/arm/dts/zynqmp-zc1232-revA.dts +++ b/arch/arm/dts/zynqmp-zc1232-revA.dts @@ -48,19 +48,19 @@ spi-tx-bus-width = <1>; spi-rx-bus-width = <4>; spi-max-frequency = <108000000>; /* Based on DC1 spec */ - partition at qspi-fsbl-uboot { /* for testing purpose */ + partition at 0 { /* for testing purpose */ label = "qspi-fsbl-uboot"; reg = <0x0 0x100000>; }; - partition at qspi-linux { /* for testing purpose */ + partition at 10000 { /* for testing purpose */ label = "qspi-linux"; reg = <0x100000 0x500000>; }; - partition at qspi-device-tree { /* for testing purpose */ + partition at 600000 { /* for testing purpose */ label = "qspi-device-tree"; reg = <0x600000 0x20000>; }; - partition at qspi-rootfs { /* for testing purpose */ + partition at 620000 { /* for testing purpose */ label = "qspi-rootfs"; reg = <0x620000 0x5E0000>; }; diff --git a/arch/arm/dts/zynqmp-zc1254-revA.dts b/arch/arm/dts/zynqmp-zc1254-revA.dts index d6b2834f3aa6..f13788042314 100644 --- a/arch/arm/dts/zynqmp-zc1254-revA.dts +++ b/arch/arm/dts/zynqmp-zc1254-revA.dts @@ -48,19 +48,19 @@ spi-tx-bus-width = <1>; spi-rx-bus-width = <4>; /* FIXME also DUAL configuration possible */ spi-max-frequency = <108000000>; /* Based on DC1 spec */ - partition at qspi-fsbl-uboot { /* for testing purpose */ + partition at 0 { /* for testing purpose */ label = "qspi-fsbl-uboot"; reg = <0x0 0x100000>; }; - partition at qspi-linux { /* for testing purpose */ + partition at 10000 { /* for testing purpose */ label = "qspi-linux"; reg = <0x100000 0x500000>; }; - partition at qspi-device-tree { /* for testing purpose */ + partition at 600000 { /* for testing purpose */ label = "qspi-device-tree"; reg = <0x600000 0x20000>; }; - partition at qspi-rootfs { /* for testing purpose */ + partition at 620000 { /* for testing purpose */ label = "qspi-rootfs"; reg = <0x620000 0x5E0000>; }; diff --git a/arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts b/arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts index fa3824d2a126..05be495841e0 100644 --- a/arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts +++ b/arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts @@ -108,19 +108,19 @@ spi-tx-bus-width = <1>; spi-rx-bus-width = <4>; spi-max-frequency = <108000000>; /* Based on DC1 spec */ - partition at qspi-fsbl-uboot { /* for testing purpose */ + partition at 0 { /* for testing purpose */ label = "qspi-fsbl-uboot"; reg = <0x0 0x100000>; }; - partition at qspi-linux { /* for testing purpose */ + partition at 10000 { /* for testing purpose */ label = "qspi-linux"; reg = <0x100000 0x500000>; }; - partition at qspi-device-tree { /* for testing purpose */ + partition at 600000 { /* for testing purpose */ label = "qspi-device-tree"; reg = <0x600000 0x20000>; }; - partition at qspi-rootfs { /* for testing purpose */ + partition at 620000 { /* for testing purpose */ label = "qspi-rootfs"; reg = <0x620000 0x5E0000>; }; diff --git a/arch/arm/dts/zynqmp-zc1751-xm018-dc4.dts b/arch/arm/dts/zynqmp-zc1751-xm018-dc4.dts index 6655b86a8029..e22947ef326f 100644 --- a/arch/arm/dts/zynqmp-zc1751-xm018-dc4.dts +++ b/arch/arm/dts/zynqmp-zc1751-xm018-dc4.dts @@ -187,19 +187,19 @@ spi-tx-bus-width = <1>; spi-rx-bus-width = <4>; /* also DUAL configuration possible */ spi-max-frequency = <108000000>; /* Based on DC1 spec */ - partition at qspi-fsbl-uboot { /* for testing purpose */ + partition at 0 { /* for testing purpose */ label = "qspi-fsbl-uboot"; reg = <0x0 0x100000>; }; - partition at qspi-linux { /* for testing purpose */ + partition at 10000 { /* for testing purpose */ label = "qspi-linux"; reg = <0x100000 0x500000>; }; - partition at qspi-device-tree { /* for testing purpose */ + partition at 600000 { /* for testing purpose */ label = "qspi-device-tree"; reg = <0x600000 0x20000>; }; - partition at qspi-rootfs { /* for testing purpose */ + partition at 620000 { /* for testing purpose */ label = "qspi-rootfs"; reg = <0x620000 0x5E0000>; }; diff --git a/arch/arm/dts/zynqmp-zcu102-revA.dts b/arch/arm/dts/zynqmp-zcu102-revA.dts index fd6dfdd3c225..620ef81a979b 100644 --- a/arch/arm/dts/zynqmp-zcu102-revA.dts +++ b/arch/arm/dts/zynqmp-zcu102-revA.dts @@ -614,19 +614,19 @@ spi-tx-bus-width = <1>; spi-rx-bus-width = <4>; /* FIXME also DUAL configuration possible */ spi-max-frequency = <108000000>; /* Based on DC1 spec */ - partition at qspi-fsbl-uboot { /* for testing purpose */ + partition at 0 { /* for testing purpose */ label = "qspi-fsbl-uboot"; reg = <0x0 0x100000>; }; - partition at qspi-linux { /* for testing purpose */ + partition at 10000 { /* for testing purpose */ label = "qspi-linux"; reg = <0x100000 0x500000>; }; - partition at qspi-device-tree { /* for testing purpose */ + partition at 600000 { /* for testing purpose */ label = "qspi-device-tree"; reg = <0x600000 0x20000>; }; - partition at qspi-rootfs { /* for testing purpose */ + partition at 620000 { /* for testing purpose */ label = "qspi-rootfs"; reg = <0x620000 0x5E0000>; }; diff --git a/arch/arm/dts/zynqmp-zcu104-revA.dts b/arch/arm/dts/zynqmp-zcu104-revA.dts index 6375b47ff859..5172cfdcb141 100644 --- a/arch/arm/dts/zynqmp-zcu104-revA.dts +++ b/arch/arm/dts/zynqmp-zcu104-revA.dts @@ -209,19 +209,19 @@ spi-tx-bus-width = <1>; spi-rx-bus-width = <4>; spi-max-frequency = <108000000>; /* Based on DC1 spec */ - partition at qspi-fsbl-uboot { /* for testing purpose */ + partition at 0 { /* for testing purpose */ label = "qspi-fsbl-uboot"; reg = <0x0 0x100000>; }; - partition at qspi-linux { /* for testing purpose */ + partition at 10000 { /* for testing purpose */ label = "qspi-linux"; reg = <0x100000 0x500000>; }; - partition at qspi-device-tree { /* for testing purpose */ + partition at 600000 { /* for testing purpose */ label = "qspi-device-tree"; reg = <0x600000 0x20000>; }; - partition at qspi-rootfs { /* for testing purpose */ + partition at 620000 { /* for testing purpose */ label = "qspi-rootfs"; reg = <0x620000 0x5E0000>; }; diff --git a/arch/arm/dts/zynqmp-zcu104-revC.dts b/arch/arm/dts/zynqmp-zcu104-revC.dts index 425d7605bf5c..0d18bacd0c3e 100644 --- a/arch/arm/dts/zynqmp-zcu104-revC.dts +++ b/arch/arm/dts/zynqmp-zcu104-revC.dts @@ -222,19 +222,19 @@ spi-tx-bus-width = <1>; spi-rx-bus-width = <4>; spi-max-frequency = <108000000>; /* Based on DC1 spec */ - partition at qspi-fsbl-uboot { /* for testing purpose */ + partition at 0 { /* for testing purpose */ label = "qspi-fsbl-uboot"; reg = <0x0 0x100000>; }; - partition at qspi-linux { /* for testing purpose */ + partition at 10000 { /* for testing purpose */ label = "qspi-linux"; reg = <0x100000 0x500000>; }; - partition at qspi-device-tree { /* for testing purpose */ + partition at 600000 { /* for testing purpose */ label = "qspi-device-tree"; reg = <0x600000 0x20000>; }; - partition at qspi-rootfs { /* for testing purpose */ + partition at 620000 { /* for testing purpose */ label = "qspi-rootfs"; reg = <0x620000 0x5E0000>; }; diff --git a/arch/arm/dts/zynqmp-zcu106-revA.dts b/arch/arm/dts/zynqmp-zcu106-revA.dts index a5c4309f2f39..6b8d55c053b3 100644 --- a/arch/arm/dts/zynqmp-zcu106-revA.dts +++ b/arch/arm/dts/zynqmp-zcu106-revA.dts @@ -612,19 +612,19 @@ spi-tx-bus-width = <1>; spi-rx-bus-width = <4>; /* FIXME also DUAL configuration possible */ spi-max-frequency = <108000000>; /* Based on DC1 spec */ - partition at qspi-fsbl-uboot { /* for testing purpose */ + partition at 0 { /* for testing purpose */ label = "qspi-fsbl-uboot"; reg = <0x0 0x100000>; }; - partition at qspi-linux { /* for testing purpose */ + partition at 10000 { /* for testing purpose */ label = "qspi-linux"; reg = <0x100000 0x500000>; }; - partition at qspi-device-tree { /* for testing purpose */ + partition at 600000 { /* for testing purpose */ label = "qspi-device-tree"; reg = <0x600000 0x20000>; }; - partition at qspi-rootfs { /* for testing purpose */ + partition at 620000 { /* for testing purpose */ label = "qspi-rootfs"; reg = <0x620000 0x5E0000>; }; diff --git a/arch/arm/dts/zynqmp-zcu111-revA.dts b/arch/arm/dts/zynqmp-zcu111-revA.dts index 755c30e9ff67..56cf60767fdd 100644 --- a/arch/arm/dts/zynqmp-zcu111-revA.dts +++ b/arch/arm/dts/zynqmp-zcu111-revA.dts @@ -525,19 +525,19 @@ spi-tx-bus-width = <1>; spi-rx-bus-width = <4>; /* FIXME also DUAL configuration possible */ spi-max-frequency = <108000000>; /* Based on DC1 spec */ - partition at qspi-fsbl-uboot { /* for testing purpose */ + partition at 0 { /* for testing purpose */ label = "qspi-fsbl-uboot"; reg = <0x0 0x100000>; }; - partition at qspi-linux { /* for testing purpose */ + partition at 10000 { /* for testing purpose */ label = "qspi-linux"; reg = <0x100000 0x500000>; }; - partition at qspi-device-tree { /* for testing purpose */ + partition at 600000 { /* for testing purpose */ label = "qspi-device-tree"; reg = <0x600000 0x20000>; }; - partition at qspi-rootfs { /* for testing purpose */ + partition at 620000 { /* for testing purpose */ label = "qspi-rootfs"; reg = <0x620000 0x5E0000>; }; diff --git a/arch/arm/dts/zynqmp-zcu1275-revA.dts b/arch/arm/dts/zynqmp-zcu1275-revA.dts index 8755bc433b4f..d0322add3bbb 100644 --- a/arch/arm/dts/zynqmp-zcu1275-revA.dts +++ b/arch/arm/dts/zynqmp-zcu1275-revA.dts @@ -49,19 +49,19 @@ spi-tx-bus-width = <1>; spi-rx-bus-width = <4>; /* FIXME also DUAL configuration possible */ spi-max-frequency = <108000000>; /* Based on DC1 spec */ - partition at qspi-fsbl-uboot { /* for testing purpose */ + partition at 0 { /* for testing purpose */ label = "qspi-fsbl-uboot"; reg = <0x0 0x100000>; }; - partition at qspi-linux { /* for testing purpose */ + partition at 10000 { /* for testing purpose */ label = "qspi-linux"; reg = <0x100000 0x500000>; }; - partition at qspi-device-tree { /* for testing purpose */ + partition at 600000 { /* for testing purpose */ label = "qspi-device-tree"; reg = <0x600000 0x20000>; }; - partition at qspi-rootfs { /* for testing purpose */ + partition at 620000 { /* for testing purpose */ label = "qspi-rootfs"; reg = <0x620000 0x5E0000>; }; diff --git a/arch/arm/dts/zynqmp-zcu1275-revB.dts b/arch/arm/dts/zynqmp-zcu1275-revB.dts index 16f609c7e5c0..b5be749ee644 100644 --- a/arch/arm/dts/zynqmp-zcu1275-revB.dts +++ b/arch/arm/dts/zynqmp-zcu1275-revB.dts @@ -50,19 +50,19 @@ spi-tx-bus-width = <1>; spi-rx-bus-width = <1>; spi-max-frequency = <108000000>; /* Based on DC1 spec */ - partition at qspi-fsbl-uboot { /* for testing purpose */ + partition at 0 { /* for testing purpose */ label = "qspi-fsbl-uboot"; reg = <0x0 0x100000>; }; - partition at qspi-linux { /* for testing purpose */ + partition at 10000 { /* for testing purpose */ label = "qspi-linux"; reg = <0x100000 0x500000>; }; - partition at qspi-device-tree { /* for testing purpose */ + partition at 600000 { /* for testing purpose */ label = "qspi-device-tree"; reg = <0x600000 0x20000>; }; - partition at qspi-rootfs { /* for testing purpose */ + partition at 620000 { /* for testing purpose */ label = "qspi-rootfs"; reg = <0x620000 0x5E0000>; }; -- 2.25.0