mirror of
https://source.denx.de/u-boot/u-boot.git
synced 2026-06-13 15:03:58 +03:00
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 <trini@konsulko.com> Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> Reviewed-by: Otavio Salvador <otavio@ossystems.com.br> [dw_mmc portion] Reviewed-by: Fabio Estevam <festevam@gmail.com> [mxsmmc portion] Reviewed-by: Simon Glass <sjg@chromium.org> [tegra portion]
This commit is contained in:
committed by
Tom Rini
parent
599fb3bc95
commit
2acc24fc28
@@ -82,9 +82,4 @@
|
||||
* Console configuration
|
||||
*/
|
||||
|
||||
/*
|
||||
* Misc utility configuration
|
||||
*/
|
||||
#define CONFIG_BOUNCE_BUFFER
|
||||
|
||||
#endif /* _CONFIG_AXS10X_H_ */
|
||||
|
||||
@@ -55,7 +55,4 @@
|
||||
|
||||
/* Enable Time Command */
|
||||
|
||||
/* Misc utility code */
|
||||
#define CONFIG_BOUNCE_BUFFER
|
||||
|
||||
#endif /* __BCM_EP_BOARD_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
|
||||
*/
|
||||
|
||||
@@ -34,9 +34,6 @@
|
||||
|
||||
/* select serial console configuration */
|
||||
|
||||
/* SD/MMC configuration */
|
||||
#define CONFIG_BOUNCE_BUFFER
|
||||
|
||||
/* PWM */
|
||||
#define CONFIG_PWM
|
||||
|
||||
|
||||
@@ -55,9 +55,6 @@
|
||||
|
||||
#define CONFIG_HIKEY_GPIO
|
||||
|
||||
/* SD/MMC configuration */
|
||||
#define CONFIG_BOUNCE_BUFFER
|
||||
|
||||
/* Command line configuration */
|
||||
|
||||
/* BOOTP options */
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -71,9 +71,6 @@
|
||||
CONFIG_SYS_MALLOC_LEN - \
|
||||
CONFIG_ENV_SIZE
|
||||
|
||||
/* Required by DW MMC driver */
|
||||
#define CONFIG_BOUNCE_BUFFER
|
||||
|
||||
/*
|
||||
* Environment
|
||||
*/
|
||||
|
||||
@@ -55,7 +55,6 @@
|
||||
#define CONFIG_SYS_MAXARGS 32
|
||||
|
||||
/* MMC */
|
||||
#define CONFIG_BOUNCE_BUFFER
|
||||
#define CONFIG_FSL_USDHC
|
||||
|
||||
/* Fuses */
|
||||
|
||||
@@ -40,7 +40,6 @@
|
||||
#define CONFIG_MXC_UART
|
||||
|
||||
/* MMC */
|
||||
#define CONFIG_BOUNCE_BUFFER
|
||||
#define CONFIG_FSL_USDHC
|
||||
|
||||
/* Fuses */
|
||||
|
||||
@@ -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 */
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -26,9 +26,6 @@
|
||||
/* USB configuration */
|
||||
#define CONFIG_USB_MAX_CONTROLLER_COUNT 2
|
||||
|
||||
/* SD/MMC */
|
||||
#define CONFIG_BOUNCE_BUFFER
|
||||
|
||||
/*****************************************************************************
|
||||
* Initial environment variables
|
||||
*****************************************************************************/
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
@@ -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. */
|
||||
|
||||
@@ -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" \
|
||||
|
||||
@@ -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. */
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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? */
|
||||
|
||||
@@ -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
|
||||
/*
|
||||
|
||||
@@ -88,7 +88,4 @@
|
||||
#define CONFIG_SYS_SPL_MALLOC_SIZE 0x00010000
|
||||
#endif
|
||||
|
||||
/* Misc utility code */
|
||||
#define CONFIG_BOUNCE_BUFFER
|
||||
|
||||
#endif /* _TEGRA_COMMON_H_ */
|
||||
|
||||
Reference in New Issue
Block a user