[PATCH v2 2/2] arm64: mvebu: a37xx: Add support for EspressoBIN with eMMC

[Pali Rohár]

On Monday 31 August 2020 08:33:24 Andre Heider wrote:
> From: Konstantin Porotchkin <kostap at marvell.com>
> 
> Add support for additional EspressoBIN board with installed
> eMMC device (U11).
> Starting from this patch the DEVICE_TREE= must be added to

Why? Is not it better to have the most common non-emmc version by
default instead forcing people to specify another compile time option?
IIRC mmc versions are very rare.

> "make" in order to distinguish between platforms wth and without
> eMMC on board.
> Regualr (no eMMC) EspressoBIN builds should use DTS file named
> armada-3720-espressobin and build for boards with eMMC installed
> the DTS named armada-3720-espressobin-emmc.
> The default device tree string is now removed from
> mvebu_espressobin-88f3720_defconfig config file.
> Update build documentation accordingly.
> 
> Change-Id: Id1a4f3ca01a6e52df57bf7279f33f0fe45f8ed18
> Signed-off-by: Konstantin Porotchkin <kostap at marvell.com>
> Reviewed-on: http://vgitil04.il.marvell.com:8080/61290
> Tested-by: iSoC Platform CI <ykjenk at marvell.com>
> [a.heider: adapt to mainline]
> Signed-off-by: Andre Heider <a.heider at gmail.com>
> ---
> v2: base upon downstream patch
> 
>  arch/arm/dts/Makefile                         |  1 +
>  arch/arm/dts/armada-3720-espressobin-emmc.dts | 19 +++++++++++++++++++
>  configs/mvebu_espressobin-88f3720_defconfig   |  1 -
>  doc/README.marvell                            |  7 ++++++-
>  4 files changed, 26 insertions(+), 2 deletions(-)
>  create mode 100644 arch/arm/dts/armada-3720-espressobin-emmc.dts
> 
> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
> index 5e34192be6..8f1958b5a7 100644
> --- a/arch/arm/dts/Makefile
> +++ b/arch/arm/dts/Makefile
> @@ -202,6 +202,7 @@ dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
>  dtb-$(CONFIG_ARCH_MVEBU) +=			\
>  	armada-3720-db.dtb			\
>  	armada-3720-espressobin.dtb		\
> +	armada-3720-espressobin-emmc.dtb	\
>  	armada-3720-turris-mox.dtb		\
>  	armada-3720-uDPU.dtb			\
>  	armada-375-db.dtb			\
> diff --git a/arch/arm/dts/armada-3720-espressobin-emmc.dts b/arch/arm/dts/armada-3720-espressobin-emmc.dts
> new file mode 100644
> index 0000000000..0dd59af9c0
> --- /dev/null
> +++ b/arch/arm/dts/armada-3720-espressobin-emmc.dts
> @@ -0,0 +1,19 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +/*
> + * Copyright (C) 2018 Marvell International Ltd.
> + */
> +
> +#include "armada-3720-espressobin.dts"
> +
> +/ {
> +	model = "Marvell Armada 3720 Community Board ESPRESSOBin (eMMC)";
> +	compatible = "marvell,armada-3720-espressobin",
> +		     "marvell,armada-3720-espressobin-emmc",
> +		     "marvell,armada3720", "marvell,armada3710";
> +
> +};
> +
> +/* U11 */
> +&sdhci1 {
> +	status = "okay";
> +};
> diff --git a/configs/mvebu_espressobin-88f3720_defconfig b/configs/mvebu_espressobin-88f3720_defconfig
> index 0c1c92d4ff..99f421d841 100644
> --- a/configs/mvebu_espressobin-88f3720_defconfig
> +++ b/configs/mvebu_espressobin-88f3720_defconfig
> @@ -11,7 +11,6 @@ CONFIG_ENV_SECT_SIZE=0x10000
>  CONFIG_DM_GPIO=y
>  CONFIG_DEBUG_UART_BASE=0xd0012000
>  CONFIG_DEBUG_UART_CLOCK=25804800
> -CONFIG_DEFAULT_DEVICE_TREE="armada-3720-espressobin"
>  CONFIG_DEBUG_UART=y
>  CONFIG_AHCI=y
>  CONFIG_DISTRO_DEFAULTS=y
> diff --git a/doc/README.marvell b/doc/README.marvell
> index 5416bc3035..ffd0544aef 100644
> --- a/doc/README.marvell
> +++ b/doc/README.marvell
> @@ -43,7 +43,12 @@ Build Procedure
>          In order to prevent this, the required device-tree MUST be set during compilation.
>          All device-tree files are located in ./arch/arm/dts/ folder.
>  
> -	For other DB boards (MacchiatoBin, EspressoBin and 3700 DB board) compile u-boot with
> +	For the EspressoBin board without soldered eMMC device use
> +		# make DEVICE_TREE=armada-3720-espressobin
> +	For the EspressoBin board with populated eMMC device use
> +		# make DEVICE_TREE=armada-3720-espressobin-emmc
> +
> +	For other DB boards (MacchiatoBin, and 3700 DB board) compile u-boot with
>  	just default device-tree from defconfig using:
>  
>  		# make
> -- 
> 2.28.0
>