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 4d873518d65bb44579de1f038356e160148fd2ae..f6c2a623abefea2141bdcb3404a79a2605eb1772 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 ad2fe6c25f89229d07e58451fa7ae1d9f29e06fa..0bbd28941036a0dc3ceb9cac03b6303a0edfde87 100644 (file)
--- a/include/configs/mx6_common.h
+++ b/include/configs/mx6_common.h
@@ -54,4 +54,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 e8897125dbc62d333f960192a4f4a3558141b6c7..999e8f77cb8773dac23823eb15ed2c9e3d03c6b1 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 d6243a1cbbf8f5326423f4be5bbd41d16369269f..10a8e8803652ee65c1c1769a71011f1f183be02a 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 1c657a3fdc3602cb7a60938d4395e575566ef337..d17c6d9970f480e6d10396718bf2542f3a119d5e 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 6542f52c634266562be5122f79064780d07853f9..1dba142791bcc73c9f54533541bf219bc0fb598f 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 02fba1ca6eeea1c6687a3690dd07d189edc233e2..6c35e167dc4bf6a95fa550f9abfddb13cfff74a4 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 afcfb878f9a6c431eeb51f5c6ab957e64323fa88..1a40851a9bc45bc8d6cf96d3cc9c3da90ba3c48e 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 1f45b0d41ac8c1e43bd6f10ee54cc33b0bf59800..909724c572e379604a2329cadea84dfc69db6985 100644 (file)
--- a/include/configs/titanium.h
+++ b/include/configs/titanium.h
@@ -23,7 +23,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 9a0cbf42e353ad1679f8bba5005fee0995f1d8bb..4d1575f128d16dba9ec94590bec0946558dbb93d 100644 (file)
--- a/include/configs/tqma6.h
+++ b/include/configs/tqma6.h
@@ -31,7 +31,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 222fe86a4e9ef18af316644475d81295ad765311..4db6d8febf5f1e4eddf7cb9544f0c6a83138837d 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