From 2acc24fc28ef782f4baef1aa0193d520ee9610b9 Mon Sep 17 00:00:00 2001 From: Philipp Tomsich Date: Fri, 30 Nov 2018 22:13:25 +0100 Subject: Kconfig: Migrate BOUNCE_BUFFER The bounce buffer is used by a few drivers (most of the MMC drivers) to overcome limitations in their respective DMA implementation. This moves the configuration to Kconfig and makes it user-selectable (even though it will be a required feature to make those drivers work): the expected usage is for drivers depending on this to 'select' it unconditionally from their respective Kconfig (see follow-up patches). This commit includes a full migration using moveconfig.py to ensure that each commit compiles. To ensure bisectability we update dependencies of various drivers to now select BOUNCE_BUFFER when needed. [trini: Squash all patches to ensure bisectability] Signed-off-by: Tom Rini Signed-off-by: Philipp Tomsich Reviewed-by: Otavio Salvador [dw_mmc portion] Reviewed-by: Fabio Estevam [mxsmmc portion] Reviewed-by: Simon Glass [tegra portion] --- include/configs/axs10x.h | 5 ----- include/configs/bcm_ep_board.h | 3 --- 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/mx6_common.h | 1 - include/configs/mx7_common.h | 1 - include/configs/mx7ulp_evk.h | 1 - include/configs/mxs.h | 5 ----- include/configs/poplar.h | 3 --- include/configs/rk3036_common.h | 3 --- 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 | 4 ---- include/configs/rk3368_common.h | 2 -- include/configs/rk3399_common.h | 1 - include/configs/rv1108_common.h | 3 --- include/configs/socfpga_common.h | 1 - include/configs/socfpga_stratix10_socdk.h | 1 - include/configs/tegra-common.h | 3 --- 24 files changed, 66 deletions(-) (limited to 'include/configs') diff --git a/include/configs/axs10x.h b/include/configs/axs10x.h index 1b2966fd61..bd1c9025c6 100644 --- a/include/configs/axs10x.h +++ b/include/configs/axs10x.h @@ -82,9 +82,4 @@ * Console configuration */ -/* - * Misc utility configuration - */ -#define CONFIG_BOUNCE_BUFFER - #endif /* _CONFIG_AXS10X_H_ */ diff --git a/include/configs/bcm_ep_board.h b/include/configs/bcm_ep_board.h index 0586c53ae1..09a5804e7a 100644 --- a/include/configs/bcm_ep_board.h +++ b/include/configs/bcm_ep_board.h @@ -55,7 +55,4 @@ /* Enable Time Command */ -/* Misc utility code */ -#define CONFIG_BOUNCE_BUFFER - #endif /* __BCM_EP_BOARD_H */ diff --git a/include/configs/emsdp.h b/include/configs/emsdp.h index 9a205edc7c..e6b2469148 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 f3f194ff7a..752acc58d0 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 572a52fad5..003cd75baf 100644 --- a/include/configs/hikey.h +++ b/include/configs/hikey.h @@ -55,9 +55,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 cdf4fddd94..2ec2fd12a1 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 4ffe1141d9..cd1309d4b9 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/mx6_common.h b/include/configs/mx6_common.h index 1b2961f68e..cdc8833778 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -55,7 +55,6 @@ #define CONFIG_SYS_MAXARGS 32 /* MMC */ -#define CONFIG_BOUNCE_BUFFER #define CONFIG_FSL_USDHC /* Fuses */ diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h index b0b7e1edd4..a895c936aa 100644 --- a/include/configs/mx7_common.h +++ b/include/configs/mx7_common.h @@ -40,7 +40,6 @@ #define CONFIG_MXC_UART /* MMC */ -#define CONFIG_BOUNCE_BUFFER #define CONFIG_FSL_USDHC /* Fuses */ diff --git a/include/configs/mx7ulp_evk.h b/include/configs/mx7ulp_evk.h index 3d32ff17ac..b8dcaa1036 100644 --- a/include/configs/mx7ulp_evk.h +++ b/include/configs/mx7ulp_evk.h @@ -27,7 +27,6 @@ #define IRAM_BASE_ADDR OCRAM_0_BASE #define IOMUXC_BASE_ADDR IOMUXC1_RBASE -#define CONFIG_BOUNCE_BUFFER #define CONFIG_FSL_USDHC #define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */ diff --git a/include/configs/mxs.h b/include/configs/mxs.h index 4bb3621a42..217167a21e 100644 --- a/include/configs/mxs.h +++ b/include/configs/mxs.h @@ -124,11 +124,6 @@ #define CONFIG_VIDEO_MXS #endif -/* MMC */ -#ifdef CONFIG_CMD_MMC -#define CONFIG_BOUNCE_BUFFER -#endif - /* NAND */ #ifdef CONFIG_CMD_NAND #define CONFIG_SYS_MAX_NAND_DEVICE 1 diff --git a/include/configs/poplar.h b/include/configs/poplar.h index 6b93b76ab9..be9a0b51a9 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 d4e5406101..e307855d04 100644 --- a/include/configs/rk3036_common.h +++ b/include/configs/rk3036_common.h @@ -24,9 +24,6 @@ #define CONFIG_ROCKCHIP_MAX_INIT_SIZE (4 << 10) #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 3e9e642b78..f4f64edc4a 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 d1837d5c4e..612d6439d1 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 176bd0c26c..e72aa8d2d3 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 5388b1391e..01f297b2c1 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 9174c67cad..7913ef7214 100644 --- a/include/configs/rk3328_common.h +++ b/include/configs/rk3328_common.h @@ -19,10 +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) /* FAT sd card locations. */ diff --git a/include/configs/rk3368_common.h b/include/configs/rk3368_common.h index 6638491e79..88c1af0974 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 eeda070752..9a4da395f9 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. */ diff --git a/include/configs/rv1108_common.h b/include/configs/rv1108_common.h index 16d4e2e355..952ea9fdca 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) diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index bd8f5c8c41..3b32dd2474 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -121,7 +121,6 @@ * MMC Driver */ #ifdef CONFIG_CMD_MMC -#define CONFIG_BOUNCE_BUFFER /* FIXME */ /* using smaller max blk cnt to avoid flooding the limited stack we have */ #define CONFIG_SYS_MMC_MAX_BLK_COUNT 256 /* FIXME -- SPL only? */ diff --git a/include/configs/socfpga_stratix10_socdk.h b/include/configs/socfpga_stratix10_socdk.h index e190b3d988..f9319a2234 100644 --- a/include/configs/socfpga_stratix10_socdk.h +++ b/include/configs/socfpga_stratix10_socdk.h @@ -154,7 +154,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void); * SDMMC configurations */ #ifdef CONFIG_CMD_MMC -#define CONFIG_BOUNCE_BUFFER #define CONFIG_SYS_MMC_MAX_BLK_COUNT 256 #endif /* diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h index 4d249ddfd2..d37e2d79d3 100644 --- a/include/configs/tegra-common.h +++ b/include/configs/tegra-common.h @@ -88,7 +88,4 @@ #define CONFIG_SYS_SPL_MALLOC_SIZE 0x00010000 #endif -/* Misc utility code */ -#define CONFIG_BOUNCE_BUFFER - #endif /* _TEGRA_COMMON_H_ */ -- cgit v1.2.3