imx6: move MXC_GPIO define to mx6_common.h

Define CONFIG_MXC_GPIO and CONFIG_CMD_GPIO by default in mx6_common

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>

diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h
index 00e2908f2b23d6e4404459dc52bd72b7b37bd021..89bb08576a19069c0c664ee90d896306c907bbc6 100644 (file)
--- 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 ba30cfcfde045e3af0d17679ffbc3938034047f5..ced4d6c84a1058378360dc344072dd4e512c47b0 100644 (file)
--- 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 8b89278cefac370e804e2c64c9b4fb2ce228eea8..5ef7ba726dd1c5842819267316c54a1b19c8769b 100644 (file)
--- 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 e86c831d04b997f5502c90fadb9cd6fef38994bf..775ac41ae1939532cb8bbe8812576458de819453 100644 (file)
--- 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 33c6203397473cd98f2facaf34016f692f0604ec..ae25640255ffbcfc90b5526471ede2e71af0a4f9 100644 (file)
--- 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 5fc7a8c8f477d01423634ec821a447fad618decc..f42db854720d359d96508ae349d9dcb7032faa9b 100644 (file)
--- 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 7a124e0f2031d52e8e435be6286a6a2389610e64..77b0d874033e8fa1d6b83abc1f034a43ba67210f 100644 (file)
--- 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 ad288f4a650d9c61b6babcf900aa6de1edeb25f5..b08f0060b926e7da6ee07ba2133bfb9d07729bd5 100644 (file)
--- 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 2fbb0df4fdb24ba0e58b2e0547928e7fe5850d8b..8b450c542c5d6254c2f2693e5c44f42442174549 100644 (file)
--- 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 e1abbcfdbabbfc103f11d2cbb2456b4d3f6ed4d6..72b87a20a527f95ccd1e056a64429a42deb2dc85 100644 (file)
--- 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 ecfc3930a0a62924ce66a090fefddacdcee02e40..7922bbd30b3daf7be3035d1031cb679f1de7a605 100644 (file)
--- 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 841edac0cb91817348163db00c25c1dcca808321..5bdc22df9abcca6db76c0121bdb6d325013c66e1 100644 (file)
--- 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 afd9385226ef4fbadd44deb30b789095c7346bcb..4476e01cb8902607f9af456e3d2180c5908cb4c9 100644 (file)
--- 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 75d459fb9bcf0d84b703cb1b3d17f9e3e03eda25..b192c3f5262c042d9d54f1e0523fa562f6390001 100644 (file)
--- 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 60d84164cd9585e6181808947fc711d46c3689a4..adc6d7f58faf70af3261356ab9e04620afec6e79 100644 (file)
--- 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 0abb092fa8a497513ea005702250b684b7e39938..2e37a5cf54c71c4466585d1b35eacbc6e9400df0 100644 (file)
--- 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 f09ad8bd842ed6a67713ee0efbb43d33941c771b..0aa2ba25f41ab44a15be09e904243d43f3c65e31 100644 (file)
--- 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 b929d8db13e53dea9ab2cd281e40229fc2e060fb..bb63caa2637503998e76f78cdd320f8b9734cd5e 100644 (file)
--- 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 c51e05ac5d6d99043a443b7431468083130719c8..9fa18f511ffaeaa7be7a4d26ef9710a8de6f7382 100644 (file)
--- 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 1ec23eea3e5110396e335df1867e225824cc9f67..2d0af1aa0e49fd8429ce935a5902096bf8b45673 100644 (file)
--- 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 83afc7f93f39cc4e4b670b0dabb28f029a0f4720..1c8b71f1585b85808dc5ac5d4444888984688c49 100644 (file)
--- 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