Define CONFIG_MXC_GPIO and CONFIG_CMD_GPIO by default in mx6_common
Signed-off-by: Peter Robinson pbrobinson@gmail.com --- include/configs/aristainetos.h | 2 -- include/configs/cgtqmx6eval.h | 1 - include/configs/cm_fx6.h | 7 ------- include/configs/embestmx6boards.h | 1 - include/configs/gw_ventana.h | 3 --- include/configs/hummingboard.h | 1 - include/configs/mx6_common.h | 4 ++++ include/configs/mx6cuboxi.h | 1 - include/configs/mx6qarm2.h | 1 - include/configs/mx6sabre_common.h | 1 - include/configs/mx6slevk.h | 1 - include/configs/mx6sxsabresd.h | 1 - include/configs/nitrogen6x.h | 2 -- include/configs/novena.h | 1 - include/configs/ot1200.h | 1 - include/configs/platinum.h | 4 ---- include/configs/secomx6quq7.h | 1 - include/configs/tbs2910.h | 2 -- include/configs/titanium.h | 1 - include/configs/tqma6.h | 1 - include/configs/udoo.h | 1 - include/configs/wandboard.h | 1 - include/configs/warp.h | 1 - 23 files changed, 4 insertions(+), 36 deletions(-)
diff --git a/include/configs/aristainetos.h b/include/configs/aristainetos.h index bedbab4..a883a37 100644 --- a/include/configs/aristainetos.h +++ b/include/configs/aristainetos.h @@ -24,7 +24,6 @@ #define CONFIG_SYS_MALLOC_LEN (64 * SZ_1M)
#define CONFIG_BOARD_EARLY_INIT_F -#define CONFIG_MXC_GPIO
#define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART5_BASE @@ -251,7 +250,6 @@ #define CONFIG_SYS_I2C_SLAVE 0x7f #define CONFIG_SYS_I2C_NOPROBES { {0, 0x00} }
-#define CONFIG_CMD_GPIO #define CONFIG_GPIO_ENABLE_SPI_FLASH IMX_GPIO_NR(2, 15)
/* NAND stuff */ 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 a58ad92..574033e 100644 --- a/include/configs/embestmx6boards.h +++ b/include/configs/embestmx6boards.h @@ -26,7 +26,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/gw_ventana.h b/include/configs/gw_ventana.h index b713925..3bee61a 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -32,9 +32,6 @@ #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_MISC_INIT_R
-/* GPIO */ -#define CONFIG_MXC_GPIO - /* Serial */ #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART2_BASE diff --git a/include/configs/hummingboard.h b/include/configs/hummingboard.h index 3a62ab4..468a40f 100644 --- a/include/configs/hummingboard.h +++ b/include/configs/hummingboard.h @@ -19,7 +19,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 UART1_BASE diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index f978232..bc225ea 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -49,4 +49,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 a4e4d96..435cb4b 100644 --- a/include/configs/mx6cuboxi.h +++ b/include/configs/mx6cuboxi.h @@ -19,7 +19,6 @@ #define CONFIG_SYS_MALLOC_LEN (2 * 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 ec1c7a4..d53ac01 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 24fb3ce..645c16c 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 e5ae0cc..d6dc6de 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -19,7 +19,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