[U-Boot] [PATCH] Convert CONFIG_APBH_DMA et al to Kconfig
stefan at agner.ch
stefan at agner.ch
Mon Feb 5 09:08:55 UTC 2018
Hi Adam,
On 04.02.2018 15:46, Adam Ford wrote:
> This converts the following to Kconfig:
> CONFIG_APBH_DMA
> CONFIG_APBH_DMA_BURST
> CONFIG_APBH_DMA_BURST8
I recently sent a patch which completely converts NAND_MXS to Kconfig
https://patchwork.ozlabs.org/patch/868797/
Can you rebase ontop of it?
Since APBH DMA is used for the GPMI NAND block only (afaict) we can
easily let Kconfig handle the dependency.
E.g. in drivers/mtd/nand/Kconfig, add:
config NAND_MXS
...
select APBH_DMA
select APBH_DMA_BURST if ARCH_MX6 || ARCH_MX7
select APBH_DMA_BURST8 if ARCH_MX6 || ARCH_MX7
With that, you should be able to implement your change with just
removing APBH_DMA from the headers and adding the dependency to Kconfig
files without any defconfig changes.
--
Stefan
>
> Signed-off-by: Adam Ford <aford173 at gmail.com>
> ---
> configs/apx4devkit_defconfig | 1 +
> configs/aristainetos2_defconfig | 3 +++
> configs/aristainetos2b_defconfig | 3 +++
> configs/aristainetos_defconfig | 3 +++
> configs/bg0900_defconfig | 1 +
> configs/cm_fx6_defconfig | 11 +++--------
> configs/colibri_imx7_defconfig | 3 +++
> configs/gwventana_nand_defconfig | 3 +++
> configs/imx6q_logic_defconfig | 3 +++
> configs/imx6qdl_icore_nand_defconfig | 3 +++
> configs/imx6ul_geam_nand_defconfig | 3 +++
> configs/imx6ul_isiot_nand_defconfig | 3 +++
> configs/m28evk_defconfig | 1 +
> configs/mx23_olinuxino_defconfig | 1 +
> configs/mx23evk_defconfig | 1 +
> configs/mx28evk_auart_console_defconfig | 1 +
> configs/mx28evk_defconfig | 1 +
> configs/mx28evk_nand_defconfig | 1 +
> configs/mx28evk_spi_defconfig | 1 +
> configs/mx6sabreauto_defconfig | 3 +++
> configs/mx6sxsabreauto_defconfig | 3 +++
> configs/pcm058_defconfig | 3 +++
> configs/pfla02_defconfig | 3 +++
> configs/platinum_picon_defconfig | 3 +++
> configs/platinum_titanium_defconfig | 3 +++
> configs/sansa_fuze_plus_defconfig | 1 +
> configs/sc_sps_1_defconfig | 1 +
> configs/titanium_defconfig | 3 +++
> configs/ts4600_defconfig | 1 +
> configs/xfi3_defconfig | 1 +
> drivers/dma/Kconfig | 14 ++++++++++++++
> include/configs/aristainetos-common.h | 3 ---
> include/configs/cm_fx6.h | 3 ---
> include/configs/colibri_imx7.h | 3 ---
> include/configs/gw_ventana.h | 3 ---
> include/configs/imx6-engicam.h | 4 ----
> include/configs/imx6_logic.h | 3 ---
> include/configs/mx6sabreauto.h | 3 ---
> include/configs/mx6sxsabreauto.h | 3 ---
> include/configs/mx7dsabresd.h | 3 ---
> include/configs/mxs.h | 1 -
> include/configs/pcm058.h | 3 ---
> include/configs/pfla02.h | 3 ---
> include/configs/platinum.h | 3 ---
> include/configs/titanium.h | 3 ---
> scripts/config_whitelist.txt | 3 ---
> 46 files changed, 78 insertions(+), 52 deletions(-)
>
> diff --git a/configs/apx4devkit_defconfig b/configs/apx4devkit_defconfig
> index 47a4ee9..f7d868d 100644
> --- a/configs/apx4devkit_defconfig
> +++ b/configs/apx4devkit_defconfig
> @@ -26,6 +26,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand"
>
> CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:128k(bootstrap),1024k(boot),768k(env),-(root)"
> CONFIG_CMD_UBI=y
> CONFIG_ENV_IS_IN_NAND=y
> +CONFIG_APBH_DMA=y
> CONFIG_MMC_MXS=y
> CONFIG_USB=y
> CONFIG_USB_EHCI_HCD=y
> diff --git a/configs/aristainetos2_defconfig b/configs/aristainetos2_defconfig
> index 288dab0..926f07f 100644
> --- a/configs/aristainetos2_defconfig
> +++ b/configs/aristainetos2_defconfig
> @@ -31,6 +31,9 @@ CONFIG_CMD_FAT=y
> CONFIG_CMD_FS_GENERIC=y
> CONFIG_CMD_UBI=y
> CONFIG_ENV_IS_IN_SPI_FLASH=y
> +CONFIG_APBH_DMA=y
> +CONFIG_APBH_DMA_BURST=y
> +CONFIG_APBH_DMA_BURST8=y
> CONFIG_SPI_FLASH=y
> CONFIG_SPI_FLASH_STMICRO=y
> CONFIG_MTD_UBI_FASTMAP=y
> diff --git a/configs/aristainetos2b_defconfig b/configs/aristainetos2b_defconfig
> index 115ae07..9ab7002 100644
> --- a/configs/aristainetos2b_defconfig
> +++ b/configs/aristainetos2b_defconfig
> @@ -31,6 +31,9 @@ CONFIG_CMD_FAT=y
> CONFIG_CMD_FS_GENERIC=y
> CONFIG_CMD_UBI=y
> CONFIG_ENV_IS_IN_SPI_FLASH=y
> +CONFIG_APBH_DMA=y
> +CONFIG_APBH_DMA_BURST=y
> +CONFIG_APBH_DMA_BURST8=y
> CONFIG_SPI_FLASH=y
> CONFIG_SPI_FLASH_STMICRO=y
> CONFIG_MTD_UBI_FASTMAP=y
> diff --git a/configs/aristainetos_defconfig b/configs/aristainetos_defconfig
> index cad8b4a..6c09e8d 100644
> --- a/configs/aristainetos_defconfig
> +++ b/configs/aristainetos_defconfig
> @@ -31,6 +31,9 @@ CONFIG_CMD_FAT=y
> CONFIG_CMD_FS_GENERIC=y
> CONFIG_CMD_UBI=y
> CONFIG_ENV_IS_IN_SPI_FLASH=y
> +CONFIG_APBH_DMA=y
> +CONFIG_APBH_DMA_BURST=y
> +CONFIG_APBH_DMA_BURST8=y
> CONFIG_SPI_FLASH=y
> CONFIG_SPI_FLASH_STMICRO=y
> CONFIG_MTD_UBI_FASTMAP=y
> diff --git a/configs/bg0900_defconfig b/configs/bg0900_defconfig
> index 72616ae..7314eff 100644
> --- a/configs/bg0900_defconfig
> +++ b/configs/bg0900_defconfig
> @@ -25,6 +25,7 @@ CONFIG_CMD_MII=y
> CONFIG_CMD_PING=y
> CONFIG_CMD_CACHE=y
> CONFIG_DOS_PARTITION=y
> +CONFIG_APBH_DMA=y
> # CONFIG_MMC is not set
> CONFIG_SPI_FLASH=y
> CONFIG_SPI_FLASH_BAR=y
> diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig
> index 6b1c0a8..e17764a 100644
> --- a/configs/cm_fx6_defconfig
> +++ b/configs/cm_fx6_defconfig
> @@ -20,9 +20,7 @@ CONFIG_BOOTCOMMAND="run findfdt; run distro_bootcmd;
> run legacy_bootcmd"
> CONFIG_SPL=y
> CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x80
> CONFIG_SPL_I2C_SUPPORT=y
> -CONFIG_HUSH_PARSER=y
> CONFIG_SYS_PROMPT="CM-FX6 # "
> -CONFIG_CMD_BOOTZ=y
> # CONFIG_CMD_XIMG is not set
> CONFIG_CMD_GREPENV=y
> CONFIG_CMD_EEPROM=y
> @@ -40,21 +38,18 @@ CONFIG_CMD_SATA=y
> CONFIG_CMD_SF=y
> CONFIG_CMD_USB=y
> # CONFIG_CMD_SETEXPR is not set
> -CONFIG_CMD_DHCP=y
> -CONFIG_CMD_PING=y
> CONFIG_CMD_BMP=y
> CONFIG_CMD_CACHE=y
> -CONFIG_CMD_EXT2=y
> -CONFIG_CMD_EXT4=y
> CONFIG_CMD_EXT4_WRITE=y
> -CONFIG_CMD_FAT=y
> -CONFIG_CMD_FS_GENERIC=y
> CONFIG_CMD_MTDPARTS=y
> CONFIG_MTDIDS_DEFAULT="nor0=spi0.0"
>
> CONFIG_MTDPARTS_DEFAULT="mtdparts=spi0.0:768k(uboot),256k(uboot-environment),-(reserved)"
> CONFIG_OF_CONTROL=y
> CONFIG_ENV_IS_IN_SPI_FLASH=y
> CONFIG_DWC_AHSATA=y
> +CONFIG_APBH_DMA=y
> +CONFIG_APBH_DMA_BURST=y
> +CONFIG_APBH_DMA_BURST8=y
> CONFIG_DM_KEYBOARD=y
> CONFIG_DM_MMC=y
> CONFIG_SPI_FLASH=y
> diff --git a/configs/colibri_imx7_defconfig b/configs/colibri_imx7_defconfig
> index efc4ccb..8c71632 100644
> --- a/configs/colibri_imx7_defconfig
> +++ b/configs/colibri_imx7_defconfig
> @@ -43,6 +43,9 @@ CONFIG_OF_CONTROL=y
> CONFIG_OF_EMBED=y
> CONFIG_ENV_IS_IN_NAND=y
> CONFIG_DFU_MMC=y
> +CONFIG_APBH_DMA=y
> +CONFIG_APBH_DMA_BURST=y
> +CONFIG_APBH_DMA_BURST8=y
> CONFIG_DM_GPIO=y
> CONFIG_DM_I2C=y
> CONFIG_MTD_UBI_FASTMAP=y
> diff --git a/configs/gwventana_nand_defconfig b/configs/gwventana_nand_defconfig
> index be6cf0c..0c67cea 100644
> --- a/configs/gwventana_nand_defconfig
> +++ b/configs/gwventana_nand_defconfig
> @@ -57,6 +57,9 @@ CONFIG_CMD_UBI=y
> CONFIG_ENV_IS_IN_NAND=y
> CONFIG_DM=y
> CONFIG_DWC_AHSATA=y
> +CONFIG_APBH_DMA=y
> +CONFIG_APBH_DMA_BURST=y
> +CONFIG_APBH_DMA_BURST8=y
> CONFIG_PHYLIB=y
> CONFIG_NETDEVICES=y
> CONFIG_E1000=y
> diff --git a/configs/imx6q_logic_defconfig b/configs/imx6q_logic_defconfig
> index bd0da25..ec34047 100644
> --- a/configs/imx6q_logic_defconfig
> +++ b/configs/imx6q_logic_defconfig
> @@ -30,6 +30,9 @@ CONFIG_CMD_MTDPARTS=y
> CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand"
>
> CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:4m(uboot),1m(env),16m(kernel),1m(dtb),-(fs)"
> CONFIG_ENV_IS_IN_NAND=y
> +CONFIG_APBH_DMA=y
> +CONFIG_APBH_DMA_BURST=y
> +CONFIG_APBH_DMA_BURST8=y
> CONFIG_SYS_I2C_MXC=y
> CONFIG_NAND=y
> CONFIG_NAND_MXS=y
> diff --git a/configs/imx6qdl_icore_nand_defconfig
> b/configs/imx6qdl_icore_nand_defconfig
> index 21cfb85..740b178 100644
> --- a/configs/imx6qdl_icore_nand_defconfig
> +++ b/configs/imx6qdl_icore_nand_defconfig
> @@ -33,6 +33,9 @@
> CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:2m(spl),2m(uboot),1m(env),8m(kernel)
> CONFIG_CMD_UBI=y
> CONFIG_OF_LIST="imx6q-icore imx6dl-icore"
> CONFIG_ENV_IS_IN_NAND=y
> +CONFIG_APBH_DMA=y
> +CONFIG_APBH_DMA_BURST=y
> +CONFIG_APBH_DMA_BURST8=y
> CONFIG_SYS_I2C_MXC=y
> CONFIG_NAND=y
> CONFIG_NAND_MXS=y
> diff --git a/configs/imx6ul_geam_nand_defconfig
> b/configs/imx6ul_geam_nand_defconfig
> index d920af7..ec5e4f1 100644
> --- a/configs/imx6ul_geam_nand_defconfig
> +++ b/configs/imx6ul_geam_nand_defconfig
> @@ -33,6 +33,9 @@ CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand"
>
> CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:2m(spl),2m(uboot),1m(env),8m(kernel),1m(dtb),-(rootfs)"
> CONFIG_CMD_UBI=y
> CONFIG_ENV_IS_IN_NAND=y
> +CONFIG_APBH_DMA=y
> +CONFIG_APBH_DMA_BURST=y
> +CONFIG_APBH_DMA_BURST8=y
> CONFIG_SYS_I2C_MXC=y
> CONFIG_NAND=y
> CONFIG_NAND_MXS=y
> diff --git a/configs/imx6ul_isiot_nand_defconfig
> b/configs/imx6ul_isiot_nand_defconfig
> index aaaf9e6..070c254 100644
> --- a/configs/imx6ul_isiot_nand_defconfig
> +++ b/configs/imx6ul_isiot_nand_defconfig
> @@ -33,6 +33,9 @@ CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand"
>
> CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:2m(spl),2m(uboot),1m(env),8m(kernel),1m(dtb),-(rootfs)"
> CONFIG_CMD_UBI=y
> CONFIG_ENV_IS_IN_NAND=y
> +CONFIG_APBH_DMA=y
> +CONFIG_APBH_DMA_BURST=y
> +CONFIG_APBH_DMA_BURST8=y
> CONFIG_SYS_I2C_MXC=y
> CONFIG_NAND=y
> CONFIG_NAND_MXS=y
> diff --git a/configs/m28evk_defconfig b/configs/m28evk_defconfig
> index 3bc6b18..990b972 100644
> --- a/configs/m28evk_defconfig
> +++ b/configs/m28evk_defconfig
> @@ -40,6 +40,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand"
>
> CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:3m(u-boot),512k(env1),512k(env2),14m(boot),238m(data),- at 4096k(UBI)"
> CONFIG_CMD_UBI=y
> CONFIG_ENV_IS_IN_NAND=y
> +CONFIG_APBH_DMA=y
> CONFIG_MMC_MXS=y
> CONFIG_SPI_FLASH=y
> CONFIG_SPI_FLASH_STMICRO=y
> diff --git a/configs/mx23_olinuxino_defconfig b/configs/mx23_olinuxino_defconfig
> index 628c11d..2c80c3b 100644
> --- a/configs/mx23_olinuxino_defconfig
> +++ b/configs/mx23_olinuxino_defconfig
> @@ -20,6 +20,7 @@ CONFIG_CMD_CACHE=y
> CONFIG_CMD_EXT2=y
> CONFIG_CMD_FAT=y
> CONFIG_ENV_IS_IN_MMC=y
> +CONFIG_APBH_DMA=y
> CONFIG_LED_STATUS=y
> CONFIG_LED_STATUS_GPIO=y
> CONFIG_LED_STATUS0=y
> diff --git a/configs/mx23evk_defconfig b/configs/mx23evk_defconfig
> index 6ad7f2c..09f3611 100644
> --- a/configs/mx23evk_defconfig
> +++ b/configs/mx23evk_defconfig
> @@ -24,6 +24,7 @@ CONFIG_CMD_CACHE=y
> CONFIG_CMD_EXT2=y
> CONFIG_CMD_FAT=y
> CONFIG_ENV_IS_IN_MMC=y
> +CONFIG_APBH_DMA=y
> CONFIG_MMC_MXS=y
> CONFIG_USB=y
> CONFIG_USB_EHCI_HCD=y
> diff --git a/configs/mx28evk_auart_console_defconfig
> b/configs/mx28evk_auart_console_defconfig
> index c497756..c3fa17e 100644
> --- a/configs/mx28evk_auart_console_defconfig
> +++ b/configs/mx28evk_auart_console_defconfig
> @@ -35,6 +35,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand"
>
> CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:3m(bootloader)ro,512k(environment),512k(redundant-environment),4m(kernel),512k(fdt),8m(ramdisk),-(filesystem)"
> CONFIG_CMD_UBI=y
> CONFIG_ENV_IS_IN_MMC=y
> +CONFIG_APBH_DMA=y
> CONFIG_MMC_MXS=y
> CONFIG_SPI_FLASH=y
> CONFIG_SPI_FLASH_SST=y
> diff --git a/configs/mx28evk_defconfig b/configs/mx28evk_defconfig
> index 40c9df2..6531795 100644
> --- a/configs/mx28evk_defconfig
> +++ b/configs/mx28evk_defconfig
> @@ -35,6 +35,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand"
>
> CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:3m(bootloader)ro,512k(environment),512k(redundant-environment),4m(kernel),512k(fdt),8m(ramdisk),-(filesystem)"
> CONFIG_CMD_UBI=y
> CONFIG_ENV_IS_IN_MMC=y
> +CONFIG_APBH_DMA=y
> CONFIG_MMC_MXS=y
> CONFIG_SPI_FLASH=y
> CONFIG_SPI_FLASH_SST=y
> diff --git a/configs/mx28evk_nand_defconfig b/configs/mx28evk_nand_defconfig
> index ea97f40..6b610d1 100644
> --- a/configs/mx28evk_nand_defconfig
> +++ b/configs/mx28evk_nand_defconfig
> @@ -34,6 +34,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand"
>
> CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:3m(bootloader)ro,512k(environment),512k(redundant-environment),4m(kernel),512k(fdt),8m(ramdisk),-(filesystem)"
> CONFIG_CMD_UBI=y
> CONFIG_ENV_IS_IN_NAND=y
> +CONFIG_APBH_DMA=y
> CONFIG_MMC_MXS=y
> CONFIG_SPI_FLASH=y
> CONFIG_SPI_FLASH_SST=y
> diff --git a/configs/mx28evk_spi_defconfig b/configs/mx28evk_spi_defconfig
> index 34e9927..499fc46 100644
> --- a/configs/mx28evk_spi_defconfig
> +++ b/configs/mx28evk_spi_defconfig
> @@ -34,6 +34,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand"
>
> CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:3m(bootloader)ro,512k(environment),512k(redundant-environment),4m(kernel),512k(fdt),8m(ramdisk),-(filesystem)"
> CONFIG_CMD_UBI=y
> CONFIG_ENV_IS_IN_SPI_FLASH=y
> +CONFIG_APBH_DMA=y
> CONFIG_MMC_MXS=y
> CONFIG_SPI_FLASH=y
> CONFIG_SPI_FLASH_SST=y
> diff --git a/configs/mx6sabreauto_defconfig b/configs/mx6sabreauto_defconfig
> index 215700b..5ff4aa0 100644
> --- a/configs/mx6sabreauto_defconfig
> +++ b/configs/mx6sabreauto_defconfig
> @@ -40,6 +40,9 @@ CONFIG_CMD_FS_GENERIC=y
> CONFIG_ENV_IS_IN_MMC=y
> CONFIG_DFU_MMC=y
> CONFIG_DFU_SF=y
> +CONFIG_APBH_DMA=y
> +CONFIG_APBH_DMA_BURST=y
> +CONFIG_APBH_DMA_BURST8=y
> CONFIG_SPI_FLASH=y
> CONFIG_SPI_FLASH_STMICRO=y
> CONFIG_PHYLIB=y
> diff --git a/configs/mx6sxsabreauto_defconfig b/configs/mx6sxsabreauto_defconfig
> index a2c4830..437a9b1 100644
> --- a/configs/mx6sxsabreauto_defconfig
> +++ b/configs/mx6sxsabreauto_defconfig
> @@ -27,6 +27,9 @@ CONFIG_CMD_EXT4_WRITE=y
> CONFIG_CMD_FAT=y
> CONFIG_CMD_FS_GENERIC=y
> CONFIG_OF_CONTROL=y
> +CONFIG_APBH_DMA=y
> +CONFIG_APBH_DMA_BURST=y
> +CONFIG_APBH_DMA_BURST8=y
> CONFIG_DM_GPIO=y
> CONFIG_DM_PCA953X=y
> CONFIG_DM_I2C=y
> diff --git a/configs/pcm058_defconfig b/configs/pcm058_defconfig
> index 99713c2..38fb2c3 100644
> --- a/configs/pcm058_defconfig
> +++ b/configs/pcm058_defconfig
> @@ -47,6 +47,9 @@ CONFIG_EFI_PARTITION=y
> # CONFIG_SPL_PARTITION_UUIDS is not set
> CONFIG_ENV_IS_IN_SPI_FLASH=y
> CONFIG_DM=y
> +CONFIG_APBH_DMA=y
> +CONFIG_APBH_DMA_BURST=y
> +CONFIG_APBH_DMA_BURST8=y
> CONFIG_MTD=y
> CONFIG_SPI_FLASH=y
> CONFIG_SPI_FLASH_STMICRO=y
> diff --git a/configs/pfla02_defconfig b/configs/pfla02_defconfig
> index 029c9de..101f5c6 100644
> --- a/configs/pfla02_defconfig
> +++ b/configs/pfla02_defconfig
> @@ -44,6 +44,9 @@ CONFIG_EFI_PARTITION=y
> # CONFIG_PARTITION_UUIDS is not set
> # CONFIG_SPL_PARTITION_UUIDS is not set
> CONFIG_DM=y
> +CONFIG_APBH_DMA=y
> +CONFIG_APBH_DMA_BURST=y
> +CONFIG_APBH_DMA_BURST8=y
> CONFIG_MTD=y
> CONFIG_SPI_FLASH=y
> CONFIG_SPI_FLASH_STMICRO=y
> diff --git a/configs/platinum_picon_defconfig b/configs/platinum_picon_defconfig
> index 54d88b2..d2e1f41 100644
> --- a/configs/platinum_picon_defconfig
> +++ b/configs/platinum_picon_defconfig
> @@ -41,6 +41,9 @@ CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand"
>
> CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:14M(spl),2M(uboot),512k(env1),512k(env2),495M(ubi0),14M(res0),2M(res1),512k(res2),512k(res3),-(ubi1)"
> CONFIG_CMD_UBI=y
> CONFIG_ENV_IS_IN_NAND=y
> +CONFIG_APBH_DMA=y
> +CONFIG_APBH_DMA_BURST=y
> +CONFIG_APBH_DMA_BURST8=y
> CONFIG_PHYLIB=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> diff --git a/configs/platinum_titanium_defconfig
> b/configs/platinum_titanium_defconfig
> index c5f6b7a..3f79372 100644
> --- a/configs/platinum_titanium_defconfig
> +++ b/configs/platinum_titanium_defconfig
> @@ -41,6 +41,9 @@ CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand"
>
> CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:14M(spl),2M(uboot),512k(env1),512k(env2),-(ubi)"
> CONFIG_CMD_UBI=y
> CONFIG_ENV_IS_IN_NAND=y
> +CONFIG_APBH_DMA=y
> +CONFIG_APBH_DMA_BURST=y
> +CONFIG_APBH_DMA_BURST8=y
> CONFIG_PHYLIB=y
> CONFIG_PHY_MICREL=y
> CONFIG_PHY_MICREL_KSZ90X1=y
> diff --git a/configs/sansa_fuze_plus_defconfig
> b/configs/sansa_fuze_plus_defconfig
> index f2e61c7..d7ec119 100644
> --- a/configs/sansa_fuze_plus_defconfig
> +++ b/configs/sansa_fuze_plus_defconfig
> @@ -25,6 +25,7 @@ CONFIG_CMD_PING=y
> CONFIG_CMD_CACHE=y
> CONFIG_CMD_EXT2=y
> CONFIG_CMD_FAT=y
> +CONFIG_APBH_DMA=y
> CONFIG_MMC_MXS=y
> CONFIG_USB=y
> CONFIG_USB_EHCI_HCD=y
> diff --git a/configs/sc_sps_1_defconfig b/configs/sc_sps_1_defconfig
> index faebc04..792d39d 100644
> --- a/configs/sc_sps_1_defconfig
> +++ b/configs/sc_sps_1_defconfig
> @@ -24,6 +24,7 @@ CONFIG_CMD_CACHE=y
> CONFIG_CMD_EXT2=y
> CONFIG_CMD_FAT=y
> CONFIG_ENV_IS_IN_MMC=y
> +CONFIG_APBH_DMA=y
> CONFIG_MMC_MXS=y
> CONFIG_PHYLIB=y
> CONFIG_USB=y
> diff --git a/configs/titanium_defconfig b/configs/titanium_defconfig
> index c47702e..8b76877 100644
> --- a/configs/titanium_defconfig
> +++ b/configs/titanium_defconfig
> @@ -29,6 +29,9 @@ CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand"
>
> CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:16M(uboot),512k(env1),512k(env2),-(ubi)"
> CONFIG_CMD_UBI=y
> CONFIG_ENV_IS_IN_NAND=y
> +CONFIG_APBH_DMA=y
> +CONFIG_APBH_DMA_BURST=y
> +CONFIG_APBH_DMA_BURST8=y
> CONFIG_PHYLIB=y
> CONFIG_PHY_MICREL=y
> CONFIG_PHY_MICREL_KSZ90X1=y
> diff --git a/configs/ts4600_defconfig b/configs/ts4600_defconfig
> index aab0737..45b872b 100644
> --- a/configs/ts4600_defconfig
> +++ b/configs/ts4600_defconfig
> @@ -17,5 +17,6 @@ CONFIG_CMD_EXT4_WRITE=y
> CONFIG_CMD_FAT=y
> CONFIG_CMD_FS_GENERIC=y
> CONFIG_ENV_IS_IN_MMC=y
> +CONFIG_APBH_DMA=y
> CONFIG_MMC_MXS=y
> CONFIG_OF_LIBFDT=y
> diff --git a/configs/xfi3_defconfig b/configs/xfi3_defconfig
> index 6cdea5e..e335407 100644
> --- a/configs/xfi3_defconfig
> +++ b/configs/xfi3_defconfig
> @@ -24,6 +24,7 @@ CONFIG_CMD_PING=y
> CONFIG_CMD_CACHE=y
> CONFIG_CMD_EXT2=y
> CONFIG_CMD_FAT=y
> +CONFIG_APBH_DMA=y
> CONFIG_MMC_MXS=y
> CONFIG_USB=y
> CONFIG_USB_EHCI_HCD=y
> diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
> index 1b92c77..a95d4ce 100644
> --- a/drivers/dma/Kconfig
> +++ b/drivers/dma/Kconfig
> @@ -19,4 +19,18 @@ config TI_EDMA3
> This driver support data transfer between memory
> regions.
>
> +config APBH_DMA
> + bool "Support APBH DMA"
> + help
> + Enable APBH DMA driver.
> +
> +if APBH_DMA
> +config APBH_DMA_BURST
> + bool "Enable DMA BURST"
> +
> +config APBH_DMA_BURST8
> + bool "Enable DMA BURST8"
> +
> +endif
> +
> endmenu # menu "DMA Support"
> diff --git a/include/configs/aristainetos-common.h
> b/include/configs/aristainetos-common.h
> index 397afbb..ea62fdc 100644
> --- a/include/configs/aristainetos-common.h
> +++ b/include/configs/aristainetos-common.h
> @@ -183,9 +183,6 @@
> #define CONFIG_SYS_NAND_ONFI_DETECTION
>
> /* DMA stuff, needed for GPMI/MXS NAND support */
> -#define CONFIG_APBH_DMA
> -#define CONFIG_APBH_DMA_BURST
> -#define CONFIG_APBH_DMA_BURST8
>
> /* RTC */
> #define CONFIG_SYS_I2C_RTC_ADDR 0x68
> diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
> index da870b9..f805dab 100644
> --- a/include/configs/cm_fx6.h
> +++ b/include/configs/cm_fx6.h
> @@ -185,9 +185,6 @@
> #define CONFIG_NAND_MXS
> #define CONFIG_SYS_NAND_ONFI_DETECTION
> /* APBH DMA is required for NAND support */
> -#define CONFIG_APBH_DMA
> -#define CONFIG_APBH_DMA_BURST
> -#define CONFIG_APBH_DMA_BURST8
> #endif
>
> /* Ethernet */
> diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
> index 8030ca6..8148024 100644
> --- a/include/configs/colibri_imx7.h
> +++ b/include/configs/colibri_imx7.h
> @@ -172,9 +172,6 @@
> #define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
>
> /* DMA stuff, needed for GPMI/MXS NAND support */
> -#define CONFIG_APBH_DMA
> -#define CONFIG_APBH_DMA_BURST
> -#define CONFIG_APBH_DMA_BURST8
>
> /* USB Configs */
> #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
> diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
> index d2944b5..fe1b921 100644
> --- a/include/configs/gw_ventana.h
> +++ b/include/configs/gw_ventana.h
> @@ -74,9 +74,6 @@
> #define CONFIG_SYS_NAND_ONFI_DETECTION
>
> /* DMA stuff, needed for GPMI/MXS NAND support */
> - #define CONFIG_APBH_DMA
> - #define CONFIG_APBH_DMA_BURST
> - #define CONFIG_APBH_DMA_BURST8
> #endif
>
> #endif /* CONFIG_SPI_FLASH */
> diff --git a/include/configs/imx6-engicam.h b/include/configs/imx6-engicam.h
> index 0c45e06..cf556fa 100644
> --- a/include/configs/imx6-engicam.h
> +++ b/include/configs/imx6-engicam.h
> @@ -161,10 +161,6 @@
> /* MTD device */
> # define CONFIG_MTD_DEVICE
> # define CONFIG_MTD_PARTITIONS
> -
> -# define CONFIG_APBH_DMA
> -# define CONFIG_APBH_DMA_BURST
> -# define CONFIG_APBH_DMA_BURST8
> #endif
>
> /* Ethernet */
> diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h
> index f0ff5b2..8b91a53 100644
> --- a/include/configs/imx6_logic.h
> +++ b/include/configs/imx6_logic.h
> @@ -156,9 +156,6 @@
> # define CONFIG_MTD_PARTITIONS
>
> /* DMA stuff, needed for GPMI/MXS NAND support */
> -#define CONFIG_APBH_DMA
> -#define CONFIG_APBH_DMA_BURST
> -#define CONFIG_APBH_DMA_BURST8
>
> /* EEPROM contains serial no, MAC addr and other Logic PD info */
> #define CONFIG_I2C_EEPROM
> diff --git a/include/configs/mx6sabreauto.h b/include/configs/mx6sabreauto.h
> index 64d54b6..bac5efe 100644
> --- a/include/configs/mx6sabreauto.h
> +++ b/include/configs/mx6sabreauto.h
> @@ -73,9 +73,6 @@
> #define CONFIG_SYS_NAND_ONFI_DETECTION
>
> /* DMA stuff, needed for GPMI/MXS NAND support */
> -#define CONFIG_APBH_DMA
> -#define CONFIG_APBH_DMA_BURST
> -#define CONFIG_APBH_DMA_BURST8
>
> /* PMIC */
> #define CONFIG_POWER
> diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h
> index 9e46c39..0a973dc 100644
> --- a/include/configs/mx6sxsabreauto.h
> +++ b/include/configs/mx6sxsabreauto.h
> @@ -126,9 +126,6 @@
> #define CONFIG_SYS_NAND_ONFI_DETECTION
>
> /* DMA stuff, needed for GPMI/MXS NAND support */
> -#define CONFIG_APBH_DMA
> -#define CONFIG_APBH_DMA_BURST
> -#define CONFIG_APBH_DMA_BURST8
>
> /* Network */
>
> diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h
> index fd39f22..3a9eaf9 100644
> --- a/include/configs/mx7dsabresd.h
> +++ b/include/configs/mx7dsabresd.h
> @@ -197,9 +197,6 @@
> #define CONFIG_SYS_NAND_ONFI_DETECTION
>
> /* DMA stuff, needed for GPMI/MXS NAND support */
> -#define CONFIG_APBH_DMA
> -#define CONFIG_APBH_DMA_BURST
> -#define CONFIG_APBH_DMA_BURST8
> #endif
>
> #define CONFIG_ENV_OFFSET (12 * SZ_64K)
> diff --git a/include/configs/mxs.h b/include/configs/mxs.h
> index 3a27c15..dcfd5f3 100644
> --- a/include/configs/mxs.h
> +++ b/include/configs/mxs.h
> @@ -99,7 +99,6 @@
> */
>
> /* APBH DMA */
> -#define CONFIG_APBH_DMA
>
> /* GPIO */
> #define CONFIG_MXS_GPIO
> diff --git a/include/configs/pcm058.h b/include/configs/pcm058.h
> index 3067fc6..5fb610e 100644
> --- a/include/configs/pcm058.h
> +++ b/include/configs/pcm058.h
> @@ -66,9 +66,6 @@
> #endif
>
> /* DMA stuff, needed for GPMI/MXS NAND support */
> -#define CONFIG_APBH_DMA
> -#define CONFIG_APBH_DMA_BURST
> -#define CONFIG_APBH_DMA_BURST8
>
> /* Filesystem support */
> #define CONFIG_MTD_PARTITIONS
> diff --git a/include/configs/pfla02.h b/include/configs/pfla02.h
> index ae03310..50d4a84 100644
> --- a/include/configs/pfla02.h
> +++ b/include/configs/pfla02.h
> @@ -65,9 +65,6 @@
> #endif
>
> /* DMA stuff, needed for GPMI/MXS NAND support */
> -#define CONFIG_APBH_DMA
> -#define CONFIG_APBH_DMA_BURST
> -#define CONFIG_APBH_DMA_BURST8
>
> /* Filesystem support */
> #define CONFIG_MTD_PARTITIONS
> diff --git a/include/configs/platinum.h b/include/configs/platinum.h
> index 453c37d..a4191b1 100644
> --- a/include/configs/platinum.h
> +++ b/include/configs/platinum.h
> @@ -76,9 +76,6 @@
> #define CONFIG_SYS_NAND_ONFI_DETECTION
>
> /* DMA config, needed for GPMI/MXS NAND support */
> -#define CONFIG_APBH_DMA
> -#define CONFIG_APBH_DMA_BURST
> -#define CONFIG_APBH_DMA_BURST8
>
> /* Environment in NAND */
> #define CONFIG_ENV_OFFSET (16 << 20)
> diff --git a/include/configs/titanium.h b/include/configs/titanium.h
> index cc655f2..e0635f5 100644
> --- a/include/configs/titanium.h
> +++ b/include/configs/titanium.h
> @@ -149,9 +149,6 @@
> #define CONFIG_SYS_NAND_ONFI_DETECTION
>
> /* DMA stuff, needed for GPMI/MXS NAND support */
> -#define CONFIG_APBH_DMA
> -#define CONFIG_APBH_DMA_BURST
> -#define CONFIG_APBH_DMA_BURST8
>
> /* Environment in NAND */
> #define CONFIG_ENV_OFFSET (16 << 20)
> diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
> index ef83c00..bc097db 100644
> --- a/scripts/config_whitelist.txt
> +++ b/scripts/config_whitelist.txt
> @@ -31,9 +31,6 @@ CONFIG_AM335X_USB1_MODE
> CONFIG_AM437X_USB2PHY2_HOST
> CONFIG_ANDES_PCU
> CONFIG_ANDES_PCU_BASE
> -CONFIG_APBH_DMA
> -CONFIG_APBH_DMA_BURST
> -CONFIG_APBH_DMA_BURST8
> CONFIG_APER_0_BASE
> CONFIG_APER_1_BASE
> CONFIG_APER_SIZE
More information about the U-Boot
mailing list