From: Marcel Ziswiler <marcel@ziswiler.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v1 06/10] kconfig: mmc: move pxa_mmc_generic to kconfig
Date: Mon, 20 May 2019 02:44:58 +0200 [thread overview]
Message-ID: <20190520004502.8924-7-marcel@ziswiler.com> (raw)
In-Reply-To: <20190520004502.8924-1-marcel@ziswiler.com>
Move CONFIG_PXA_MMC_GENERIC to Kconfig.
Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com>
---
configs/colibri_pxa270_defconfig | 1 +
configs/zipitz2_defconfig | 1 +
drivers/mmc/Kconfig | 8 ++++++++
include/configs/pxa-common.h | 7 -------
include/configs/zipitz2.h | 8 --------
scripts/config_whitelist.txt | 1 -
6 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/configs/colibri_pxa270_defconfig b/configs/colibri_pxa270_defconfig
index 492ee9eaaf..a3c07d5887 100644
--- a/configs/colibri_pxa270_defconfig
+++ b/configs/colibri_pxa270_defconfig
@@ -27,6 +27,7 @@ CONFIG_CMD_FAT=y
CONFIG_ENV_IS_IN_FLASH=y
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
CONFIG_DM=y
+CONFIG_PXA_MMC_GENERIC=y
CONFIG_MTD_NOR_FLASH=y
CONFIG_FLASH_CFI_DRIVER=y
CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
diff --git a/configs/zipitz2_defconfig b/configs/zipitz2_defconfig
index 509adcffd9..9590d16593 100644
--- a/configs/zipitz2_defconfig
+++ b/configs/zipitz2_defconfig
@@ -11,6 +11,7 @@ CONFIG_HUSH_PARSER=y
# CONFIG_AUTO_COMPLETE is not set
CONFIG_SYS_PROMPT="$ "
CONFIG_CMD_MMC=y
+CONFIG_PXA_MMC_GENERIC=y
CONFIG_CMD_SPI=y
CONFIG_CMD_USB=y
# CONFIG_CMD_SETEXPR is not set
diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
index c23299ea96..d89140e520 100644
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@ -274,6 +274,14 @@ config MMC_PCI
If unsure, say N.
+config PXA_MMC_GENERIC
+ bool "Support for MMC controllers on PXA"
+ help
+ This selects MMC controllers on PXA.
+ If you are on a PXA architecture, say Y here.
+
+ If unsure, say N.
+
config MMC_OMAP_HS
bool "TI OMAP High Speed Multimedia Card Interface support"
select DM_REGULATOR_PBIAS if DM_MMC && DM_REGULATOR
diff --git a/include/configs/pxa-common.h b/include/configs/pxa-common.h
index e25800a095..ba315b3fb8 100644
--- a/include/configs/pxa-common.h
+++ b/include/configs/pxa-common.h
@@ -17,13 +17,6 @@
#define CONFIG_KGDB_BAUDRATE 230400
#endif
-/*
- * MMC Card Configuration
- */
-#ifdef CONFIG_CMD_MMC
-#define CONFIG_PXA_MMC_GENERIC
-#endif
-
/*
* OHCI USB
*/
diff --git a/include/configs/zipitz2.h b/include/configs/zipitz2.h
index 24fea68a11..cf8f6ff671 100644
--- a/include/configs/zipitz2.h
+++ b/include/configs/zipitz2.h
@@ -47,14 +47,6 @@
* Bootloader Components Configuration
*/
-/*
- * MMC Card Configuration
- */
-#ifdef CONFIG_CMD_MMC
-#define CONFIG_PXA_MMC_GENERIC
-#define CONFIG_SYS_MMC_BASE 0xF0000000
-#endif
-
/*
* SPI and LCD
*/
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index b16bc6ae34..511287ada0 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1533,7 +1533,6 @@ CONFIG_PSRAM_SCFG
CONFIG_PWM
CONFIG_PWM_IMX
CONFIG_PXA_LCD
-CONFIG_PXA_MMC_GENERIC
CONFIG_PXA_PWR_I2C
CONFIG_PXA_STD_I2C
CONFIG_PXA_VGA
--
2.21.0
next prev parent reply other threads:[~2019-05-20 0:44 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-20 0:44 [U-Boot] [PATCH v1 00/10] arm: pxa: mmc: add driver model support Marcel Ziswiler
2019-05-20 0:44 ` [U-Boot] [PATCH v1 01/10] mmc: add missing space before comment delimiter Marcel Ziswiler
2019-05-20 7:06 ` Peng Fan
2019-05-20 13:55 ` Igor Opaniuk
2020-06-30 15:21 ` Tom Rini
2019-05-20 0:44 ` [U-Boot] [PATCH v1 02/10] mmc: fsl_esdhc: annotate endifs Marcel Ziswiler
2019-05-20 2:17 ` Fabio Estevam
2019-05-20 7:07 ` Peng Fan
2019-05-20 13:51 ` Igor Opaniuk
2019-05-20 0:44 ` [U-Boot] [PATCH v1 03/10] serial: pxa: clean-up platform data include file Marcel Ziswiler
2019-05-20 0:59 ` Marek Vasut
2020-06-30 15:21 ` Tom Rini
2019-05-20 0:44 ` [U-Boot] [PATCH v1 04/10] Makefile: allow dm_mmc without of_control Marcel Ziswiler
2019-05-20 16:09 ` Simon Glass
2020-06-30 15:21 ` Tom Rini
2019-05-20 0:44 ` [U-Boot] [PATCH v1 05/10] dm: core: gracefully handle alias seq without of Marcel Ziswiler
2019-05-20 16:09 ` Simon Glass
2020-06-30 15:21 ` Tom Rini
2019-05-20 0:44 ` Marcel Ziswiler [this message]
2019-05-20 16:09 ` [U-Boot] [PATCH v1 06/10] kconfig: mmc: move pxa_mmc_generic to kconfig Simon Glass
2020-06-30 15:21 ` Tom Rini
2019-05-20 0:44 ` [U-Boot] [PATCH v1 07/10] arm: pxa: mmc: add driver model support Marcel Ziswiler
2019-05-20 1:04 ` Marek Vasut
2020-06-30 15:21 ` Tom Rini
2019-05-20 0:45 ` [U-Boot] [PATCH v1 08/10] colibri_pxa270_defconfig: enable cmd_dm Marcel Ziswiler
2019-05-20 1:05 ` Marek Vasut
2020-06-30 15:21 ` Tom Rini
2019-05-20 0:45 ` [U-Boot] [PATCH v1 09/10] colibri_pxa270: add mmc platform data Marcel Ziswiler
2019-05-20 1:06 ` Marek Vasut
2020-06-30 15:21 ` Tom Rini
2019-05-20 0:45 ` [U-Boot] [PATCH v1 10/10] colibri_pxa270_defconfig: enable dm_mmc Marcel Ziswiler
2019-05-20 13:57 ` Igor Opaniuk
2020-06-30 15:22 ` Tom Rini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190520004502.8924-7-marcel@ziswiler.com \
--to=marcel@ziswiler.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox