[U-Boot] [PATCH v3 2/5] mmc: dw_mmc: depend on BOUNCE_BUFFER

Philipp Tomsich philipp.tomsich at theobroma-systems.com
Fri Nov 30 21:13:26 UTC 2018


The driver for the dw_mmc depends on the bounce buffer utility
functions. Unconditionally select BOUNCE_BUFFER, when DW_MMC is
enabled.

This also includes the postprocessing of the config-headers to
drop now-unused comments after moveconfig has run.

Signed-off-by: Philipp Tomsich <philipp.tomsich at theobroma-systems.com>
Reviewed-by: Otavio Salvador <otavio at ossystems.com.br>
---

Changes in v3:
- also remove the define from the recently added rv1108_common.h

Changes in v2: None

 drivers/mmc/Kconfig             | 1 +
 include/configs/emsdp.h         | 2 --
 include/configs/exynos-common.h | 2 --
 include/configs/hikey.h         | 2 --
 include/configs/hsdk.h          | 4 ----
 include/configs/iot_devkit.h    | 2 --
 include/configs/poplar.h        | 2 --
 include/configs/rk3036_common.h | 2 --
 include/configs/rk3128_common.h | 2 --
 include/configs/rk3188_common.h | 2 --
 include/configs/rk322x_common.h | 2 --
 include/configs/rk3288_common.h | 2 --
 include/configs/rk3328_common.h | 3 ---
 include/configs/rv1108_common.h | 3 ---
 14 files changed, 1 insertion(+), 30 deletions(-)

diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
index fbd1396..65d43a5 100644
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@ -178,6 +178,7 @@ config MMC_DAVINCI
 
 config MMC_DW
 	bool "Synopsys DesignWare Memory Card Interface"
+	select BOUNCE_BUFFER
 	help
 	  This selects support for the Synopsys DesignWare Mobile Storage IP
 	  block, this provides host support for SD and MMC interfaces, in both
diff --git a/include/configs/emsdp.h b/include/configs/emsdp.h
index a77f262..23c71f4 100644
--- a/include/configs/emsdp.h
+++ b/include/configs/emsdp.h
@@ -18,8 +18,6 @@
 #define CONFIG_SYS_MALLOC_LEN		SZ_64K
 #define CONFIG_SYS_LOAD_ADDR		CONFIG_SYS_SDRAM_BASE
 
-/* Required by DW MMC driver */
-
 /*
  * Environment
  */
diff --git a/include/configs/exynos-common.h b/include/configs/exynos-common.h
index 543bf8e..752acc5 100644
--- a/include/configs/exynos-common.h
+++ b/include/configs/exynos-common.h
@@ -34,8 +34,6 @@
 
 /* select serial console configuration */
 
-/* SD/MMC configuration */
-
 /* PWM */
 #define CONFIG_PWM
 
diff --git a/include/configs/hikey.h b/include/configs/hikey.h
index 3a308cf..6d9e6eb 100644
--- a/include/configs/hikey.h
+++ b/include/configs/hikey.h
@@ -53,8 +53,6 @@
 
 #define CONFIG_HIKEY_GPIO
 
-/* SD/MMC configuration */
-
 /* Command line configuration */
 
 /* BOOTP options */
diff --git a/include/configs/hsdk.h b/include/configs/hsdk.h
index bafd8d0..2ec2fd1 100644
--- a/include/configs/hsdk.h
+++ b/include/configs/hsdk.h
@@ -116,10 +116,6 @@ setenv core_iccm_3 0x6; setenv core_dccm_3 0x6;\0"
 #define CONFIG_BOOTFILE			"uImage"
 #define CONFIG_LOADADDR			CONFIG_SYS_LOAD_ADDR
 
-/*
- * Misc utility configuration
- */
-
 /* Cli configuration */
 #define CONFIG_SYS_CBSIZE		SZ_2K
 
diff --git a/include/configs/iot_devkit.h b/include/configs/iot_devkit.h
index 1f40d61..cd1309d 100644
--- a/include/configs/iot_devkit.h
+++ b/include/configs/iot_devkit.h
@@ -71,8 +71,6 @@
 					CONFIG_SYS_MALLOC_LEN - \
 					CONFIG_ENV_SIZE
 
-/* Required by DW MMC driver */
-
 /*
  * Environment
  */
diff --git a/include/configs/poplar.h b/include/configs/poplar.h
index 6ca9ae9..a7a77ec 100644
--- a/include/configs/poplar.h
+++ b/include/configs/poplar.h
@@ -26,8 +26,6 @@
 /* USB configuration */
 #define CONFIG_USB_MAX_CONTROLLER_COUNT		2
 
-/* SD/MMC */
-
 /*****************************************************************************
  *  Initial environment variables
  *****************************************************************************/
diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h
index 301bd2f..e307855 100644
--- a/include/configs/rk3036_common.h
+++ b/include/configs/rk3036_common.h
@@ -24,8 +24,6 @@
 #define CONFIG_ROCKCHIP_MAX_INIT_SIZE	(4 << 10)
 #define CONFIG_ROCKCHIP_CHIP_TAG	"RK30"
 
-/* MMC/SD IP block */
-
 #define CONFIG_SYS_SDRAM_BASE		0x60000000
 #define SDRAM_BANK_SIZE			(512UL << 20UL)
 #define SDRAM_MAX_SIZE                  (CONFIG_NR_DRAM_BANKS * SDRAM_BANK_SIZE)
diff --git a/include/configs/rk3128_common.h b/include/configs/rk3128_common.h
index a8a4e02..f4f64ed 100644
--- a/include/configs/rk3128_common.h
+++ b/include/configs/rk3128_common.h
@@ -23,8 +23,6 @@
 
 #define CONFIG_SYS_BOOTM_LEN	(64 << 20)	/* 64M */
 
-/* MMC/SD IP block */
-
 /* RAW SD card / eMMC locations. */
 #define CONFIG_SYS_SPI_U_BOOT_OFFS	(128 << 10)
 
diff --git a/include/configs/rk3188_common.h b/include/configs/rk3188_common.h
index 23938f7..612d643 100644
--- a/include/configs/rk3188_common.h
+++ b/include/configs/rk3188_common.h
@@ -33,8 +33,6 @@
 
 #define CONFIG_SPL_STACK		0x10087fff
 
-/* MMC/SD IP block */
-
 #define CONFIG_SYS_SDRAM_BASE		0x60000000
 #define SDRAM_BANK_SIZE			(2UL << 30)
 #define SDRAM_MAX_SIZE			0x80000000
diff --git a/include/configs/rk322x_common.h b/include/configs/rk322x_common.h
index 4c658b0..e72aa8d 100644
--- a/include/configs/rk322x_common.h
+++ b/include/configs/rk322x_common.h
@@ -25,8 +25,6 @@
 #define CONFIG_ROCKCHIP_MAX_INIT_SIZE	(28 << 10)
 #define CONFIG_ROCKCHIP_CHIP_TAG	"RK32"
 
-/* MMC/SD IP block */
-
 #define CONFIG_SYS_SDRAM_BASE		0x60000000
 #define SDRAM_BANK_SIZE			(512UL << 20UL)
 #define SDRAM_MAX_SIZE			0x80000000
diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h
index 79b62d6..01f297b 100644
--- a/include/configs/rk3288_common.h
+++ b/include/configs/rk3288_common.h
@@ -29,8 +29,6 @@
 # define CONFIG_SPL_TEXT_BASE		0xff704000
 #endif
 
-/* MMC/SD IP block */
-
 /* RAW SD card / eMMC locations. */
 #define CONFIG_SYS_SPI_U_BOOT_OFFS	(128 << 10)
 
diff --git a/include/configs/rk3328_common.h b/include/configs/rk3328_common.h
index a7df976..7913ef7 100644
--- a/include/configs/rk3328_common.h
+++ b/include/configs/rk3328_common.h
@@ -19,9 +19,6 @@
 
 #define CONFIG_SYS_BOOTM_LEN	(64 << 20)	/* 64M */
 
-/* MMC/SD IP block */
-
-/* RAW SD card / eMMC locations. */
 #define CONFIG_SYS_SPI_U_BOOT_OFFS	(128 << 10)
 
 /* FAT sd card locations. */
diff --git a/include/configs/rv1108_common.h b/include/configs/rv1108_common.h
index 16d4e2e..952ea9f 100644
--- a/include/configs/rv1108_common.h
+++ b/include/configs/rv1108_common.h
@@ -17,9 +17,6 @@
 #define CONFIG_SYS_TIMER_BASE		0x10350020
 #define CONFIG_SYS_TIMER_COUNTER	(CONFIG_SYS_TIMER_BASE + 8)
 
-/* MMC/SD IP block */
-#define CONFIG_BOUNCE_BUFFER
-
 #define CONFIG_SYS_SDRAM_BASE		0x60000000
 #define CONFIG_SYS_INIT_SP_ADDR		(CONFIG_SYS_TEXT_BASE + 0x100000)
 #define CONFIG_SYS_LOAD_ADDR		(CONFIG_SYS_SDRAM_BASE + 0x2000000)
-- 
2.1.4



More information about the U-Boot mailing list