diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h
index 00e2908..89bb085 100644
--- a/include/configs/aristainetos-common.h
+++ b/include/configs/aristainetos-common.h
@@ -23,7 +23,6 @@
 #define CONFIG_SYS_MALLOC_LEN		(64 * SZ_1M)
 
 #define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_MXC_GPIO
 
 #define CONFIG_MXC_UART
 
@@ -242,8 +241,6 @@
 #define CONFIG_SYS_I2C_SLAVE		0x7f
 #define CONFIG_SYS_I2C_NOPROBES		{ {0, 0x00} }
 
-#define CONFIG_CMD_GPIO
-
 /* NAND stuff */
 #define CONFIG_CMD_NAND
 #define CONFIG_CMD_NAND_TRIMFFS
diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h
index ba30cfc..ced4d6c 100644
--- a/include/configs/cgtqmx6eval.h
+++ b/include/configs/cgtqmx6eval.h
@@ -22,7 +22,6 @@
 
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_MISC_INIT_R
-#define CONFIG_MXC_GPIO
 
 #define CONFIG_MXC_UART
 #define CONFIG_MXC_UART_BASE	       UART2_BASE
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index 8b89278..5ef7ba7 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -17,10 +17,6 @@
 #define CONFIG_SYS_LITTLE_ENDIAN
 #define CONFIG_MACH_TYPE		4273
 
-#ifndef CONFIG_SPL_BUILD
-#define CONFIG_CMD_GPIO
-#endif
-
 /* CMD */
 #define CONFIG_CMD_GREPENV
 #undef CONFIG_CMD_LOADB
@@ -250,9 +246,6 @@
 #define CONFIG_DWC_AHSATA_PORT_ID	0
 #define CONFIG_DWC_AHSATA_BASE_ADDR	SATA_ARB_BASE_ADDR
 
-/* GPIO */
-#define CONFIG_MXC_GPIO
-
 /* Boot */
 #define CONFIG_ZERO_BOOTDELAY_CHECK
 #define CONFIG_LOADADDR			0x10800000
diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
index e86c831..775ac41 100644
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -28,7 +28,6 @@
 
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_BOARD_LATE_INIT
-#define CONFIG_MXC_GPIO
 
 #define CONFIG_MXC_UART
 
diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h
index 33c6203..ae25640 100644
--- a/include/configs/mx6_common.h
+++ b/include/configs/mx6_common.h
@@ -52,4 +52,8 @@
 #define CONFIG_INITRD_TAG
 #define CONFIG_REVISION_TAG
 
+/* GPIO */
+#define CONFIG_MXC_GPIO
+#define CONFIG_CMD_GPIO
+
 #endif
diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index 5fc7a8c..f42db85 100644
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -19,7 +19,6 @@
 #define CONFIG_SYS_MALLOC_LEN		(10 * SZ_1M)
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_BOARD_LATE_INIT
-#define CONFIG_MXC_GPIO
 #define CONFIG_MXC_UART
 #define CONFIG_CMD_FUSE
 #define CONFIG_MXC_OCOTP
diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h
index 7a124e0..77b0d87 100644
--- a/include/configs/mx6qarm2.h
+++ b/include/configs/mx6qarm2.h
@@ -15,7 +15,6 @@
 #define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + 2 * 1024 * 1024)
 
 #define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_MXC_GPIO
 
 #define CONFIG_MXC_UART
 #define CONFIG_MXC_UART_BASE		UART4_BASE
diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
index ad288f4..b08f006 100644
--- a/include/configs/mx6sabre_common.h
+++ b/include/configs/mx6sabre_common.h
@@ -18,7 +18,6 @@
 
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_BOARD_LATE_INIT
-#define CONFIG_MXC_GPIO
 
 #define CONFIG_MXC_UART
 
diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h
index 2fbb0df..8b450c5 100644
--- a/include/configs/mx6slevk.h
+++ b/include/configs/mx6slevk.h
@@ -18,7 +18,6 @@
 #define CONFIG_SYS_MALLOC_LEN		(3 * SZ_1M)
 
 #define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_MXC_GPIO
 
 #define CONFIG_MXC_UART
 #define CONFIG_MXC_UART_BASE		UART1_IPS_BASE_ADDR
diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
index e1abbcf..72b87a2 100644
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -22,7 +22,6 @@
 #define CONFIG_SYS_MALLOC_LEN		(3 * SZ_1M)
 
 #define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_MXC_GPIO
 
 #define CONFIG_MXC_UART
 #define CONFIG_MXC_UART_BASE		UART1_BASE
diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index ecfc393..7922bbd 100644
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -19,8 +19,6 @@
 
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_MISC_INIT_R
-#define CONFIG_MXC_GPIO
-#define CONFIG_CMD_GPIO
 #define CONFIG_CI_UDC
 #define CONFIG_USBD_HS
 #define CONFIG_USB_GADGET_DUALSPEED
diff --git a/include/configs/novena.h b/include/configs/novena.h
index 841edac..5bdc22d 100644
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -17,7 +17,6 @@
 #define CONFIG_FAT_WRITE
 #define CONFIG_FIT
 #define CONFIG_KEYBOARD
-#define CONFIG_MXC_GPIO
 #define CONFIG_OF_LIBFDT
 
 #include "mx6_common.h"
diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h
index afd9385..4476e01 100644
--- a/include/configs/ot1200.h
+++ b/include/configs/ot1200.h
@@ -15,7 +15,6 @@
 
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_MISC_INIT_R
-#define CONFIG_MXC_GPIO
 
 /* FUSE Configs */
 #define CONFIG_CMD_FUSE
diff --git a/include/configs/platinum.h b/include/configs/platinum.h
index 75d459f..b192c3f 100644
--- a/include/configs/platinum.h
+++ b/include/configs/platinum.h
@@ -26,7 +26,6 @@
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_FUSE
-#define CONFIG_CMD_GPIO
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_MMC
@@ -44,9 +43,6 @@
  * Hardware configuration
  */
 
-/* GPIO config */
-#define CONFIG_MXC_GPIO
-
 /* UART config */
 #define CONFIG_MXC_UART
 #define CONFIG_MXC_UART_BASE			UART1_BASE
diff --git a/include/configs/secomx6quq7.h b/include/configs/secomx6quq7.h
index 60d8416..adc6d7f 100644
--- a/include/configs/secomx6quq7.h
+++ b/include/configs/secomx6quq7.h
@@ -17,7 +17,6 @@
 #define CONFIG_SYS_MALLOC_LEN		(10 * SZ_1M)
 
 #define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_MXC_GPIO
 
 #define CONFIG_MXC_UART
 #define CONFIG_MXC_UART_BASE		UART2_BASE
diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index 0abb092..2e37a5c 100644
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -17,8 +17,6 @@
 #define CONFIG_MACH_TYPE		3980
 
 #define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_MXC_GPIO
-#define CONFIG_CMD_GPIO
 
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_HUSH_PARSER
diff --git a/include/configs/titanium.h b/include/configs/titanium.h
index f09ad8b..0aa2ba2 100644
--- a/include/configs/titanium.h
+++ b/include/configs/titanium.h
@@ -25,7 +25,6 @@
 
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_MISC_INIT_R
-#define CONFIG_MXC_GPIO
 
 #define CONFIG_MXC_UART
 #define CONFIG_MXC_UART_BASE		UART1_BASE
diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h
index b929d8d..bb63caa 100644
--- a/include/configs/tqma6.h
+++ b/include/configs/tqma6.h
@@ -33,7 +33,6 @@
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_BOARD_LATE_INIT
 
-#define CONFIG_MXC_GPIO
 #define CONFIG_MXC_UART
 
 /* SPI */
diff --git a/include/configs/udoo.h b/include/configs/udoo.h
index c51e05a..9fa18f5 100644
--- a/include/configs/udoo.h
+++ b/include/configs/udoo.h
@@ -18,7 +18,6 @@
 #define CONFIG_SYS_MALLOC_LEN		(2 * SZ_1M)
 
 #define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_MXC_GPIO
 
 #define CONFIG_MXC_UART
 #define CONFIG_MXC_UART_BASE		UART2_BASE
diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index 1ec23ee..2d0af1a 100644
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -23,7 +23,6 @@
 
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_BOARD_LATE_INIT
-#define CONFIG_MXC_GPIO
 
 #define CONFIG_MXC_UART
 #define CONFIG_MXC_UART_BASE		UART1_BASE
diff --git a/include/configs/warp.h b/include/configs/warp.h
index 83afc7f..1c8b71f 100644
--- a/include/configs/warp.h
+++ b/include/configs/warp.h
@@ -20,7 +20,6 @@
 
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_BOARD_LATE_INIT
-#define CONFIG_MXC_GPIO
 
 #define CONFIG_MXC_UART
 #define CONFIG_MXC_UART_BASE		UART1_IPS_BASE_ADDR