[U-Boot] [PATCH 1/9] ARM: sunxi: Fix build break when CONFIG_MMC is not defined

[Ian Campbell <ijc@hellion.org.uk>]

On Tue, 2014-10-07 at 15:11 +0800, Chen-Yu Tsai wrote:
> BOOT_TARGET_DEVICES includes MMC unconditionally. This breaks when
> CONFIG_CMD_MMC is not defined. Use a secondary macro to conditionally
> include it when CONFIG_MMC is enabled, as we do for CONFIG_AHCI.
> 
> This is used when we want to use uart0 from port F, which conflicts
> with mmc0.
> 
> Signed-off-by: Chen-Yu Tsai <wens@csie.org>

Acked-by: Ian Campbell <ijc@hellion.org.uk>

Hans, this made me think back to your " Enable second sdcard slot found
on some boards" series -- do you not want to add mmc1 as a boot target
device when  MMC_SUNXI_SLOT_EXTRA is enabled?

> ---
>  include/configs/sunxi-common.h | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
> index a31656e..7571e0e 100644
> --- a/include/configs/sunxi-common.h
> +++ b/include/configs/sunxi-common.h
> @@ -227,6 +227,12 @@
>  	"pxefile_addr_r=0x43200000\0" \
>  	"ramdisk_addr_r=0x43300000\0"
>  
> +#ifdef CONFIG_MMC
> +#define BOOT_TARGET_DEVICES_MMC(func) func(MMC, mmc, 0)
> +#else
> +#define BOOT_TARGET_DEVICES_MMC(func)
> +#endif
> +
>  #ifdef CONFIG_AHCI
>  #define BOOT_TARGET_DEVICES_SCSI(func) func(SCSI, scsi, 0)
>  #else
> @@ -240,7 +246,7 @@
>  #endif
>  
>  #define BOOT_TARGET_DEVICES(func) \
> -	func(MMC, mmc, 0) \
> +	BOOT_TARGET_DEVICES_MMC(func) \
>  	BOOT_TARGET_DEVICES_SCSI(func) \
>  	BOOT_TARGET_DEVICES_USB(func) \
>  	func(PXE, pxe, na) \