Re: [PATCHv2 03/31] Convert CONFIG_ARM_PL180_MMCI to Kconfig

2020-06-30 Thread Tom Rini 
On Tue, Jun 16, 2020 at 07:06:03PM -0400, Tom Rini wrote:

> This converts the following to Kconfig:
>CONFIG_ARM_PL180_MMCI
> 
> Signed-off-by: Tom Rini 

Applied to u-boot/next, thanks!

-- 
Tom


signature.asc
Description: PGP signature

[PATCHv2 03/31] Convert CONFIG_ARM_PL180_MMCI to Kconfig

2020-06-16 Thread Tom Rini 
This converts the following to Kconfig:
   CONFIG_ARM_PL180_MMCI

Signed-off-by: Tom Rini 
---
 configs/vexpress_ca15_tc2_defconfig | 1 +
 configs/vexpress_ca5x2_defconfig| 1 +
 configs/vexpress_ca9x4_defconfig| 1 +
 drivers/mmc/Kconfig | 1 -
 include/configs/vexpress_common.h   | 1 -
 5 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/configs/vexpress_ca15_tc2_defconfig 
b/configs/vexpress_ca15_tc2_defconfig
index d2a59774420d..2c78e12df6a1 100644
--- a/configs/vexpress_ca15_tc2_defconfig
+++ b/configs/vexpress_ca15_tc2_defconfig
@@ -23,6 +23,7 @@ CONFIG_CMD_MMC=y
 CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_ENV_ADDR=0xFF8
+CONFIG_ARM_PL180_MMCI=y
 CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
diff --git a/configs/vexpress_ca5x2_defconfig b/configs/vexpress_ca5x2_defconfig
index bedf99a7e163..8395bb74cdb2 100644
--- a/configs/vexpress_ca5x2_defconfig
+++ b/configs/vexpress_ca5x2_defconfig
@@ -22,6 +22,7 @@ CONFIG_CMD_MMC=y
 CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_ENV_ADDR=0xFF8
+CONFIG_ARM_PL180_MMCI=y
 CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
diff --git a/configs/vexpress_ca9x4_defconfig b/configs/vexpress_ca9x4_defconfig
index 8234b5d1bbcf..1811782128ff 100644
--- a/configs/vexpress_ca9x4_defconfig
+++ b/configs/vexpress_ca9x4_defconfig
@@ -23,6 +23,7 @@ CONFIG_CMD_MMC=y
 CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_ENV_ADDR=0x47F8
+CONFIG_ARM_PL180_MMCI=y
 CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
index 8f56572c39a0..33b128ddc5a4 100644
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@ -66,7 +66,6 @@ config MMC_SPI_CRC_ON
 
 config ARM_PL180_MMCI
bool "ARM AMBA Multimedia Card Interface and compatible support"
-   depends on DM_MMC && OF_CONTROL
help
  This selects the ARM(R) AMBA(R) PrimeCell Multimedia Card
  Interface (PL180, PL181 and compatible) support.
diff --git a/include/configs/vexpress_common.h 
b/include/configs/vexpress_common.h
index ca765579e821..ffc3b43fc557 100644
--- a/include/configs/vexpress_common.h
+++ b/include/configs/vexpress_common.h
@@ -135,7 +135,6 @@
 #define CONFIG_SYS_SERIAL0 V2M_UART0
 #define CONFIG_SYS_SERIAL1 V2M_UART1
 
-#define CONFIG_ARM_PL180_MMCI
 #define CONFIG_ARM_PL180_MMCI_BASE V2M_MMCI
 #define CONFIG_SYS_MMC_MAX_BLK_COUNT   127
 #define CONFIG_ARM_PL180_MMCI_CLOCK_FREQ 625
-- 
2.17.1