diff options
author | Simon Glass <sjg@chromium.org> | 2016-09-12 23:18:33 -0600 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-09-16 17:27:07 -0400 |
commit | 86bb5bab0b1e0e10e43c736e6af5f90d9ec2d581 (patch) | |
tree | 8d3b70438d78e02567676b482f1e4634b940c8e8 | |
parent | d3e7e2b2ce844ffe76eb658b05bb5cfc0be28efe (diff) |
Convert CONFIG_SPL_DMA_SUPPORT to Kconfig
Move this option to Kconfig and tidy up existing uses.
Signed-off-by: Simon Glass <sjg@chromium.org>
-rw-r--r-- | configs/am57xx_evm_defconfig | 1 | ||||
-rw-r--r-- | configs/am57xx_evm_nodt_defconfig | 3 | ||||
-rw-r--r-- | configs/am57xx_hs_evm_defconfig | 1 | ||||
-rw-r--r-- | configs/dra7xx_evm_defconfig | 1 | ||||
-rw-r--r-- | configs/dra7xx_hs_evm_defconfig | 1 | ||||
-rw-r--r-- | configs/gwventana_defconfig | 1 | ||||
-rw-r--r-- | configs/pcm058_defconfig | 1 | ||||
-rw-r--r-- | configs/platinum_picon_defconfig | 1 | ||||
-rw-r--r-- | configs/platinum_titanium_defconfig | 1 | ||||
-rw-r--r-- | include/configs/am57xx_evm.h | 1 | ||||
-rw-r--r-- | include/configs/dra7xx_evm.h | 1 | ||||
-rw-r--r-- | include/configs/imx6_spl.h | 1 | ||||
-rw-r--r-- | 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 767fba0bb08..b9aeb877893 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 0066691e8d1..93c0f59f395 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 7897c068c28..d9ee658dc45 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 7cfac14e09c..84430da4a0d 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 bcf7417b7ec..442d3f136a4 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 6d7856dba10..0c245cd2a06 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 60c80cd5694..e7305d3ce14 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 a960bf29cba..a0c122e0b3e 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 aebe4df3713..bf75ae0679d 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 3479de40df0..50b868e2658 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 8d5dbc03de5..43d2442bb3b 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 9bd9f6e3e41..2edf379e881 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 97cbebacceb..2671e1f7210 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 |