On 25.11.20 19:20, Pali Rohár wrote:
This patch series change Espressobin code to use in U-Boot just one DTS file for all Espressobin variants. Therefore DT compatible string globalscale,espressobin-emmc is not used anymore as it is not needed.It means that setup and compilation of U-Boot for Espressobin is less complicated and more simple. As there is no need to check for HW details and just one U-Boot binary would work for all Espressobin variants. First two patches just revert previous eMMC support and next two patches add support for eMMC in way that just one DTS file is used and fdtfile env variable is correctly set for any Espressobin variant. We have tested that fdtfile env variable is correctly set on Espressobin variants with eMMC, without eMMC, with DDR3 RAM and also with DDR4 RAM. Also that eMMC is working on Espressobin variant with eMMC. Pali Rohár (4): Revert "arm64: dts: armada-3720-espressobin: split common parts to .dtsi" Revert "arm64: dts: a3720: add support for espressobin with populated emmc" arm: mvebu: Espressobin: Add support for emmc into dts file arm: mvebu: Espressobin: Detect presence of emmc at runtime arch/arm/dts/Makefile | 1 - arch/arm/dts/armada-3720-espressobin-emmc.dts | 44 ----- arch/arm/dts/armada-3720-espressobin.dts | 186 +++++++++++++++++- arch/arm/dts/armada-3720-espressobin.dtsi | 167 ---------------- board/Marvell/mvebu_armada-37xx/board.c | 6 +- doc/README.marvell | 7 +- 6 files changed, 186 insertions(+), 225 deletions(-) delete mode 100644 arch/arm/dts/armada-3720-espressobin-emmc.dts delete mode 100644 arch/arm/dts/armada-3720-espressobin.dtsi
Applied to u-boot-marvell/master Thanks, Stefan
