Browse Source

Convert CONFIG_ARM_PL180_MMCI to Kconfig

This converts the following to Kconfig:
   CONFIG_ARM_PL180_MMCI

Signed-off-by: Tom Rini <trini@konsulko.com>
Tom Rini 4 years ago
parent
commit
b40fa97286

+ 1 - 0
configs/vexpress_ca15_tc2_defconfig

@@ -23,6 +23,7 @@ CONFIG_CMD_MMC=y
 CONFIG_CMD_UBI=y
 CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_ENV_ADDR=0xFF80000
 CONFIG_ENV_ADDR=0xFF80000
+CONFIG_ARM_PL180_MMCI=y
 CONFIG_MTD=y
 CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_FLASH_CFI_DRIVER=y

+ 1 - 0
configs/vexpress_ca5x2_defconfig

@@ -22,6 +22,7 @@ CONFIG_CMD_MMC=y
 CONFIG_CMD_UBI=y
 CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_ENV_ADDR=0xFF80000
 CONFIG_ENV_ADDR=0xFF80000
+CONFIG_ARM_PL180_MMCI=y
 CONFIG_MTD=y
 CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_FLASH_CFI_DRIVER=y

+ 1 - 0
configs/vexpress_ca9x4_defconfig

@@ -23,6 +23,7 @@ CONFIG_CMD_MMC=y
 CONFIG_CMD_UBI=y
 CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_ENV_ADDR=0x47F80000
 CONFIG_ENV_ADDR=0x47F80000
+CONFIG_ARM_PL180_MMCI=y
 CONFIG_MTD=y
 CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_FLASH_CFI_DRIVER=y

+ 0 - 1
drivers/mmc/Kconfig

@@ -66,7 +66,6 @@ config MMC_SPI_CRC_ON
 
 
 config ARM_PL180_MMCI
 config ARM_PL180_MMCI
 	bool "ARM AMBA Multimedia Card Interface and compatible support"
 	bool "ARM AMBA Multimedia Card Interface and compatible support"
-	depends on DM_MMC && OF_CONTROL
 	help
 	help
 	  This selects the ARM(R) AMBA(R) PrimeCell Multimedia Card
 	  This selects the ARM(R) AMBA(R) PrimeCell Multimedia Card
 	  Interface (PL180, PL181 and compatible) support.
 	  Interface (PL180, PL181 and compatible) support.

+ 0 - 1
include/configs/vexpress_common.h

@@ -135,7 +135,6 @@
 #define CONFIG_SYS_SERIAL0		V2M_UART0
 #define CONFIG_SYS_SERIAL0		V2M_UART0
 #define CONFIG_SYS_SERIAL1		V2M_UART1
 #define CONFIG_SYS_SERIAL1		V2M_UART1
 
 
-#define CONFIG_ARM_PL180_MMCI
 #define CONFIG_ARM_PL180_MMCI_BASE	V2M_MMCI
 #define CONFIG_ARM_PL180_MMCI_BASE	V2M_MMCI
 #define CONFIG_SYS_MMC_MAX_BLK_COUNT	127
 #define CONFIG_SYS_MMC_MAX_BLK_COUNT	127
 #define CONFIG_ARM_PL180_MMCI_CLOCK_FREQ 6250000
 #define CONFIG_ARM_PL180_MMCI_CLOCK_FREQ 6250000