The driver for the dw_mmc depends on the bounce buffer utility functions. Unconditionally select BOUNCE_BUFFER, when DW_MMC is enabled.
Includes the migration (moveconfig with manual postprocessing of config-headers to drop unused comments) for the boards using DW_MMC.
Signed-off-by: Philipp Tomsich philipp.tomsich@theobroma-systems.com ---
drivers/mmc/Kconfig | 1 + include/configs/emsdp.h | 3 --- include/configs/exynos-common.h | 3 --- include/configs/hikey.h | 3 --- include/configs/hsdk.h | 5 ----- include/configs/iot_devkit.h | 3 --- include/configs/poplar.h | 3 --- include/configs/rk3036_common.h | 2 -- include/configs/rk3128_common.h | 3 --- include/configs/rk3188_common.h | 3 --- include/configs/rk322x_common.h | 3 --- include/configs/rk3288_common.h | 3 --- include/configs/rk3328_common.h | 3 --- include/configs/rk3368_common.h | 2 -- include/configs/rk3399_common.h | 1 - 15 files changed, 1 insertion(+), 40 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 385d59e..23c71f4 100644 --- a/include/configs/emsdp.h +++ b/include/configs/emsdp.h @@ -18,9 +18,6 @@ #define CONFIG_SYS_MALLOC_LEN SZ_64K #define CONFIG_SYS_LOAD_ADDR CONFIG_SYS_SDRAM_BASE
-/* Required by DW MMC driver */ -#define CONFIG_BOUNCE_BUFFER - /* * Environment */ diff --git a/include/configs/exynos-common.h b/include/configs/exynos-common.h index f3f194f..752acc5 100644 --- a/include/configs/exynos-common.h +++ b/include/configs/exynos-common.h @@ -34,9 +34,6 @@
/* select serial console configuration */
-/* SD/MMC configuration */ -#define CONFIG_BOUNCE_BUFFER - /* PWM */ #define CONFIG_PWM
diff --git a/include/configs/hikey.h b/include/configs/hikey.h index 1376d61..6d9e6eb 100644 --- a/include/configs/hikey.h +++ b/include/configs/hikey.h @@ -53,9 +53,6 @@
#define CONFIG_HIKEY_GPIO
-/* SD/MMC configuration */ -#define CONFIG_BOUNCE_BUFFER - /* Command line configuration */
/* BOOTP options */ diff --git a/include/configs/hsdk.h b/include/configs/hsdk.h index cdf4fdd..2ec2fd1 100644 --- a/include/configs/hsdk.h +++ b/include/configs/hsdk.h @@ -116,11 +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 - */ -#define CONFIG_BOUNCE_BUFFER - /* Cli configuration */ #define CONFIG_SYS_CBSIZE SZ_2K
diff --git a/include/configs/iot_devkit.h b/include/configs/iot_devkit.h index 4ffe114..cd1309d 100644 --- a/include/configs/iot_devkit.h +++ b/include/configs/iot_devkit.h @@ -71,9 +71,6 @@ CONFIG_SYS_MALLOC_LEN - \ CONFIG_ENV_SIZE
-/* Required by DW MMC driver */ -#define CONFIG_BOUNCE_BUFFER - /* * Environment */ diff --git a/include/configs/poplar.h b/include/configs/poplar.h index 0a12600..a7a77ec 100644 --- a/include/configs/poplar.h +++ b/include/configs/poplar.h @@ -26,9 +26,6 @@ /* USB configuration */ #define CONFIG_USB_MAX_CONTROLLER_COUNT 2
-/* SD/MMC */ -#define CONFIG_BOUNCE_BUFFER - /***************************************************************************** * Initial environment variables *****************************************************************************/ diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h index d4e5406..1a6aeb7 100644 --- a/include/configs/rk3036_common.h +++ b/include/configs/rk3036_common.h @@ -25,8 +25,6 @@ #define CONFIG_ROCKCHIP_CHIP_TAG "RK30"
/* MMC/SD IP block */ -#define CONFIG_BOUNCE_BUFFER - #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 3e9e642..f4f64ed 100644 --- a/include/configs/rk3128_common.h +++ b/include/configs/rk3128_common.h @@ -23,9 +23,6 @@
#define CONFIG_SYS_BOOTM_LEN (64 << 20) /* 64M */
-/* MMC/SD IP block */ -#define CONFIG_BOUNCE_BUFFER - /* 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 d1837d5..612d643 100644 --- a/include/configs/rk3188_common.h +++ b/include/configs/rk3188_common.h @@ -33,9 +33,6 @@
#define CONFIG_SPL_STACK 0x10087fff
-/* MMC/SD IP block */ -#define CONFIG_BOUNCE_BUFFER - #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 176bd0c..e72aa8d 100644 --- a/include/configs/rk322x_common.h +++ b/include/configs/rk322x_common.h @@ -25,9 +25,6 @@ #define CONFIG_ROCKCHIP_MAX_INIT_SIZE (28 << 10) #define CONFIG_ROCKCHIP_CHIP_TAG "RK32"
-/* MMC/SD IP block */ -#define CONFIG_BOUNCE_BUFFER - #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 5388b13..01f297b 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -29,9 +29,6 @@ # define CONFIG_SPL_TEXT_BASE 0xff704000 #endif
-/* MMC/SD IP block */ -#define CONFIG_BOUNCE_BUFFER - /* 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 9174c67..4afa186 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 */ -#define CONFIG_BOUNCE_BUFFER - /* RAW SD card / eMMC locations. */ #define CONFIG_SYS_SPI_U_BOOT_OFFS (128 << 10)
diff --git a/include/configs/rk3368_common.h b/include/configs/rk3368_common.h index 6638491..88c1af0 100644 --- a/include/configs/rk3368_common.h +++ b/include/configs/rk3368_common.h @@ -32,8 +32,6 @@ #define CONFIG_SPL_BSS_START_ADDR 0x400000 #define CONFIG_SPL_BSS_MAX_SIZE 0x20000
-#define CONFIG_BOUNCE_BUFFER - #ifndef CONFIG_SPL_BUILD #define ENV_MEM_LAYOUT_SETTINGS \ "scriptaddr=0x00500000\0" \ diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h index eeda070..9a4da39 100644 --- a/include/configs/rk3399_common.h +++ b/include/configs/rk3399_common.h @@ -28,7 +28,6 @@ #define CONFIG_SYS_BOOTM_LEN (64 << 20) /* 64M */
/* MMC/SD IP block */ -#define CONFIG_BOUNCE_BUFFER #define CONFIG_ROCKCHIP_SDHCI_MAX_FREQ 200000000
/* RAW SD card / eMMC locations. */