diff options
| author | Maxime Ripard <maxime.ripard@free-electrons.com> | 2015-10-15 22:04:07 +0200 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2015-10-20 22:48:28 +0200 |
| commit | 44c798799f667310ce29ce264be5c4bff7a21cf2 (patch) | |
| tree | 9c7c539adc49adda3bc0a1a88845c82de93ac08f | |
| parent | f7d6b3cc1686f2fc6ea4c28590710c89bedd3a55 (diff) | |
| download | talos-obmc-uboot-44c798799f667310ce29ce264be5c4bff7a21cf2.tar.gz talos-obmc-uboot-44c798799f667310ce29ce264be5c4bff7a21cf2.zip | |
sunxi: Use Kconfig CONFIG_MMC
Not all sunxi boards have an MMC embedded. Switching to the Kconfig option
will allow to enable or disable the support in each boards' defconfig.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
| -rw-r--r-- | board/sunxi/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/mmc/Kconfig | 2 | ||||
| -rw-r--r-- | include/configs/sunxi-common.h | 8 |
3 files changed, 10 insertions, 4 deletions
diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig index b3367779af..f6f2a605ec 100644 --- a/board/sunxi/Kconfig +++ b/board/sunxi/Kconfig @@ -227,6 +227,10 @@ config OLD_SUNXI_KERNEL_COMPAT Set this to enable various workarounds for old kernels, this results in sub-optimal settings for newer kernels, only enable if needed. +config MMC + depends on !UART0_PORT_F + default y if ARCH_SUNXI + config MMC0_CD_PIN string "Card detect pin for mmc0" default "" diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index d3d7d911e4..ceae7bcaec 100644 --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig @@ -2,7 +2,7 @@ menu "MMC Host controller Support" config MMC bool "Enable MMC support" - depends on UNUSED + depends on ARCH_SUNXI help TODO: Move all architectures to use this option diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 072934d151..ddcfe94e89 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -140,8 +140,7 @@ #endif /* mmc config */ -#if !defined(CONFIG_UART0_PORT_F) -#define CONFIG_MMC +#ifdef CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_CMD_MMC #define CONFIG_MMC_SUNXI @@ -197,7 +196,7 @@ #define CONFIG_SPL_LIBDISK_SUPPORT -#if !defined(CONFIG_UART0_PORT_F) +#ifdef CONFIG_MMC #define CONFIG_SPL_MMC_SUPPORT #endif @@ -355,9 +354,12 @@ extern int soft_i2c_gpio_scl; #define CONFIG_ANDROID_BOOT_IMAGE #define CONFIG_FASTBOOT_FLASH + +#ifdef CONFIG_MMC #define CONFIG_FASTBOOT_FLASH_MMC_DEV 0 #define CONFIG_EFI_PARTITION #endif +#endif #ifdef CONFIG_USB_FUNCTION_MASS_STORAGE #define CONFIG_CMD_USB_MASS_STORAGE |
