[PATCH 3/5] arm: mvebu: turris_omnia: Always enable MMC, SCSI and USB boot targets

[Stefan Roese]

On 06.04.22 11:39, Pali Rohár wrote:
> U-Boot for Turris Omnia is always compiled with MMC, SCSI and USB support,
> so always enable macros for booting from these devices.
> 
> Signed-off-by: Pali Rohár <pali at kernel.org>
> ---
>   include/configs/turris_omnia.h | 24 +++---------------------
>   1 file changed, 3 insertions(+), 21 deletions(-)
> 
> diff --git a/include/configs/turris_omnia.h b/include/configs/turris_omnia.h
> index 15f874ea22e1..25aa0d0f9075 100644
> --- a/include/configs/turris_omnia.h
> +++ b/include/configs/turris_omnia.h
> @@ -54,28 +54,10 @@
>   /* Include the common distro boot environment */
>   #ifndef CONFIG_SPL_BUILD
>   
> -#ifdef CONFIG_MMC
> -#define BOOT_TARGET_DEVICES_MMC(func) func(MMC, mmc, 0)
> -#else
> -#define BOOT_TARGET_DEVICES_MMC(func)
> -#endif
> -
> -#ifdef CONFIG_USB_STORAGE
> -#define BOOT_TARGET_DEVICES_USB(func) func(USB, usb, 0)
> -#else
> -#define BOOT_TARGET_DEVICES_USB(func)
> -#endif
> -
> -#ifdef CONFIG_SCSI
> -#define BOOT_TARGET_DEVICES_SCSI(func) func(SCSI, scsi, 0)
> -#else
> -#define BOOT_TARGET_DEVICES_SCSI(func)
> -#endif
> -
>   #define BOOT_TARGET_DEVICES(func) \
> -	BOOT_TARGET_DEVICES_MMC(func) \
> -	BOOT_TARGET_DEVICES_SCSI(func) \
> -	BOOT_TARGET_DEVICES_USB(func) \
> +	func(MMC, mmc, 0) \
> +	func(SCSI, scsi, 0) \
> +	func(USB, usb, 0) \
>   	func(PXE, pxe, na) \
>   	func(DHCP, dhcp, na)
>   

Applied to u-boot-marvell/master

Thanks,
Stefan