qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UPSTREAM: 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

Signed-off-by: Adam Ford <aford173@gmail.com>
Reviewed-by: Stefan Agner <stefan.agner@toradex.com>
[trini: Add in MMC as well]
Change-Id: I45b919ab747aa414ba23f1e165c11dd8aff44c44
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
(cherry picked from commit 99bec1aead5927c54f4364bfe10823a86fe0dad2)
This commit is contained in:
Adam Ford 2018-02-06 08:34:45 -06:00 committed by Kever Yang
parent fd70bba716
commit 6a35a5ca77
18 changed files with 22 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/dma/Kconfig
View File

@ -19,4 +19,19 @@ config TI_EDMA3
This driver support data transfer between memory This driver support data transfer between memory
regions. regions.
config APBH_DMA
bool "Support APBH DMA"
depends on MX23 || MX28 || MX6 || MX7
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" endmenu # menu "DMA Support"

4
drivers/mmc/Kconfig
View File

@ -119,6 +119,10 @@ config MMC_MXC
config MMC_MXS config MMC_MXS
bool "Freescale MXS Multimedia Card Interface support" bool "Freescale MXS Multimedia Card Interface support"
depends on MX23 || MX28 || MX6 || MX7
select APBH_DMA
select APBH_DMA_BURST if ARCH_MX6 || ARCH_MX7
select APBH_DMA_BURST8 if ARCH_MX6 || ARCH_MX7
help help
This selects the Freescale SSP MMC controller found on MXS based This selects the Freescale SSP MMC controller found on MXS based
platforms like mx23/28. platforms like mx23/28.

3
drivers/mtd/nand/Kconfig
View File

@ -165,6 +165,9 @@ config NAND_MXS
bool "MXS NAND support" bool "MXS NAND support"
depends on MX23 || MX28 || MX6 || MX7 depends on MX23 || MX28 || MX6 || MX7
imply CMD_NAND imply CMD_NAND
select APBH_DMA
select APBH_DMA_BURST if ARCH_MX6 || ARCH_MX7
select APBH_DMA_BURST8 if ARCH_MX6 || ARCH_MX7
help help
This enables NAND driver for the NAND flash controller on the This enables NAND driver for the NAND flash controller on the
MXS processors. MXS processors.

3
include/configs/aristainetos-common.h
View File

@ -182,9 +182,6 @@
#define CONFIG_SYS_NAND_ONFI_DETECTION #define CONFIG_SYS_NAND_ONFI_DETECTION
/* DMA stuff, needed for GPMI/MXS NAND support */ /* DMA stuff, needed for GPMI/MXS NAND support */
#define CONFIG_APBH_DMA
#define CONFIG_APBH_DMA_BURST
#define CONFIG_APBH_DMA_BURST8
/* RTC */ /* RTC */
#define CONFIG_SYS_I2C_RTC_ADDR 0x68 #define CONFIG_SYS_I2C_RTC_ADDR 0x68

3
include/configs/cm_fx6.h
View File

@ -177,9 +177,6 @@
#define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_MAX_NAND_DEVICE 1
#define CONFIG_SYS_NAND_ONFI_DETECTION #define CONFIG_SYS_NAND_ONFI_DETECTION
/* APBH DMA is required for NAND support */ /* APBH DMA is required for NAND support */
#define CONFIG_APBH_DMA
#define CONFIG_APBH_DMA_BURST
#define CONFIG_APBH_DMA_BURST8
#endif #endif
/* Ethernet */ /* Ethernet */

3
include/configs/colibri_imx7.h
View File

@ -177,9 +177,6 @@
"-(ubi)" "-(ubi)"
/* DMA stuff, needed for GPMI/MXS NAND support */ /* DMA stuff, needed for GPMI/MXS NAND support */
#define CONFIG_APBH_DMA
#define CONFIG_APBH_DMA_BURST
#define CONFIG_APBH_DMA_BURST8
/* USB Configs */ /* USB Configs */
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_EHCI_HCD_INIT_AFTER_RESET

3
include/configs/gw_ventana.h
View File

@ -73,9 +73,6 @@
#define CONFIG_SYS_NAND_ONFI_DETECTION #define CONFIG_SYS_NAND_ONFI_DETECTION
/* DMA stuff, needed for GPMI/MXS NAND support */ /* DMA stuff, needed for GPMI/MXS NAND support */
#define CONFIG_APBH_DMA
#define CONFIG_APBH_DMA_BURST
#define CONFIG_APBH_DMA_BURST8
#endif #endif
#endif /* CONFIG_SPI_FLASH */ #endif /* CONFIG_SPI_FLASH */

7
include/configs/imx6-engicam.h
View File

@ -161,13 +161,6 @@
/* MTD device */ /* MTD device */
# define CONFIG_MTD_DEVICE # define CONFIG_MTD_DEVICE
# define CONFIG_MTD_PARTITIONS # define CONFIG_MTD_PARTITIONS
# define MTDIDS_DEFAULT "nand0=gpmi-nand"
# define MTDPARTS_DEFAULT "mtdparts=gpmi-nand:2m(spl),2m(uboot)," \
"1m(env),8m(kernel),1m(dtb),-(rootfs)"
# define CONFIG_APBH_DMA
# define CONFIG_APBH_DMA_BURST
# define CONFIG_APBH_DMA_BURST8
#endif #endif
/* Ethernet */ /* Ethernet */

3
include/configs/imx6_logic.h
View File

@ -159,9 +159,6 @@
"1m(env),16m(kernel),1m(dtb),-(fs)" "1m(env),16m(kernel),1m(dtb),-(fs)"
/* DMA stuff, needed for GPMI/MXS NAND support */ /* 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 */ /* EEPROM contains serial no, MAC addr and other Logic PD info */
#define CONFIG_I2C_EEPROM #define CONFIG_I2C_EEPROM

3
include/configs/mx6sabreauto.h
View File

@ -72,9 +72,6 @@
#define CONFIG_SYS_NAND_ONFI_DETECTION #define CONFIG_SYS_NAND_ONFI_DETECTION
/* DMA stuff, needed for GPMI/MXS NAND support */ /* DMA stuff, needed for GPMI/MXS NAND support */
#define CONFIG_APBH_DMA
#define CONFIG_APBH_DMA_BURST
#define CONFIG_APBH_DMA_BURST8
/* PMIC */ /* PMIC */
#define CONFIG_POWER #define CONFIG_POWER

3
include/configs/mx6sxsabreauto.h
View File

@ -125,9 +125,6 @@
#define CONFIG_SYS_NAND_ONFI_DETECTION #define CONFIG_SYS_NAND_ONFI_DETECTION
/* DMA stuff, needed for GPMI/MXS NAND support */ /* DMA stuff, needed for GPMI/MXS NAND support */
#define CONFIG_APBH_DMA
#define CONFIG_APBH_DMA_BURST
#define CONFIG_APBH_DMA_BURST8
/* Network */ /* Network */

3
include/configs/mx7dsabresd.h
View File

@ -197,9 +197,6 @@
#define CONFIG_SYS_NAND_ONFI_DETECTION #define CONFIG_SYS_NAND_ONFI_DETECTION
/* DMA stuff, needed for GPMI/MXS NAND support */ /* DMA stuff, needed for GPMI/MXS NAND support */
#define CONFIG_APBH_DMA
#define CONFIG_APBH_DMA_BURST
#define CONFIG_APBH_DMA_BURST8
#endif #endif
#define CONFIG_ENV_OFFSET (12 * SZ_64K) #define CONFIG_ENV_OFFSET (12 * SZ_64K)

1
include/configs/mxs.h
View File

@ -99,7 +99,6 @@
*/ */
/* APBH DMA */ /* APBH DMA */
#define CONFIG_APBH_DMA
/* GPIO */ /* GPIO */
#define CONFIG_MXS_GPIO #define CONFIG_MXS_GPIO

3
include/configs/pcm058.h
View File

@ -65,9 +65,6 @@
#endif #endif
/* DMA stuff, needed for GPMI/MXS NAND support */ /* DMA stuff, needed for GPMI/MXS NAND support */
#define CONFIG_APBH_DMA
#define CONFIG_APBH_DMA_BURST
#define CONFIG_APBH_DMA_BURST8
/* Filesystem support */ /* Filesystem support */
#define CONFIG_MTD_PARTITIONS #define CONFIG_MTD_PARTITIONS

3
include/configs/pfla02.h
View File

@ -64,9 +64,6 @@
#endif #endif
/* DMA stuff, needed for GPMI/MXS NAND support */ /* DMA stuff, needed for GPMI/MXS NAND support */
#define CONFIG_APBH_DMA
#define CONFIG_APBH_DMA_BURST
#define CONFIG_APBH_DMA_BURST8
/* Filesystem support */ /* Filesystem support */
#define CONFIG_MTD_PARTITIONS #define CONFIG_MTD_PARTITIONS

3
include/configs/platinum.h
View File

@ -75,9 +75,6 @@
#define CONFIG_SYS_NAND_ONFI_DETECTION #define CONFIG_SYS_NAND_ONFI_DETECTION
/* DMA config, needed for GPMI/MXS NAND support */ /* 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 */ /* Environment in NAND */
#define CONFIG_ENV_OFFSET (16 << 20) #define CONFIG_ENV_OFFSET (16 << 20)

3
include/configs/titanium.h
View File

@ -152,9 +152,6 @@
#define CONFIG_SYS_NAND_ONFI_DETECTION #define CONFIG_SYS_NAND_ONFI_DETECTION
/* DMA stuff, needed for GPMI/MXS NAND support */ /* 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 */ /* Environment in NAND */
#define CONFIG_ENV_OFFSET (16 << 20) #define CONFIG_ENV_OFFSET (16 << 20)

4
scripts/config_whitelist.txt
View File

@ -37,10 +37,6 @@ CONFIG_AM437X_USB2PHY2_HOST
CONFIG_AMCORE CONFIG_AMCORE
CONFIG_ANDES_PCU CONFIG_ANDES_PCU
CONFIG_ANDES_PCU_BASE CONFIG_ANDES_PCU_BASE
CONFIG_AP325RXA
CONFIG_APBH_DMA
CONFIG_APBH_DMA_BURST
CONFIG_APBH_DMA_BURST8
CONFIG_APER_0_BASE CONFIG_APER_0_BASE
CONFIG_APER_1_BASE CONFIG_APER_1_BASE
CONFIG_APER_SIZE CONFIG_APER_SIZE