Convert CONFIG_APBH_DMA et al to Kconfig
Subsystems (2)
PATCH 1/1 Convert CONFIG_APBH_DMA et al to Kconfig
This converts the following to Kconfig:
CONFIG_APBH_DMA
CONFIG_APBH_DMA_BURST
CONFIG_APBH_DMA_BURST8
--- 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(-)
configs/apx4devkit_defconfig +1 -0
@@ -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
configs/aristainetos2_defconfig +3 -0
@@ -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
configs/aristainetos2b_defconfig +3 -0
@@ -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
configs/aristainetos_defconfig +3 -0
@@ -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
configs/bg0900_defconfig +1 -0
@@ -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
configs/cm_fx6_defconfig +3 -8
@@ -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
configs/colibri_imx7_defconfig +3 -0
@@ -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
configs/gwventana_nand_defconfig +3 -0
@@ -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
configs/imx6q_logic_defconfig +3 -0
@@ -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
configs/imx6qdl_icore_nand_defconfig +3 -0
@@ -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
configs/imx6ul_geam_nand_defconfig +3 -0
@@ -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
configs/imx6ul_isiot_nand_defconfig +3 -0
@@ -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
configs/m28evk_defconfig +1 -0
@@ -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
configs/mx23_olinuxino_defconfig +1 -0
@@ -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
configs/mx23evk_defconfig +1 -0
@@ -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
configs/mx28evk_auart_console_defconfig +1 -0
@@ -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
configs/mx28evk_defconfig +1 -0
@@ -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
configs/mx28evk_nand_defconfig +1 -0
@@ -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
configs/mx28evk_spi_defconfig +1 -0
@@ -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
configs/mx6sabreauto_defconfig +3 -0
@@ -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
configs/mx6sxsabreauto_defconfig +3 -0
@@ -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
configs/pcm058_defconfig +3 -0
@@ -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
configs/pfla02_defconfig +3 -0
@@ -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
configs/platinum_picon_defconfig +3 -0
@@ -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
configs/platinum_titanium_defconfig +3 -0
@@ -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
configs/sansa_fuze_plus_defconfig +1 -0
@@ -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
configs/sc_sps_1_defconfig +1 -0
@@ -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
configs/titanium_defconfig +3 -0
@@ -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
configs/ts4600_defconfig +1 -0
@@ -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
configs/xfi3_defconfig +1 -0
@@ -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
drivers/dma/Kconfig +14 -0
@@ -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"
include/configs/aristainetos-common.h +0 -3
@@ -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
include/configs/cm_fx6.h +0 -3
@@ -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 */
include/configs/colibri_imx7.h +0 -3
@@ -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
include/configs/gw_ventana.h +0 -3
@@ -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 */
include/configs/imx6-engicam.h +0 -4
@@ -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 */
include/configs/imx6_logic.h +0 -3
@@ -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
include/configs/mx6sabreauto.h +0 -3
@@ -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
include/configs/mx6sxsabreauto.h +0 -3
@@ -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 */
include/configs/mx7dsabresd.h +0 -3
@@ -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)
include/configs/mxs.h +0 -1
@@ -99,7 +99,6 @@*/ /* APBH DMA */ -#define CONFIG_APBH_DMA /* GPIO */ #define CONFIG_MXS_GPIO
include/configs/pcm058.h +0 -3
@@ -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
include/configs/pfla02.h +0 -3
@@ -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
include/configs/platinum.h +0 -3
@@ -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)
include/configs/titanium.h +0 -3
@@ -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)
scripts/config_whitelist.txt +0 -3
@@ -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
Signature · 1 line
2.7.4
PATCH 1/1 Convert CONFIG_APBH_DMA et al to Kconfig
Hi Adam,
Quoted 4 lines · Adam Ford
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
Quoted 723 lines
Signed-off-by Adam Ford <[email protected]>--- 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(-)configs/apx4devkit_defconfig +0
-0@@ -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=yconfigs/apx4devkit_defconfig +1
-0+CONFIG_APBH_DMA=y CONFIG_MMC_MXS=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=yconfigs/aristainetos2_defconfig +3
-0@@ -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=yconfigs/aristainetos2b_defconfig +3
-0@@ -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=yconfigs/aristainetos_defconfig +3
-0@@ -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=yconfigs/bg0900_defconfig +1
-0@@ -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=yconfigs/cm_fx6_defconfig +0
-0@@ -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=yconfigs/cm_fx6_defconfig +0
-8-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=yconfigs/cm_fx6_defconfig +3
-0+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=yconfigs/colibri_imx7_defconfig +3
-0@@ -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=yconfigs/gwventana_nand_defconfig +3
-0@@ -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=yconfigs/imx6q_logic_defconfig +0
-0@@ -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=yconfigs/imx6q_logic_defconfig +3
-0+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=yconfigs/imx6qdl_icore_nand_defconfig +3
-0@@ -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=yconfigs/imx6ul_geam_nand_defconfig +0
-0@@ -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=yconfigs/imx6ul_geam_nand_defconfig +3
-0+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=yconfigs/imx6ul_isiot_nand_defconfig +0
-0@@ -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=yconfigs/imx6ul_isiot_nand_defconfig +3
-0+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=yconfigs/m28evk_defconfig +0
-0@@ -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=yconfigs/m28evk_defconfig +1
-0+CONFIG_APBH_DMA=y CONFIG_MMC_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=yconfigs/mx23_olinuxino_defconfig +1
-0@@ -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=yconfigs/mx23evk_defconfig +1
-0@@ -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=yconfigs/mx28evk_auart_console_defconfig +0
-0@@ -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=yconfigs/mx28evk_auart_console_defconfig +1
-0+CONFIG_APBH_DMA=y CONFIG_MMC_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SST=yconfigs/mx28evk_defconfig +0
-0@@ -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=yconfigs/mx28evk_defconfig +1
-0+CONFIG_APBH_DMA=y CONFIG_MMC_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SST=yconfigs/mx28evk_nand_defconfig +0
-0@@ -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=yconfigs/mx28evk_nand_defconfig +1
-0+CONFIG_APBH_DMA=y CONFIG_MMC_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SST=yconfigs/mx28evk_spi_defconfig +0
-0@@ -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=yconfigs/mx28evk_spi_defconfig +1
-0+CONFIG_APBH_DMA=y CONFIG_MMC_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SST=yconfigs/mx6sabreauto_defconfig +3
-0@@ -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=yconfigs/mx6sxsabreauto_defconfig +3
-0@@ -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=yconfigs/pcm058_defconfig +3
-0@@ -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=yconfigs/pfla02_defconfig +3
-0@@ -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=yconfigs/platinum_picon_defconfig +0
-0@@ -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=yconfigs/platinum_picon_defconfig +3
-0+CONFIG_APBH_DMA=y +CONFIG_APBH_DMA_BURST=y +CONFIG_APBH_DMA_BURST8=y CONFIG_PHYLIB=y CONFIG_USB=y CONFIG_USB_STORAGE=yconfigs/platinum_titanium_defconfig +0
-0@@ -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=yconfigs/platinum_titanium_defconfig +3
-0+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=yconfigs/sansa_fuze_plus_defconfig +1
-0@@ -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=yconfigs/sc_sps_1_defconfig +1
-0@@ -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=yconfigs/titanium_defconfig +0
-0@@ -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=yconfigs/titanium_defconfig +3
-0+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=yconfigs/ts4600_defconfig +1
-0@@ -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=yconfigs/xfi3_defconfig +1
-0@@ -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=ydrivers/dma/Kconfig +14
-0@@ -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"include/configs/aristainetos-common.h +0
-3@@ -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 0x68include/configs/cm_fx6.h +0
-3@@ -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 */ include/configs/colibri_imx7.h +0
-3@@ -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 include/configs/gw_ventana.h +0
-3@@ -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 */ include/configs/imx6-engicam.h +0
-4@@ -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 */ include/configs/imx6_logic.h +0
-3@@ -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 include/configs/mx6sabreauto.h +0
-3@@ -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 include/configs/mx6sxsabreauto.h +0
-3@@ -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 */ include/configs/mx7dsabresd.h +0
-3@@ -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)include/configs/mxs.h +0
-1@@ -99,7 +99,6 @@*/ /* APBH DMA */ -#define CONFIG_APBH_DMA /* GPIO */ #define CONFIG_MXS_GPIO include/configs/pcm058.h +0
-3@@ -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 include/configs/pfla02.h +0
-3@@ -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 include/configs/platinum.h +0
-3@@ -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)include/configs/titanium.h +0
-3@@ -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)scripts/config_whitelist.txt +0
-3@@ -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
PATCH 1/1 Convert CONFIG_APBH_DMA et al to Kconfig
Quoted 9 lines · On Mon, Feb 5, 2018 at 3:08 AM, <[email protected]> wrote:
Hi Adam,
Quoted 4 lines · Adam Ford
This converts the following to
Kconfig:
CONFIG_APBH_DMA
CONFIG_APBH_DMA_BURST
CONFIG_APBH_DMA_BURST8
Quoted 3 lines
I recently sent a patch which completely converts
NAND_MXStoKconfig
Cool, thanks!
Quoted 3 lines
Can you rebase ontop of it?
Absolutely
Quoted 3 lines
Since APBH DMA is used for the GPMI NAND block only (afaict) we can easily let
Kconfighandle the dependency.
That makes sense.
Quoted 4 lines
E.g. in
drivers/mtd/nand/Kconfig, add:config
NAND_MXS
...
Quoted 9 lines
select APBH_DMA select APBH_DMA_BURST if ARCH_MX6 || ARCH_MX7 select APBH_DMA_BURST8 if ARCH_MX6 || ARCH_MX7With that, you should be able to implement your change with just removing
APBH_DMAfrom the headers and adding the dependency toKconfigfiles without any defconfig changes.
I'll try to do that later today.
adam
Quoted 726 lines
--
StefanQuoted 723 lines
Signed-off-by Adam Ford <[email protected]>--- 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(-)configs/apx4devkit_defconfig +0
-0@@ -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=yconfigs/apx4devkit_defconfig +1
-0+CONFIG_APBH_DMA=y CONFIG_MMC_MXS=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=yconfigs/aristainetos2_defconfig +3
-0@@ -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=yconfigs/aristainetos2b_defconfig +3
-0@@ -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=yconfigs/aristainetos_defconfig +3
-0@@ -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=yconfigs/bg0900_defconfig +1
-0@@ -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=yconfigs/cm_fx6_defconfig +0
-0@@ -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=yconfigs/cm_fx6_defconfig +0
-8-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=yconfigs/cm_fx6_defconfig +3
-0+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=yconfigs/colibri_imx7_defconfig +3
-0@@ -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=yconfigs/gwventana_nand_defconfig +3
-0@@ -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=yconfigs/imx6q_logic_defconfig +0
-0@@ -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=yconfigs/imx6q_logic_defconfig +3
-0+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=yconfigs/imx6qdl_icore_nand_defconfig +3
-0@@ -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=yconfigs/imx6ul_geam_nand_defconfig +0
-0@@ -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=yconfigs/imx6ul_geam_nand_defconfig +3
-0+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=yconfigs/imx6ul_isiot_nand_defconfig +0
-0@@ -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=yconfigs/imx6ul_isiot_nand_defconfig +3
-0+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=yconfigs/m28evk_defconfig +0
-0@@ -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=yconfigs/m28evk_defconfig +1
-0+CONFIG_APBH_DMA=y CONFIG_MMC_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=yconfigs/mx23_olinuxino_defconfig +1
-0@@ -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=yconfigs/mx23evk_defconfig +1
-0@@ -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=yconfigs/mx28evk_auart_console_defconfig +0
-0@@ -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=yconfigs/mx28evk_auart_console_defconfig +1
-0+CONFIG_APBH_DMA=y CONFIG_MMC_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SST=yconfigs/mx28evk_defconfig +0
-0@@ -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=yconfigs/mx28evk_defconfig +1
-0+CONFIG_APBH_DMA=y CONFIG_MMC_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SST=yconfigs/mx28evk_nand_defconfig +0
-0@@ -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=yconfigs/mx28evk_nand_defconfig +1
-0+CONFIG_APBH_DMA=y CONFIG_MMC_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SST=yconfigs/mx28evk_spi_defconfig +0
-0@@ -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=yconfigs/mx28evk_spi_defconfig +1
-0+CONFIG_APBH_DMA=y CONFIG_MMC_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SST=yconfigs/mx6sabreauto_defconfig +3
-0@@ -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=yconfigs/mx6sxsabreauto_defconfig +3
-0@@ -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=yconfigs/pcm058_defconfig +3
-0@@ -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=yconfigs/pfla02_defconfig +3
-0@@ -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=yconfigs/platinum_picon_defconfig +0
-0@@ -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=yconfigs/platinum_picon_defconfig +3
-0+CONFIG_APBH_DMA=y +CONFIG_APBH_DMA_BURST=y +CONFIG_APBH_DMA_BURST8=y CONFIG_PHYLIB=y CONFIG_USB=y CONFIG_USB_STORAGE=yconfigs/platinum_titanium_defconfig +0
-0@@ -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=yconfigs/platinum_titanium_defconfig +3
-0+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=yconfigs/sansa_fuze_plus_defconfig +1
-0@@ -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=yconfigs/sc_sps_1_defconfig +1
-0@@ -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=yconfigs/titanium_defconfig +0
-0@@ -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=yconfigs/titanium_defconfig +3
-0+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=yconfigs/ts4600_defconfig +1
-0@@ -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=yconfigs/xfi3_defconfig +1
-0@@ -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=ydrivers/dma/Kconfig +14
-0@@ -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"include/configs/aristainetos-common.h +0
-3@@ -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 0x68include/configs/cm_fx6.h +0
-3@@ -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 */ include/configs/colibri_imx7.h +0
-3@@ -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 include/configs/gw_ventana.h +0
-3@@ -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 */ include/configs/imx6-engicam.h +0
-4@@ -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 */ include/configs/imx6_logic.h +0
-3@@ -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 include/configs/mx6sabreauto.h +0
-3@@ -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 include/configs/mx6sxsabreauto.h +0
-3@@ -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 */ include/configs/mx7dsabresd.h +0
-3@@ -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)include/configs/mxs.h +0
-1@@ -99,7 +99,6 @@*/ /* APBH DMA */ -#define CONFIG_APBH_DMA /* GPIO */ #define CONFIG_MXS_GPIO include/configs/pcm058.h +0
-3@@ -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 include/configs/pfla02.h +0
-3@@ -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 include/configs/platinum.h +0
-3@@ -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)include/configs/titanium.h +0
-3@@ -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)scripts/config_whitelist.txt +0
-3@@ -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