LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Maxime Ripard 2015-10-15 22:04:07 +02:00 committed by Hans de Goede
parent f7d6b3cc16
commit 44c798799f
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
board/sunxi/Kconfig
View File

@ -227,6 +227,10 @@ config OLD_SUNXI_KERNEL_COMPAT
Set this to enable various workarounds for old kernels, this results in Set this to enable various workarounds for old kernels, this results in
sub-optimal settings for newer kernels, only enable if needed. 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 config MMC0_CD_PIN
string "Card detect pin for mmc0" string "Card detect pin for mmc0"
default "" default ""

2
drivers/mmc/Kconfig
View File

@ -2,7 +2,7 @@ menu "MMC Host controller Support"
config MMC config MMC
bool "Enable MMC support" bool "Enable MMC support"
depends on UNUSED depends on ARCH_SUNXI
help help
TODO: Move all architectures to use this option TODO: Move all architectures to use this option

8
include/configs/sunxi-common.h
View File

@ -140,8 +140,7 @@
#endif #endif
/* mmc config */ /* mmc config */
#if !defined(CONFIG_UART0_PORT_F) #ifdef CONFIG_MMC
#define CONFIG_MMC
#define CONFIG_GENERIC_MMC #define CONFIG_GENERIC_MMC
#define CONFIG_CMD_MMC #define CONFIG_CMD_MMC
#define CONFIG_MMC_SUNXI #define CONFIG_MMC_SUNXI
@ -197,7 +196,7 @@
#define CONFIG_SPL_LIBDISK_SUPPORT #define CONFIG_SPL_LIBDISK_SUPPORT
#if !defined(CONFIG_UART0_PORT_F) #ifdef CONFIG_MMC
#define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SPL_MMC_SUPPORT
#endif #endif
@ -355,9 +354,12 @@ extern int soft_i2c_gpio_scl;
#define CONFIG_ANDROID_BOOT_IMAGE #define CONFIG_ANDROID_BOOT_IMAGE
#define CONFIG_FASTBOOT_FLASH #define CONFIG_FASTBOOT_FLASH
#ifdef CONFIG_MMC
#define CONFIG_FASTBOOT_FLASH_MMC_DEV 0 #define CONFIG_FASTBOOT_FLASH_MMC_DEV 0
#define CONFIG_EFI_PARTITION #define CONFIG_EFI_PARTITION
#endif #endif
#endif
#ifdef CONFIG_USB_FUNCTION_MASS_STORAGE #ifdef CONFIG_USB_FUNCTION_MASS_STORAGE
#define CONFIG_CMD_USB_MASS_STORAGE #define CONFIG_CMD_USB_MASS_STORAGE