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]
Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index 1b92c7789d4f53dad0569542ef8a853788e334f5..4ee6afad35ed7ad9da38825dc6c101d702c6fdd1 100644 (file)
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -19,4 +19,19 @@ config TI_EDMA3
          This driver support data transfer between memory
          regions.
 
          This driver support data transfer between memory
          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"

diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
index a1b21fd1bd0726c91c679a3240a49fc423942567..d5e2816ef086f6dd56ca61468d450082f3c8f819 100644 (file)
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@ -209,6 +209,10 @@ config MMC_MXC
 
 config MMC_MXS
        bool "Freescale MXS Multimedia Card Interface support"
 
 config MMC_MXS
        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
          This selects the Freescale SSP MMC controller found on MXS based
          platforms like mx23/28.
        help
          This selects the Freescale SSP MMC controller found on MXS based
          platforms like mx23/28.

diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index 57d27578feb42a6327fb5e8eb1b90d62e5c4c1b3..a820af61cee9986f81dc705de82ca212a2a99951 100644 (file)
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -142,6 +142,9 @@ config NAND_MXS
        bool "MXS NAND support"
        depends on MX23 || MX28 || MX6 || MX7
        imply CMD_NAND
        bool "MXS NAND support"
        depends on MX23 || MX28 || MX6 || MX7
        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
          This enables NAND driver for the NAND flash controller on the
          MXS processors.
        help
          This enables NAND driver for the NAND flash controller on the
          MXS processors.

diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h
index 9b1a39d4fd912fb680a19f2b9f342eaeebe15733..69de44a1dff30ab2c9694970079799087c59092d 100644 (file)
--- a/include/configs/aristainetos-common.h
+++ b/include/configs/aristainetos-common.h
@@ -182,9 +182,6 @@
 #define CONFIG_SYS_NAND_ONFI_DETECTION
 
 /* DMA stuff, needed for GPMI/MXS NAND support */
 #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
 
 /* RTC */
 #define CONFIG_SYS_I2C_RTC_ADDR        0x68

diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index 90cf024bdb09f250791e0294add6ca0508e41c56..39d166a119f2d678925541a19309cb2530ea8d14 100644 (file)
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -184,9 +184,6 @@
 #define CONFIG_SYS_MAX_NAND_DEVICE     1
 #define CONFIG_SYS_NAND_ONFI_DETECTION
 /* APBH DMA is required for NAND support */
 #define CONFIG_SYS_MAX_NAND_DEVICE     1
 #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 */
 #endif
 
 /* Ethernet */

diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index d4aaff61fd6ed9a68279e4336bbb3f2f8ae38f7b..5d9b2126323b64a5b55c3ab793c79a0693062c90 100644 (file)
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -170,9 +170,6 @@
 #define CONFIG_MTD_DEVICE      /* needed for mtdparts commands */
 
 /* DMA stuff, needed for GPMI/MXS NAND support */
 #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
 
 /* USB Configs */
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET

diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index 517ad08423be0cda82dcf4d34eb1f2afed66ac55..6e994b5dc735df60c2a8c5845734e3c2678444af 100644 (file)
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -73,9 +73,6 @@
   #define CONFIG_SYS_NAND_ONFI_DETECTION
 
   /* DMA stuff, needed for GPMI/MXS NAND support */
   #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 */
 #endif
 
 #endif /* CONFIG_SPI_FLASH */

diff --git a/include/configs/imx6-engicam.h b/include/configs/imx6-engicam.h
index 5f43dfbb9ea7841de7c9ae7f89a156feb443f9a1..246a636ef08215f6f400376fb820387f77f60444 100644 (file)
--- 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
 /* 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 */
 #endif
 
 /* Ethernet */

diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h
index f973c327c8d137e954ed2b2b66aa73efe0b69f5e..95c31ed20184ac160292cf10754c0c75bd52a4f6 100644 (file)
--- a/include/configs/imx6_logic.h
+++ b/include/configs/imx6_logic.h
@@ -153,9 +153,6 @@
 # define CONFIG_MTD_PARTITIONS
 
 /* DMA stuff, needed for GPMI/MXS NAND support */
 # 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
 
 /* 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 9982685f678413375709d003756ea1dfba0039f6..bba15a7943294073c1e3dd1d0dfdcde17268b40e 100644 (file)
--- a/include/configs/mx6sabreauto.h
+++ b/include/configs/mx6sabreauto.h
@@ -72,9 +72,6 @@
 #define CONFIG_SYS_NAND_ONFI_DETECTION
 
 /* DMA stuff, needed for GPMI/MXS NAND support */
 #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
 
 /* PMIC */
 #define CONFIG_POWER

diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h
index 02d6acf47e196c63075a877f6912ba31490b64e3..06e416bb59d1db18ac24b8c5ebf6b16be77aa3ea 100644 (file)
--- a/include/configs/mx6sxsabreauto.h
+++ b/include/configs/mx6sxsabreauto.h
@@ -125,9 +125,6 @@
 #define CONFIG_SYS_NAND_ONFI_DETECTION
 
 /* DMA stuff, needed for GPMI/MXS NAND support */
 #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 */
 
 
 /* Network */
 

diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h
index fd39f221ac163e588dfe9eae6bdb1e850d6102fd..3a9eaf9f4c4924c777875eb2b9f85ed08abffa3c 100644 (file)
--- 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_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)
 #endif
 
 #define CONFIG_ENV_OFFSET              (12 * SZ_64K)

diff --git a/include/configs/mxs.h b/include/configs/mxs.h
index 21e51fca41355eee5c71020d2ed6ee608a448bbd..c3e3f59b16f1530b6d2b832a40e07e4b29e071ba 100644 (file)
--- a/include/configs/mxs.h
+++ b/include/configs/mxs.h
@@ -99,7 +99,6 @@
  */
 
 /* APBH DMA */
  */
 
 /* APBH DMA */

-#define CONFIG_APBH_DMA

 
 /* GPIO */
 #define CONFIG_MXS_GPIO
 
 /* GPIO */
 #define CONFIG_MXS_GPIO

diff --git a/include/configs/pcm058.h b/include/configs/pcm058.h
index 6c0902abd4c3e9dbe2d14d95f67455439c47b3ca..ec74ed74d76a99dc0db7bb7cc016cd876f4cd265 100644 (file)
--- a/include/configs/pcm058.h
+++ b/include/configs/pcm058.h
@@ -65,9 +65,6 @@
 #endif
 
 /* DMA stuff, needed for GPMI/MXS NAND support */
 #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
 
 /* Filesystem support */
 #define CONFIG_MTD_PARTITIONS

diff --git a/include/configs/pfla02.h b/include/configs/pfla02.h
index 83198a106590cdc08873de3cf25227f639f1e1b7..2001d5d7876d0f71cce015e9ddb9692d5250bd15 100644 (file)
--- a/include/configs/pfla02.h
+++ b/include/configs/pfla02.h
@@ -64,9 +64,6 @@
 #endif
 
 /* DMA stuff, needed for GPMI/MXS NAND support */
 #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
 
 /* Filesystem support */
 #define CONFIG_MTD_PARTITIONS

diff --git a/include/configs/platinum.h b/include/configs/platinum.h
index 24c8de932f9125c1ddc4b94126bb4ac84d6b6d4f..339ff913b737cafd4d026091e3f1d9c99b818e84 100644 (file)
--- a/include/configs/platinum.h
+++ b/include/configs/platinum.h
@@ -75,9 +75,6 @@
 #define CONFIG_SYS_NAND_ONFI_DETECTION
 
 /* DMA config, needed for GPMI/MXS NAND support */
 #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)
 
 /* Environment in NAND */
 #define CONFIG_ENV_OFFSET              (16 << 20)

diff --git a/include/configs/titanium.h b/include/configs/titanium.h
index ea18cb63e2221ffe1ecdb49db5517c5688240d55..0fe40ee72f894208939a0ca6e531f36ca53ad8f7 100644 (file)
--- a/include/configs/titanium.h
+++ b/include/configs/titanium.h
@@ -148,9 +148,6 @@
 #define CONFIG_SYS_NAND_ONFI_DETECTION
 
 /* DMA stuff, needed for GPMI/MXS NAND support */
 #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)
 
 /* Environment in NAND */
 #define CONFIG_ENV_OFFSET              (16 << 20)

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index d8cc8079a34cd71838601972254c91ea5261257b..3617afb241c3995477915db23c607dca949da0a1 100644 (file)
--- 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_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
 CONFIG_APER_0_BASE
 CONFIG_APER_1_BASE
 CONFIG_APER_SIZE