From 33b28b2745ca311cf56794ba51ec3c8d8d79054c Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 3 May 2015 12:58:08 +0100 Subject: [PATCH 05/10] imx6: move MXC_GPIO define to mx6_common.h --- include/configs/aristainetos.h | 1 - include/configs/cgtqmx6eval.h | 1 - include/configs/cm_fx6.h | 3 --- include/configs/embestmx6boards.h | 1 - include/configs/gw_ventana.h | 3 --- include/configs/hummingboard.h | 1 - include/configs/mx6_common.h | 3 +++ 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, 3 insertions(+), 31 deletions(-) diff --git a/include/configs/aristainetos.h b/include/configs/aristainetos.h index 2865ef6..d712f04 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 diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h index ae28d93..7fb9dd5 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 45debd1..2435d7b 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -253,9 +253,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 299f23b..8bf88e2 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 8669602..47f17ef 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 fe5338e..21cb1a9 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 b30ffb2..e54eee2 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -47,4 +47,7 @@ #define CONFIG_INITRD_TAG #define CONFIG_REVISION_TAG +/* GPIO */ +#define CONFIG_MXC_GPIO + #endif diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index 945cb13..5c871dc 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 7be69ca..7eb162d 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 39a23cc..82e68dc 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 85b1467..dad293f 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 0284aba..d2898cb 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 f1fd599..0142791 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 fef7c03..fe41e53 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 #define CONFIG_REGEX #define CONFIG_SYS_NO_FLASH diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h index 537c37e..1a92bd3 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 2d18098..45a74b0 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 #undef CONFIG_CMD_IMLS #define CONFIG_CMD_MII @@ -45,9 +44,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 bb21d1c..4d8fa1a 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 e728e9a..cac85bc 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 0e070f5..11aa82f 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 9620d41..7b8182f 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 0a75e67..1ec1f70 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 5335d07..d1c2c2e 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 ed625ba..2a1ce937 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 -- 2.4.0