From: Chen-Yu Tsai Date: Tue, 7 Oct 2014 07:11:49 +0000 (+0800) Subject: ARM: sunxi: Fix build break when CONFIG_MMC is not defined X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=41f8e9f5c48ec919b1a44591008ddc3e5a045228;p=project%2Fbcm63xx%2Fu-boot.git ARM: sunxi: Fix build break when CONFIG_MMC is not defined 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 Acked-by: Ian Campbell --- diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 5f54c01653..d55e4cab06 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -226,6 +226,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 @@ -239,7 +245,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) \