[PATCH v6 11/12] arm: mvebu: clearfog: don't always use SPL MMC

[Stefan Roese]

Hi Joel,

On 23.03.20 21:21, Joel Johnson wrote:
> Move MMC booting assuptions from defconfig to Kconfig which
> includes as needed based on dependent options.
> 
> Signed-off-by: Joel Johnson <mrjoel at lixil.net>
> Reviewed-by: Stefan Roese <sr at denx.de>
> 
> ---
> 
> v2 changes:
>    - rebased on master to use Baruch's dynamic MMC/SD offset logic
>    - update description, will revisit removal of
>      CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC in separate future path if a
>      more viable option is identified
> v3 changes:
>    - none
> v4 changes:
>    - none
> v5 changes:
>    - none
> v6 changes:
>    - none

This generates this warning on (at least) helios4:

...
include/configs/helios4.h:105:0: warning: "CONFIG_SPL_MMC_SUPPORT" redefined
  #define CONFIG_SPL_MMC_SUPPORT

In file included from ././include/linux/kconfig.h:4:0,
                  from <command-line>:0:
include/generated/autoconf.h:83:0: note: this is the location of the 
previous definition
  #define CONFIG_SPL_MMC_SUPPORT 1

In file included from include/config.h:5:0,
                  from include/common.h:16,
                  from drivers/ddr/marvell/a38x/ddr_ml_wrapper.h:9,
                  from drivers/ddr/marvell/a38x/mv_ddr_topology.c:5:
include/configs/helios4.h:105:0: warning: "CONFIG_SPL_MMC_SUPPORT" redefined
  #define CONFIG_SPL_MMC_SUPPORT

In file included from ././include/linux/kconfig.h:4:0,
                  from <command-line>:0:
include/generated/autoconf.h:83:0: note: this is the location of the 
previous definition
  #define CONFIG_SPL_MMC_SUPPORT 1
...

Could you please check and send a new version of this patch?

Please make sure that at least all MVEBU based boards (arm and aarch64)
compile clean with your patches applied.

Thanks,
Stefan

> ---
>   arch/arm/mach-mvebu/Kconfig | 1 +
>   configs/clearfog_defconfig  | 2 --
>   2 files changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
> index 32191e7157..4b381a2936 100644
> --- a/arch/arm/mach-mvebu/Kconfig
> +++ b/arch/arm/mach-mvebu/Kconfig
> @@ -249,6 +249,7 @@ config MVEBU_SPL_BOOT_DEVICE_MMC
>   	select SPL_DM_GPIO
>   	select SPL_DM_MMC
>   	select SPL_LIBDISK_SUPPORT
> +	select SPL_MMC_SUPPORT
>   
>   config MVEBU_SPL_BOOT_DEVICE_SATA
>   	bool "SATA"
> diff --git a/configs/clearfog_defconfig b/configs/clearfog_defconfig
> index 6db8b8acf6..601b1997ed 100644
> --- a/configs/clearfog_defconfig
> +++ b/configs/clearfog_defconfig
> @@ -10,7 +10,6 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
>   CONFIG_TARGET_CLEARFOG=y
>   CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC=y
>   CONFIG_DM_GPIO=y
> -CONFIG_SPL_MMC_SUPPORT=y
>   CONFIG_SPL_SERIAL_SUPPORT=y
>   CONFIG_NR_DRAM_BANKS=2
>   CONFIG_SPL=y
> @@ -42,7 +41,6 @@ CONFIG_CMD_CACHE=y
>   CONFIG_CMD_TIME=y
>   # CONFIG_SPL_PARTITION_UUIDS is not set
>   CONFIG_DEFAULT_DEVICE_TREE="armada-388-clearfog"
> -CONFIG_ENV_IS_IN_MMC=y
>   CONFIG_NET_RANDOM_ETHADDR=y
>   CONFIG_SPL_OF_TRANSLATE=y
>   CONFIG_AHCI_MVEBU=y
> 


Viele Grüße,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de