[PATCH] mvebu: armada-8k: respect CONFIG_DISTRO_DEFAULTS

[Stefan Roese]

On 6/21/24 11:46, Robert Marko wrote:
> Currently, Armada 8k config header is setting boot devices and including
> <config_distro_bootcmd.h> regardless of the CONFIG_DISTRO_DEFAULTS being
> enabled or not, thus populating the environment for distro boot even on
> devices that have no need for it.
> 
> So, lets simply respect the value of CONFIG_DISTRO_DEFAULTS.
> 
> Signed-off-by: Robert Marko <robimarko at gmail.com>

Applied to u-boot-marvell/master

Thanks,
Stefan

> ---
>   include/configs/mvebu_armada-8k.h | 5 ++++-
>   1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h
> index 239a09763a..6fedbe9ee3 100644
> --- a/include/configs/mvebu_armada-8k.h
> +++ b/include/configs/mvebu_armada-8k.h
> @@ -30,7 +30,7 @@
>   /*
>    * PCI configuration
>    */
> -
> +#ifdef CONFIG_DISTRO_DEFAULTS
>   #define BOOT_TARGET_DEVICES(func) \
>   	func(MMC, mmc, 1) \
>   	func(MMC, mmc, 0) \
> @@ -40,6 +40,9 @@
>   	func(DHCP, dhcp, na)
>   
>   #include <config_distro_bootcmd.h>
> +#else
> +#define BOOTENV
> +#endif
>   
>   #define CFG_EXTRA_ENV_SETTINGS	\
>   	"scriptaddr=0x6d00000\0"	\

Viele Grüße,
Stefan Roese

-- 
DENX Software Engineering GmbH,      Managing Director: Erika Unter
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