On 03.08.22 13:00, Pali Rohár wrote:
This patch series cleanup u-boot,dm-pre-reloc code in 32-bit mvebu device tree files. All repeated code patterns are moved into the new mvebu-u-boot.dtsi file which is automatically included by U-Boot build process into all mvebu boards. In file mvebu-u-boot.dtsi is also enabled u-boot,dm-pre-reloc for SPI node when SPL is compiled with SPI driver for loading proper U-Boot. This avoids manually defining &spi0 { u-boot,dm-pre-reloc; }; in every armada soc which store U-Boot in SPI NOR.
I tested this patch series only on Armada 385 Turris Omnia board (both UART and SPI-NOR booting). Please test it on other Armada boards.
CI tests were running at: https://github.com/u-boot/u-boot/pull/203 But some x86 test failed, which must be irrelevant as this patch series did not touch code outside of arch/arm/.
Patch 1/5 not, all others:
Applied to u-boot-marvell/master
Thanks, Stefan
Pali Rohár (5): arm: mvebu: a7040/a8040/cn9130: Add spi0 dts reference arm: mvebu: Introduce mvebu-u-boot.dtsi for 32-bit Armada SoCs arm: mvebu: Remove redundant u-boot,dm-pre-reloc from all 32-bit Armada SoCs arm: mvebu: armada-xp-theadorable.dts: Move u-boot,dm-pre-reloc to -u-boot.dtsi arm: mvebu: armada-38x-controlcenterdc.dts: Move u-boot,dm-pre-reloc to -u-boot.dtsi
arch/arm/dts/armada-370-xp.dtsi | 1 - arch/arm/dts/armada-375-db.dts | 3 --- arch/arm/dts/armada-375.dtsi | 2 -- arch/arm/dts/armada-385-atl-x530-u-boot.dtsi | 14 ++--------- arch/arm/dts/armada-385-db-88f6820-amc.dts | 3 --- .../dts/armada-385-turris-omnia-u-boot.dtsi | 8 +----- arch/arm/dts/armada-388-clearfog-u-boot.dtsi | 2 ++ arch/arm/dts/armada-388-gp.dts | 3 --- arch/arm/dts/armada-388-helios4-u-boot.dtsi | 2 ++ .../armada-38x-controlcenterdc-u-boot.dtsi | 25 +++++++++++++++++++ arch/arm/dts/armada-38x-controlcenterdc.dts | 20 --------------- .../arm/dts/armada-38x-solidrun-microsom.dtsi | 1 - arch/arm/dts/armada-38x.dtsi | 2 -- arch/arm/dts/armada-7040.dtsi | 3 +++ arch/arm/dts/armada-8040.dtsi | 3 +++ .../dts/armada-xp-crs305-1g-4s-u-boot.dtsi | 13 ---------- arch/arm/dts/armada-xp-crs305-1g-4s.dtsi | 1 - .../dts/armada-xp-crs326-24g-2s-u-boot.dtsi | 13 ---------- arch/arm/dts/armada-xp-crs326-24g-2s.dtsi | 1 - .../armada-xp-crs328-4c-20s-4s-u-boot.dtsi | 13 ---------- arch/arm/dts/armada-xp-crs328-4c-20s-4s.dtsi | 1 - .../dts/armada-xp-db-xc3-24g4xg-u-boot.dtsi | 12 +-------- arch/arm/dts/armada-xp-gp-u-boot.dtsi | 19 -------------- arch/arm/dts/armada-xp-maxbcm.dts | 1 - .../dts/armada-xp-synology-ds414-u-boot.dtsi | 9 ------- arch/arm/dts/armada-xp-synology-ds414.dts | 1 - .../arm/dts/armada-xp-theadorable-u-boot.dtsi | 5 ++++ arch/arm/dts/armada-xp-theadorable.dts | 4 --- arch/arm/dts/armada-xp.dtsi | 1 - arch/arm/dts/cn9130.dtsi | 3 +++ arch/arm/dts/mvebu-u-boot.dtsi | 24 ++++++++++++++++++ 31 files changed, 71 insertions(+), 142 deletions(-) create mode 100644 arch/arm/dts/armada-38x-controlcenterdc-u-boot.dtsi delete mode 100644 arch/arm/dts/armada-xp-crs305-1g-4s-u-boot.dtsi delete mode 100644 arch/arm/dts/armada-xp-crs326-24g-2s-u-boot.dtsi delete mode 100644 arch/arm/dts/armada-xp-crs328-4c-20s-4s-u-boot.dtsi delete mode 100644 arch/arm/dts/armada-xp-gp-u-boot.dtsi delete mode 100644 arch/arm/dts/armada-xp-synology-ds414-u-boot.dtsi create mode 100644 arch/arm/dts/armada-xp-theadorable-u-boot.dtsi create mode 100644 arch/arm/dts/mvebu-u-boot.dtsi
Viele Grüße, Stefan Roese