[U-Boot] kconfig: Convert CONFIG_MXS_GPIO to Kconfig
diff mbox series

Message ID 20190813161039.488-1-lukma@denx.de
State Accepted
Delegated to: Tom Rini
Headers show
Series
  • [U-Boot] kconfig: Convert CONFIG_MXS_GPIO to Kconfig
Related show

Commit Message

Lukasz Majewski Aug. 13, 2019, 4:10 p.m. UTC
This converts the following to Kconfig:
   CONFIG_MXS_GPIO

Travis-CI: https://travis-ci.org/lmajewski/u-boot-dfu/builds/571260789

Signed-off-by: Lukasz Majewski <lukma@denx.de>

---

 configs/apx4devkit_defconfig            | 1 +
 configs/bg0900_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/sansa_fuze_plus_defconfig       | 1 +
 configs/sc_sps_1_defconfig              | 1 +
 configs/ts4600_defconfig                | 1 +
 configs/xfi3_defconfig                  | 1 +
 drivers/gpio/Kconfig                    | 5 +++++
 include/configs/mxs.h                   | 6 ------
 scripts/config_whitelist.txt            | 1 -
 15 files changed, 17 insertions(+), 7 deletions(-)

Comments

Peng Fan Aug. 14, 2019, 1:13 a.m. UTC | #1
> Subject: [PATCH] kconfig: Convert CONFIG_MXS_GPIO to Kconfig
> 
> This converts the following to Kconfig:
>    CONFIG_MXS_GPIO
> 
> Travis-CI:
> https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Ftravis-
> ci.org%2Flmajewski%2Fu-boot-dfu%2Fbuilds%2F571260789&amp;data=02%
> 7C01%7Cpeng.fan%40nxp.com%7C15b3b41cb65c47b3937b08d72008d525%
> 7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C6370130946196773
> 21&amp;sdata=U5TPcVyZv3ryzEbVCGfy8gM6Zb2cZpyLNtj5Gt9R6hk%3D&am
> p;reserved=0
> 
> Signed-off-by: Lukasz Majewski <lukma@denx.de>

Acked-by: Peng Fan <peng.fan@nxp.com>

> 
> ---
> 
>  configs/apx4devkit_defconfig            | 1 +
>  configs/bg0900_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/sansa_fuze_plus_defconfig       | 1 +
>  configs/sc_sps_1_defconfig              | 1 +
>  configs/ts4600_defconfig                | 1 +
>  configs/xfi3_defconfig                  | 1 +
>  drivers/gpio/Kconfig                    | 5 +++++
>  include/configs/mxs.h                   | 6 ------
>  scripts/config_whitelist.txt            | 1 -
>  15 files changed, 17 insertions(+), 7 deletions(-)
> 
> diff --git a/configs/apx4devkit_defconfig b/configs/apx4devkit_defconfig index
> c5eb53ebef14..138cfa648cdb 100644
> --- a/configs/apx4devkit_defconfig
> +++ b/configs/apx4devkit_defconfig
> @@ -31,6 +31,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_MXS_GPIO=y
>  CONFIG_MMC_MXS=y
>  CONFIG_NAND=y
>  CONFIG_NAND_MXS=y
> diff --git a/configs/bg0900_defconfig b/configs/bg0900_defconfig index
> 353790f44640..d0d527c8f080 100644
> --- a/configs/bg0900_defconfig
> +++ b/configs/bg0900_defconfig
> @@ -27,6 +27,7 @@ CONFIG_CMD_MII=y
>  CONFIG_CMD_PING=y
>  CONFIG_CMD_CACHE=y
>  CONFIG_DOS_PARTITION=y
> +CONFIG_MXS_GPIO=y
>  # CONFIG_MMC is not set
>  CONFIG_NAND=y
>  CONFIG_NAND_MXS=y
> diff --git a/configs/mx23_olinuxino_defconfig
> b/configs/mx23_olinuxino_defconfig
> index 3e4b7ab1c365..fd045ad16268 100644
> --- a/configs/mx23_olinuxino_defconfig
> +++ b/configs/mx23_olinuxino_defconfig
> @@ -26,6 +26,7 @@ CONFIG_CMD_CACHE=y
>  CONFIG_CMD_EXT2=y
>  CONFIG_CMD_FAT=y
>  CONFIG_ENV_IS_IN_MMC=y
> +CONFIG_MXS_GPIO=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
> 773aff4bdc40..bb04623a8f5d 100644
> --- a/configs/mx23evk_defconfig
> +++ b/configs/mx23evk_defconfig
> @@ -28,6 +28,7 @@ CONFIG_CMD_EXT2=y
>  CONFIG_CMD_FAT=y
>  CONFIG_ENV_IS_IN_MMC=y
>  # CONFIG_NET is not set
> +CONFIG_MXS_GPIO=y
>  CONFIG_MMC_MXS=y
>  CONFIG_CONS_INDEX=0
>  CONFIG_USB=y
> diff --git a/configs/mx28evk_auart_console_defconfig
> b/configs/mx28evk_auart_console_defconfig
> index 27c152571a2f..d7909e2fa918 100644
> --- a/configs/mx28evk_auart_console_defconfig
> +++ b/configs/mx28evk_auart_console_defconfig
> @@ -38,6 +38,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(ramdis
> k),-(filesystem)"
>  CONFIG_CMD_UBI=y
>  CONFIG_ENV_IS_IN_MMC=y
> +CONFIG_MXS_GPIO=y
>  CONFIG_MMC_MXS=y
>  CONFIG_NAND=y
>  CONFIG_NAND_MXS=y
> diff --git a/configs/mx28evk_defconfig b/configs/mx28evk_defconfig index
> 4cee901d8321..7f000c8c380f 100644
> --- a/configs/mx28evk_defconfig
> +++ b/configs/mx28evk_defconfig
> @@ -38,6 +38,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(ramdis
> k),-(filesystem)"
>  CONFIG_CMD_UBI=y
>  CONFIG_ENV_IS_IN_MMC=y
> +CONFIG_MXS_GPIO=y
>  CONFIG_MMC_MXS=y
>  CONFIG_NAND=y
>  CONFIG_NAND_MXS=y
> diff --git a/configs/mx28evk_nand_defconfig
> b/configs/mx28evk_nand_defconfig index 3875da733adb..248d8b1fc9cf
> 100644
> --- a/configs/mx28evk_nand_defconfig
> +++ b/configs/mx28evk_nand_defconfig
> @@ -37,6 +37,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(ramdis
> k),-(filesystem)"
>  CONFIG_CMD_UBI=y
>  CONFIG_ENV_IS_IN_NAND=y
> +CONFIG_MXS_GPIO=y
>  CONFIG_MMC_MXS=y
>  CONFIG_NAND=y
>  CONFIG_NAND_MXS=y
> diff --git a/configs/mx28evk_spi_defconfig b/configs/mx28evk_spi_defconfig
> index 37477b35f1cb..3097e090a0a5 100644
> --- a/configs/mx28evk_spi_defconfig
> +++ b/configs/mx28evk_spi_defconfig
> @@ -36,6 +36,7 @@ CONFIG_CMD_MTDPARTS=y
>  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(ramdis
> k),-(filesystem)"
>  CONFIG_CMD_UBI=y
> +CONFIG_MXS_GPIO=y
>  CONFIG_MMC_MXS=y
>  CONFIG_NAND=y
>  CONFIG_NAND_MXS=y
> diff --git a/configs/sansa_fuze_plus_defconfig
> b/configs/sansa_fuze_plus_defconfig
> index 9d2b28d3bb6f..6f6328850596 100644
> --- a/configs/sansa_fuze_plus_defconfig
> +++ b/configs/sansa_fuze_plus_defconfig
> @@ -30,6 +30,7 @@ CONFIG_CMD_PING=y
>  CONFIG_CMD_CACHE=y
>  CONFIG_CMD_EXT2=y
>  CONFIG_CMD_FAT=y
> +CONFIG_MXS_GPIO=y
>  CONFIG_MMC_MXS=y
>  CONFIG_CONS_INDEX=0
>  CONFIG_USB=y
> diff --git a/configs/sc_sps_1_defconfig b/configs/sc_sps_1_defconfig index
> c7cdc3c0e9b3..e3fd8be60557 100644
> --- a/configs/sc_sps_1_defconfig
> +++ b/configs/sc_sps_1_defconfig
> @@ -29,6 +29,7 @@ CONFIG_CMD_CACHE=y
>  CONFIG_CMD_EXT2=y
>  CONFIG_CMD_FAT=y
>  CONFIG_ENV_IS_IN_MMC=y
> +CONFIG_MXS_GPIO=y
>  CONFIG_MMC_MXS=y
>  CONFIG_PHYLIB=y
>  CONFIG_MII=y
> diff --git a/configs/ts4600_defconfig b/configs/ts4600_defconfig index
> d5816f7612b3..b52ec639d72e 100644
> --- a/configs/ts4600_defconfig
> +++ b/configs/ts4600_defconfig
> @@ -22,6 +22,7 @@ CONFIG_CMD_EXT4_WRITE=y  CONFIG_CMD_FAT=y
> CONFIG_CMD_FS_GENERIC=y  CONFIG_ENV_IS_IN_MMC=y
> +CONFIG_MXS_GPIO=y
>  CONFIG_MMC_MXS=y
>  CONFIG_CONS_INDEX=0
>  CONFIG_OF_LIBFDT=y
> diff --git a/configs/xfi3_defconfig b/configs/xfi3_defconfig index
> 054e3a7e3a8f..6e0edb05ad65 100644
> --- a/configs/xfi3_defconfig
> +++ b/configs/xfi3_defconfig
> @@ -29,6 +29,7 @@ CONFIG_CMD_PING=y
>  CONFIG_CMD_CACHE=y
>  CONFIG_CMD_EXT2=y
>  CONFIG_CMD_FAT=y
> +CONFIG_MXS_GPIO=y
>  CONFIG_MMC_MXS=y
>  CONFIG_CONS_INDEX=0
>  CONFIG_USB=y
> diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index
> 7d9c97f53799..f2dabb554fa9 100644
> --- a/drivers/gpio/Kconfig
> +++ b/drivers/gpio/Kconfig
> @@ -139,6 +139,11 @@ config MXC_GPIO
>  	help
>  	  Support GPIO controllers on various i.MX platforms
> 
> +config MXS_GPIO
> +	bool "Freescale/NXP MXS GPIO driver"
> +	help
> +	  Support GPIO controllers on i.MX23 and i.MX28 platforms
> +
>  config OMAP_GPIO
>  	bool "TI OMAP GPIO driver"
>  	depends on ARCH_OMAP2PLUS
> diff --git a/include/configs/mxs.h b/include/configs/mxs.h index
> cc5d4c85fe9b..6cadd720d2b9 100644
> --- a/include/configs/mxs.h
> +++ b/include/configs/mxs.h
> @@ -94,12 +94,6 @@
>  /*
>   * Drivers
>   */
> -
> -/* APBH DMA */
> -
> -/* GPIO */
> -#define CONFIG_MXS_GPIO
> -
>  /*
>   * DUART Serial Driver.
>   * Conflicts with AUART driver which can be set by board.
> diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index
> 53db749a65c4..6bd5ca2d2625 100644
> --- a/scripts/config_whitelist.txt
> +++ b/scripts/config_whitelist.txt
> @@ -1232,7 +1232,6 @@ CONFIG_MXC_USB_PORTSC  CONFIG_MXS
> CONFIG_MXS_AUART  CONFIG_MXS_AUART_BASE -CONFIG_MXS_GPIO
> CONFIG_MXS_OCOTP  CONFIG_MX_CYCLIC  CONFIG_MY_OPTION
> --
> 2.11.0
Jagan Teki Aug. 14, 2019, 6:58 a.m. UTC | #2
On Tue, Aug 13, 2019 at 9:41 PM Lukasz Majewski <lukma@denx.de> wrote:
>
> This converts the following to Kconfig:
>    CONFIG_MXS_GPIO
>
> Travis-CI: https://travis-ci.org/lmajewski/u-boot-dfu/builds/571260789

Not sure about linking build here,

Otherwise,

Acked-by: Jagan Teki <jagan@amarulasolutions.com>
Tom Rini Aug. 24, 2019, 4:42 p.m. UTC | #3
On Tue, Aug 13, 2019 at 06:10:39PM +0200, Lukasz Majewski wrote:

> This converts the following to Kconfig:
>    CONFIG_MXS_GPIO
> 
> Travis-CI: https://travis-ci.org/lmajewski/u-boot-dfu/builds/571260789
> 
> Signed-off-by: Lukasz Majewski <lukma@denx.de>
> Acked-by: Peng Fan <peng.fan@nxp.com>
> Acked-by: Jagan Teki <jagan@amarulasolutions.com>

Applied to u-boot/master, thanks!

Patch
diff mbox series

diff --git a/configs/apx4devkit_defconfig b/configs/apx4devkit_defconfig
index c5eb53ebef14..138cfa648cdb 100644
--- a/configs/apx4devkit_defconfig
+++ b/configs/apx4devkit_defconfig
@@ -31,6 +31,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_MXS_GPIO=y
 CONFIG_MMC_MXS=y
 CONFIG_NAND=y
 CONFIG_NAND_MXS=y
diff --git a/configs/bg0900_defconfig b/configs/bg0900_defconfig
index 353790f44640..d0d527c8f080 100644
--- a/configs/bg0900_defconfig
+++ b/configs/bg0900_defconfig
@@ -27,6 +27,7 @@  CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_DOS_PARTITION=y
+CONFIG_MXS_GPIO=y
 # CONFIG_MMC is not set
 CONFIG_NAND=y
 CONFIG_NAND_MXS=y
diff --git a/configs/mx23_olinuxino_defconfig b/configs/mx23_olinuxino_defconfig
index 3e4b7ab1c365..fd045ad16268 100644
--- a/configs/mx23_olinuxino_defconfig
+++ b/configs/mx23_olinuxino_defconfig
@@ -26,6 +26,7 @@  CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_MMC=y
+CONFIG_MXS_GPIO=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 773aff4bdc40..bb04623a8f5d 100644
--- a/configs/mx23evk_defconfig
+++ b/configs/mx23evk_defconfig
@@ -28,6 +28,7 @@  CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_MMC=y
 # CONFIG_NET is not set
+CONFIG_MXS_GPIO=y
 CONFIG_MMC_MXS=y
 CONFIG_CONS_INDEX=0
 CONFIG_USB=y
diff --git a/configs/mx28evk_auart_console_defconfig b/configs/mx28evk_auart_console_defconfig
index 27c152571a2f..d7909e2fa918 100644
--- a/configs/mx28evk_auart_console_defconfig
+++ b/configs/mx28evk_auart_console_defconfig
@@ -38,6 +38,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_MXS_GPIO=y
 CONFIG_MMC_MXS=y
 CONFIG_NAND=y
 CONFIG_NAND_MXS=y
diff --git a/configs/mx28evk_defconfig b/configs/mx28evk_defconfig
index 4cee901d8321..7f000c8c380f 100644
--- a/configs/mx28evk_defconfig
+++ b/configs/mx28evk_defconfig
@@ -38,6 +38,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_MXS_GPIO=y
 CONFIG_MMC_MXS=y
 CONFIG_NAND=y
 CONFIG_NAND_MXS=y
diff --git a/configs/mx28evk_nand_defconfig b/configs/mx28evk_nand_defconfig
index 3875da733adb..248d8b1fc9cf 100644
--- a/configs/mx28evk_nand_defconfig
+++ b/configs/mx28evk_nand_defconfig
@@ -37,6 +37,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_MXS_GPIO=y
 CONFIG_MMC_MXS=y
 CONFIG_NAND=y
 CONFIG_NAND_MXS=y
diff --git a/configs/mx28evk_spi_defconfig b/configs/mx28evk_spi_defconfig
index 37477b35f1cb..3097e090a0a5 100644
--- a/configs/mx28evk_spi_defconfig
+++ b/configs/mx28evk_spi_defconfig
@@ -36,6 +36,7 @@  CONFIG_CMD_MTDPARTS=y
 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_MXS_GPIO=y
 CONFIG_MMC_MXS=y
 CONFIG_NAND=y
 CONFIG_NAND_MXS=y
diff --git a/configs/sansa_fuze_plus_defconfig b/configs/sansa_fuze_plus_defconfig
index 9d2b28d3bb6f..6f6328850596 100644
--- a/configs/sansa_fuze_plus_defconfig
+++ b/configs/sansa_fuze_plus_defconfig
@@ -30,6 +30,7 @@  CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MXS_GPIO=y
 CONFIG_MMC_MXS=y
 CONFIG_CONS_INDEX=0
 CONFIG_USB=y
diff --git a/configs/sc_sps_1_defconfig b/configs/sc_sps_1_defconfig
index c7cdc3c0e9b3..e3fd8be60557 100644
--- a/configs/sc_sps_1_defconfig
+++ b/configs/sc_sps_1_defconfig
@@ -29,6 +29,7 @@  CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_MMC=y
+CONFIG_MXS_GPIO=y
 CONFIG_MMC_MXS=y
 CONFIG_PHYLIB=y
 CONFIG_MII=y
diff --git a/configs/ts4600_defconfig b/configs/ts4600_defconfig
index d5816f7612b3..b52ec639d72e 100644
--- a/configs/ts4600_defconfig
+++ b/configs/ts4600_defconfig
@@ -22,6 +22,7 @@  CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_ENV_IS_IN_MMC=y
+CONFIG_MXS_GPIO=y
 CONFIG_MMC_MXS=y
 CONFIG_CONS_INDEX=0
 CONFIG_OF_LIBFDT=y
diff --git a/configs/xfi3_defconfig b/configs/xfi3_defconfig
index 054e3a7e3a8f..6e0edb05ad65 100644
--- a/configs/xfi3_defconfig
+++ b/configs/xfi3_defconfig
@@ -29,6 +29,7 @@  CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MXS_GPIO=y
 CONFIG_MMC_MXS=y
 CONFIG_CONS_INDEX=0
 CONFIG_USB=y
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 7d9c97f53799..f2dabb554fa9 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -139,6 +139,11 @@  config MXC_GPIO
 	help
 	  Support GPIO controllers on various i.MX platforms
 
+config MXS_GPIO
+	bool "Freescale/NXP MXS GPIO driver"
+	help
+	  Support GPIO controllers on i.MX23 and i.MX28 platforms
+
 config OMAP_GPIO
 	bool "TI OMAP GPIO driver"
 	depends on ARCH_OMAP2PLUS
diff --git a/include/configs/mxs.h b/include/configs/mxs.h
index cc5d4c85fe9b..6cadd720d2b9 100644
--- a/include/configs/mxs.h
+++ b/include/configs/mxs.h
@@ -94,12 +94,6 @@ 
 /*
  * Drivers
  */
-
-/* APBH DMA */
-
-/* GPIO */
-#define CONFIG_MXS_GPIO
-
 /*
  * DUART Serial Driver.
  * Conflicts with AUART driver which can be set by board.
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 53db749a65c4..6bd5ca2d2625 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1232,7 +1232,6 @@  CONFIG_MXC_USB_PORTSC
 CONFIG_MXS
 CONFIG_MXS_AUART
 CONFIG_MXS_AUART_BASE
-CONFIG_MXS_GPIO
 CONFIG_MXS_OCOTP
 CONFIG_MX_CYCLIC
 CONFIG_MY_OPTION