85 lines
2.3 KiB
Diff
85 lines
2.3 KiB
Diff
From 44c798799f667310ce29ce264be5c4bff7a21cf2 Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime.ripard@free-electrons.com>
|
|
Date: Thu, 15 Oct 2015 22:04:07 +0200
|
|
Subject: [PATCH 005/600] 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>
|
|
---
|
|
board/sunxi/Kconfig | 4 ++++
|
|
drivers/mmc/Kconfig | 2 +-
|
|
include/configs/sunxi-common.h | 8 +++++---
|
|
3 files changed, 10 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
|
|
index b336777..f6f2a60 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 d3d7d91..ceae7bc 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 072934d..ddcfe94 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
|
|
--
|
|
2.5.0
|
|
|