From a134aaa54ee5056432a26ac471b67f2cb0078ae9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Pali=20Roh=C3=A1r?= Date: Mon, 14 Feb 2022 11:34:28 +0100 Subject: [PATCH] arm: a37xx: espressobin: Move U-Boot specific partitions node to -u-boot.dtsi MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit U-Boot specific changes should be in armada-3720-espressobin-u-boot.dtsi DTS file. Signed-off-by: Pali Rohár Reviewed-by: Stefan Roese --- .../dts/armada-3720-espressobin-u-boot.dtsi | 23 +++++++++++++++++++ arch/arm/dts/armada-3720-espressobin.dts | 18 --------------- 2 files changed, 23 insertions(+), 18 deletions(-) create mode 100644 arch/arm/dts/armada-3720-espressobin-u-boot.dtsi diff --git a/arch/arm/dts/armada-3720-espressobin-u-boot.dtsi b/arch/arm/dts/armada-3720-espressobin-u-boot.dtsi new file mode 100644 index 0000000000..7ec3392201 --- /dev/null +++ b/arch/arm/dts/armada-3720-espressobin-u-boot.dtsi @@ -0,0 +1,23 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) + +#ifdef CONFIG_ENV_IS_IN_SPI_FLASH +&spi0 { + spi-flash@0 { + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@firmware { + reg = <0 CONFIG_ENV_OFFSET>; + label = "firmware"; + }; + + partition@u-boot-env { + reg = ; + label = "u-boot-env"; + }; + }; + }; +}; +#endif diff --git a/arch/arm/dts/armada-3720-espressobin.dts b/arch/arm/dts/armada-3720-espressobin.dts index f59f82d916..c0e0e13953 100644 --- a/arch/arm/dts/armada-3720-espressobin.dts +++ b/arch/arm/dts/armada-3720-espressobin.dts @@ -147,24 +147,6 @@ reg = <0>; /* Chip select 0 */ spi-max-frequency = <50000000>; m25p,fast-read; - -#ifdef CONFIG_ENV_IS_IN_SPI_FLASH - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition@firmware { - reg = <0 CONFIG_ENV_OFFSET>; - label = "firmware"; - }; - - partition@u-boot-env { - reg = ; - label = "u-boot-env"; - }; - }; -#endif }; }; -- 2.39.5