From mboxrd@z Thu Jan 1 00:00:00 1970 From: Simon Glass Date: Mon, 12 Sep 2016 23:18:33 -0600 Subject: [U-Boot] [PATCH v3 15/45] Convert CONFIG_SPL_DMA_SUPPORT to Kconfig In-Reply-To: <1473743943-15003-1-git-send-email-sjg@chromium.org> References: <1473743943-15003-1-git-send-email-sjg@chromium.org> Message-ID: <1473743943-15003-16-git-send-email-sjg@chromium.org> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Move this option to Kconfig and tidy up existing uses. Signed-off-by: Simon Glass --- Changes in v3: None Changes in v2: None configs/am57xx_evm_defconfig | 1 + configs/am57xx_evm_nodt_defconfig | 3 ++- configs/am57xx_hs_evm_defconfig | 1 + configs/dra7xx_evm_defconfig | 1 + configs/dra7xx_hs_evm_defconfig | 1 + configs/gwventana_defconfig | 1 + configs/pcm058_defconfig | 1 + configs/platinum_picon_defconfig | 1 + configs/platinum_titanium_defconfig | 1 + include/configs/am57xx_evm.h | 1 - include/configs/dra7xx_evm.h | 1 - include/configs/imx6_spl.h | 1 - include/configs/pcm058.h | 1 - 13 files changed, 10 insertions(+), 5 deletions(-) diff --git a/configs/am57xx_evm_defconfig b/configs/am57xx_evm_defconfig index 767fba0..b9aeb87 100644 --- a/configs/am57xx_evm_defconfig +++ b/configs/am57xx_evm_defconfig @@ -9,6 +9,7 @@ CONFIG_SPL_LOAD_FIT=y CONFIG_VERSION_VARIABLE=y CONFIG_SPL=y CONFIG_SPL_STACK_R=y +CONFIG_SPL_DMA_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/am57xx_evm_nodt_defconfig b/configs/am57xx_evm_nodt_defconfig index 0066691..93c0f59 100644 --- a/configs/am57xx_evm_nodt_defconfig +++ b/configs/am57xx_evm_nodt_defconfig @@ -1,8 +1,9 @@ CONFIG_ARM=y CONFIG_OMAP54XX=y CONFIG_TARGET_AM57XX_EVM=y -CONFIG_SPL=y CONFIG_VERSION_VARIABLE=y +CONFIG_SPL=y +CONFIG_SPL_DMA_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/am57xx_hs_evm_defconfig b/configs/am57xx_hs_evm_defconfig index 7897c06..d9ee658 100644 --- a/configs/am57xx_hs_evm_defconfig +++ b/configs/am57xx_hs_evm_defconfig @@ -12,6 +12,7 @@ CONFIG_FIT_IMAGE_POST_PROCESS=y CONFIG_VERSION_VARIABLE=y CONFIG_SPL=y CONFIG_SPL_STACK_R=y +CONFIG_SPL_DMA_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig index 7cfac14..84430da 100644 --- a/configs/dra7xx_evm_defconfig +++ b/configs/dra7xx_evm_defconfig @@ -9,6 +9,7 @@ CONFIG_SPL_LOAD_FIT=y CONFIG_VERSION_VARIABLE=y CONFIG_SPL=y CONFIG_SPL_STACK_R=y +CONFIG_SPL_DMA_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/dra7xx_hs_evm_defconfig b/configs/dra7xx_hs_evm_defconfig index bcf7417..442d3f1 100644 --- a/configs/dra7xx_hs_evm_defconfig +++ b/configs/dra7xx_hs_evm_defconfig @@ -13,6 +13,7 @@ CONFIG_FIT_IMAGE_POST_PROCESS=y CONFIG_VERSION_VARIABLE=y CONFIG_SPL=y CONFIG_SPL_STACK_R=y +CONFIG_SPL_DMA_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/gwventana_defconfig b/configs/gwventana_defconfig index 6d7856d..0c245cd 100644 --- a/configs/gwventana_defconfig +++ b/configs/gwventana_defconfig @@ -10,6 +10,7 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL" CONFIG_BOOTDELAY=3 CONFIG_SPL=y CONFIG_SPL_STACK_R=y +CONFIG_SPL_DMA_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Ventana > " CONFIG_CMD_BOOTZ=y diff --git a/configs/pcm058_defconfig b/configs/pcm058_defconfig index 60c80cd..e7305d3 100644 --- a/configs/pcm058_defconfig +++ b/configs/pcm058_defconfig @@ -5,6 +5,7 @@ CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q" CONFIG_BOOTDELAY=3 CONFIG_SPL=y +CONFIG_SPL_DMA_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/platinum_picon_defconfig b/configs/platinum_picon_defconfig index a960bf2..a0c122e 100644 --- a/configs/platinum_picon_defconfig +++ b/configs/platinum_picon_defconfig @@ -4,6 +4,7 @@ CONFIG_TARGET_PLATINUM_PICON=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6DL" CONFIG_BOOTDELAY=3 CONFIG_SPL=y +CONFIG_SPL_DMA_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="picon > " CONFIG_CMD_BOOTZ=y diff --git a/configs/platinum_titanium_defconfig b/configs/platinum_titanium_defconfig index aebe4df..bf75ae0 100644 --- a/configs/platinum_titanium_defconfig +++ b/configs/platinum_titanium_defconfig @@ -4,6 +4,7 @@ CONFIG_TARGET_PLATINUM_TITANIUM=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q" CONFIG_BOOTDELAY=3 CONFIG_SPL=y +CONFIG_SPL_DMA_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="titanium > " CONFIG_CMD_BOOTZ=y diff --git a/include/configs/am57xx_evm.h b/include/configs/am57xx_evm.h index 3479de4..50b868e 100644 --- a/include/configs/am57xx_evm.h +++ b/include/configs/am57xx_evm.h @@ -105,7 +105,6 @@ /* SPI SPL */ #define CONFIG_SPL_SPI_SUPPORT -#define CONFIG_SPL_DMA_SUPPORT #define CONFIG_TI_EDMA3 #define CONFIG_SPL_SPI_LOAD #define CONFIG_SPL_SPI_FLASH_SUPPORT diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index 8d5dbc0..43d2442 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -198,7 +198,6 @@ /* SPI SPL */ #define CONFIG_SPL_SPI_SUPPORT -#define CONFIG_SPL_DMA_SUPPORT #define CONFIG_TI_EDMA3 #define CONFIG_SPL_SPI_LOAD #define CONFIG_SPL_SPI_FLASH_SUPPORT diff --git a/include/configs/imx6_spl.h b/include/configs/imx6_spl.h index 9bd9f6e..2edf379 100644 --- a/include/configs/imx6_spl.h +++ b/include/configs/imx6_spl.h @@ -39,7 +39,6 @@ /* NAND support */ #if defined(CONFIG_SPL_NAND_SUPPORT) #define CONFIG_SPL_NAND_MXS -#define CONFIG_SPL_DMA_SUPPORT #endif /* MMC support */ diff --git a/include/configs/pcm058.h b/include/configs/pcm058.h index 97cbeba..2671e1f 100644 --- a/include/configs/pcm058.h +++ b/include/configs/pcm058.h @@ -14,7 +14,6 @@ #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_YMODEM_SUPPORT #define CONFIG_SPL_MMC_SUPPORT -#define CONFIG_SPL_DMA_SUPPORT #define CONFIG_SPL_SPI_SUPPORT #define CONFIG_SPL_SPI_FLASH_SUPPORT #define CONFIG_SPL_SPI_LOAD -- 2.8.0.rc3.226.g39d4020