Convert CONFIG_MXC_GPIO to Kconfig

This converts the following to Kconfig: CONFIG_MXC_GPIO Signed-off-by: Adam Ford <aford173@gmail.com>
6 years ago · 8bbff6a70e
parent f1754f0810
commit 8bbff6a70e
41 changed files with 20 additions and 55 deletions
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@ -669,11 +669,13 @@ config ARCH_MX8M
 config ARCH_MX25
 	bool "NXP MX25"
 	select CPU_ARM926EJS
+	imply MXC_GPIO

 config ARCH_MX7ULP
        bool "NXP MX7ULP"
        select CPU_V7
 	select ROM_UNIFIED_SECTIONS
+	imply MXC_GPIO

 config ARCH_MX7
 	bool "Freescale MX7"
@ -683,6 +685,7 @@ config ARCH_MX7
 	select SYS_FSL_SEC_LE
 	select BOARD_EARLY_INIT_F
 	select ARCH_MISC_INIT
+	imply MXC_GPIO

 config ARCH_MX6
 	bool "Freescale MX6"
@ -691,6 +694,7 @@ config ARCH_MX6
 	select SYS_FSL_SEC_COMPAT_4
 	select SYS_FSL_SEC_LE
 	select SYS_THUMB_BUILD if SPL
+	imply MXC_GPIO

 if ARCH_MX6
 config SPL_LDSCRIPT
@ -701,6 +705,7 @@ config ARCH_MX5
 	bool "Freescale MX5"
 	select CPU_V7
 	select BOARD_EARLY_INIT_F
+	imply MXC_GPIO

 config ARCH_QEMU
 	bool "QEMU Virtual Platform"
--- a/configs/apf27_defconfig
+++ b/configs/apf27_defconfig
@ -33,6 +33,7 @@ CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FPGA_XILINX=y
 CONFIG_MMC_MXC=y
+CONFIG_MXC_GPIO=y
 CONFIG_NAND=y
 CONFIG_NAND_MXC=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
--- a/configs/flea3_defconfig
+++ b/configs/flea3_defconfig
@ -19,6 +19,7 @@ CONFIG_CMD_MTDPARTS=y
 CONFIG_MTDIDS_DEFAULT="nand0=mxc_nand,nor0=physmap-flash.0"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=mxc_nand:50m(root1),32m(rootfb),64m(pcache),64m(app1),10m(app2),-(spool);physmap-flash.0:512k(u-boot),64k(env1),64k(env2),3776k(kernel1),3776k(kernel2)"
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_MXC_GPIO=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_NAND=y
--- a/configs/imx31_phycore_eet_defconfig
+++ b/configs/imx31_phycore_eet_defconfig
@ -12,6 +12,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_BMP=y
 CONFIG_MTDPARTS_DEFAULT="mtdparts=physmap-flash.0:128k(uboot)ro,1536k(kernel),-(root)"
 CONFIG_ENV_IS_IN_EEPROM=y
+CONFIG_MXC_GPIO=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_NETDEVICES=y
--- a/configs/mx31ads_defconfig
+++ b/configs/mx31ads_defconfig
@ -7,5 +7,6 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_MXC_GPIO=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
--- a/configs/mx31pdk_defconfig
+++ b/configs/mx31pdk_defconfig
@ -14,6 +14,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_MXC_GPIO=y
 # CONFIG_MMC is not set
 CONFIG_NAND=y
 CONFIG_NAND_MXC=y
--- a/configs/mx35pdk_defconfig
+++ b/configs/mx35pdk_defconfig
@ -23,6 +23,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=mxc_nand:1m(boot),5m(linux),96m(root),8m(cfg),
 CONFIG_EFI_PARTITION=y
 # CONFIG_PARTITION_UUIDS is not set
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_MXC_GPIO=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_NAND=y
 CONFIG_NAND_MXC=y
--- a/configs/mx7ulp_evk_defconfig
+++ b/configs/mx7ulp_evk_defconfig
@ -14,6 +14,7 @@ CONFIG_ENV_IS_IN_MMC=y
 CONFIG_DM=y
 CONFIG_DM_GPIO=y
 CONFIG_IMX_RGPIO2P=y
+# CONFIG_MXC_GPIO is not set
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
 CONFIG_PINCTRL=y
--- a/configs/mx7ulp_evk_plugin_defconfig
+++ b/configs/mx7ulp_evk_plugin_defconfig
@ -13,6 +13,7 @@ CONFIG_ENV_IS_IN_MMC=y
 CONFIG_DM=y
 CONFIG_DM_GPIO=y
 CONFIG_IMX_RGPIO2P=y
+# CONFIG_MXC_GPIO is not set
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
 CONFIG_PINCTRL=y
--- a/configs/woodburn_defconfig
+++ b/configs/woodburn_defconfig
@ -24,6 +24,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=mxc_nand:50m(root1),32m(rootfb),64m(pcache),64
 CONFIG_EFI_PARTITION=y
 # CONFIG_PARTITION_UUIDS is not set
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_MXC_GPIO=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_NAND=y
 CONFIG_NAND_MXC=y
--- a/configs/woodburn_sd_defconfig
+++ b/configs/woodburn_sd_defconfig
@ -35,6 +35,7 @@ CONFIG_EFI_PARTITION=y
 # CONFIG_PARTITION_UUIDS is not set
 # CONFIG_SPL_PARTITION_UUIDS is not set
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_MXC_GPIO=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_NAND=y
 CONFIG_NAND_MXC=y
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@ -108,6 +108,11 @@ config MSM_GPIO
 	  - APQ8016
 	  - MSM8916

+config MXC_GPIO
+	bool "Freescale/NXP MXC UART driver"
+	help
+	  Support GPIO controllers on various i.MX platforms
+
 config OMAP_GPIO
 	bool "TI OMAP GPIO driver"
 	depends on ARCH_OMAP2PLUS
--- a/include/configs/advantech_dms-ba16.h
+++ b/include/configs/advantech_dms-ba16.h
@ -33,7 +33,6 @@
 #define CONFIG_REVISION_TAG
 #define CONFIG_SYS_MALLOC_LEN		(10 * SZ_1M)

-#define CONFIG_MXC_GPIO
 #define CONFIG_MXC_UART

 #define CONFIG_MXC_OCOTP
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@ -101,7 +101,6 @@
 #define CONFIG_DFU_MMC

 /* Miscellaneous commands */
-#define CONFIG_MXC_GPIO

 /* Framebuffer and LCD */
 #define CONFIG_VIDEO_IPUV3
--- a/include/configs/apf27.h
+++ b/include/configs/apf27.h
@ -170,11 +170,6 @@
 #define CONFIG_MXC_UART_BASE		UART1_BASE

 /*
- * GPIO
- */
-#define CONFIG_MXC_GPIO
-
-/*
 * NOR
 */

--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@ -89,7 +89,6 @@
 #define CONFIG_DFU_MMC

 /* Miscellaneous commands */
-#define CONFIG_MXC_GPIO

 /* Framebuffer and LCD */
 #define CONFIG_VIDEO_IPUV3
--- a/include/configs/dh_imx6.h
+++ b/include/configs/dh_imx6.h
@ -64,9 +64,6 @@
 #define CONFIG_MXC_OCOTP
 #endif

-/* GPIO */
-#define CONFIG_MXC_GPIO
-
 /* I2C Configs */
 #define CONFIG_SYS_I2C
 #define CONFIG_SYS_I2C_MXC
--- a/include/configs/flea3.h
+++ b/include/configs/flea3.h
@ -48,7 +48,6 @@
 #define CONFIG_SYS_SPD_BUS_NUM		2 /* I2C3 */
 #define CONFIG_SYS_MXC_I2C3_SLAVE	0xfe
 #define CONFIG_MXC_SPI
-#define CONFIG_MXC_GPIO

 /*
 * UART (console)
--- a/include/configs/ge_bx50v3.h
+++ b/include/configs/ge_bx50v3.h
@ -50,7 +50,6 @@

 #define CONFIG_LAST_STAGE_INIT

-#define CONFIG_MXC_GPIO
 #define CONFIG_MXC_UART

 #define CONFIG_MXC_OCOTP
--- a/include/configs/imx27lite-common.h
+++ b/include/configs/imx27lite-common.h
@ -132,11 +132,6 @@
 #define CONFIG_MXC_NAND_HWECC

 /*
- * GPIO
- */
-#define CONFIG_MXC_GPIO
-
-/*
 * U-Boot general configuration
 */
 #define CONFIG_SYS_CBSIZE	1024	/* Console I/O Buffer Size  */
--- a/include/configs/imx31_phycore.h
+++ b/include/configs/imx31_phycore.h
@ -147,8 +147,6 @@

 /* EET platform additions */
 #ifdef CONFIG_TARGET_IMX31_PHYCORE_EET
-#define CONFIG_MXC_GPIO
-
 #define CONFIG_HARD_SPI
 #define CONFIG_MXC_SPI

--- a/include/configs/m53evk.h
+++ b/include/configs/m53evk.h
@ -8,8 +8,6 @@
 #ifndef __M53EVK_CONFIG_H__
 #define __M53EVK_CONFIG_H__

-#define CONFIG_MXC_GPIO
-
 #include <asm/arch/imx-regs.h>

 #define CONFIG_REVISION_TAG
--- a/include/configs/mx25pdk.h
+++ b/include/configs/mx25pdk.h
@ -12,7 +12,6 @@
 /* High Level Configuration Options */

 #define CONFIG_SYS_TEXT_BASE		0x81200000
-#define CONFIG_MXC_GPIO
 #define CONFIG_SYS_FSL_CLK

 #define CONFIG_SYS_TIMER_RATE		32768
--- a/include/configs/mx31ads.h
+++ b/include/configs/mx31ads.h
@ -38,7 +38,6 @@
 #define CONFIG_MXC_SPI		1
 #define CONFIG_DEFAULT_SPI_BUS	1
 #define CONFIG_DEFAULT_SPI_MODE	(SPI_MODE_0 | SPI_CS_HIGH)
-#define CONFIG_MXC_GPIO

 /* PMIC Controller */
 #define CONFIG_POWER
--- a/include/configs/mx31pdk.h
+++ b/include/configs/mx31pdk.h
@ -46,7 +46,6 @@

 #define CONFIG_MXC_UART
 #define CONFIG_MXC_UART_BASE	UART1_BASE
-#define CONFIG_MXC_GPIO

 #define CONFIG_HARD_SPI
 #define CONFIG_MXC_SPI
--- a/include/configs/mx35pdk.h
+++ b/include/configs/mx35pdk.h
@ -42,7 +42,6 @@
 #define CONFIG_SYS_I2C_MXC_I2C2		/* enable I2C bus 2 */
 #define CONFIG_SYS_I2C_MXC_I2C3		/* enable I2C bus 3 */
 #define CONFIG_MXC_SPI
-#define CONFIG_MXC_GPIO

 /*
 * PMIC Configs
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@ -36,7 +36,6 @@

 #define CONFIG_MXC_UART
 #define CONFIG_MXC_UART_BASE	UART1_BASE
-#define CONFIG_MXC_GPIO

 /*
 * SPI Configs
--- a/include/configs/mx53ard.h
+++ b/include/configs/mx53ard.h
@ -23,8 +23,6 @@
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + 2 * 1024 * 1024)

-#define CONFIG_MXC_GPIO
-
 #define CONFIG_SYS_MAX_NAND_DEVICE	1
 #define CONFIG_SYS_NAND_BASE		NFC_BASE_ADDR_AXI
 #define CONFIG_MXC_NAND_REGS_BASE	NFC_BASE_ADDR_AXI
--- a/include/configs/mx53cx9020.h
+++ b/include/configs/mx53cx9020.h
@ -24,7 +24,6 @@
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN		(10 * 1024 * 1024)

-#define CONFIG_MXC_GPIO
 #define CONFIG_REVISION_TAG

 #define CONFIG_MXC_UART_BASE UART2_BASE
--- a/include/configs/mx53evk.h
+++ b/include/configs/mx53evk.h
@ -23,8 +23,6 @@
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + 2 * 1024 * 1024)

-#define CONFIG_MXC_GPIO
-
 #define CONFIG_MXC_UART
 #define CONFIG_MXC_UART_BASE	UART1_BASE

--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@ -23,7 +23,6 @@
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN		(10 * 1024 * 1024)

-#define CONFIG_MXC_GPIO
 #define CONFIG_REVISION_TAG

 #define CONFIG_MXC_UART
--- a/include/configs/mx53ppd.h
+++ b/include/configs/mx53ppd.h
@ -29,7 +29,6 @@

 #define CONFIG_MISC_INIT_R
 #define CONFIG_BOARD_LATE_INIT
-#define CONFIG_MXC_GPIO
 #define CONFIG_REVISION_TAG

 #define CONFIG_MXC_UART
--- a/include/configs/mx53smd.h
+++ b/include/configs/mx53smd.h
@ -23,8 +23,6 @@
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + 2 * 1024 * 1024)

-#define CONFIG_MXC_GPIO
-
 #define CONFIG_MXC_UART
 #define CONFIG_MXC_UART_BASE	UART1_BASE

--- a/include/configs/mx6_common.h
+++ b/include/configs/mx6_common.h
@ -69,9 +69,6 @@
 #define CONFIG_SYS_CBSIZE	512
 #define CONFIG_SYS_MAXARGS	32

-/* GPIO */
-#define CONFIG_MXC_GPIO
-
 /* MMC */
 #define CONFIG_BOUNCE_BUFFER
 #define CONFIG_FSL_ESDHC
--- a/include/configs/mx6ullevk.h
+++ b/include/configs/mx6ullevk.h
@ -27,8 +27,6 @@
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN		(16 * SZ_1M)

-#define CONFIG_MXC_GPIO
-
 #define CONFIG_MXC_UART
 #define CONFIG_MXC_UART_BASE		UART1_BASE

--- a/include/configs/mx7_common.h
+++ b/include/configs/mx7_common.h
@ -45,9 +45,6 @@
 #ifndef CONFIG_SYS_DCACHE_OFF
 #endif

-/* GPIO */
-#define CONFIG_MXC_GPIO
-
 /* UART */
 #define CONFIG_MXC_UART

--- a/include/configs/ts4800.h
+++ b/include/configs/ts4800.h
@ -43,7 +43,6 @@

 #define CONFIG_MXC_UART
 #define CONFIG_MXC_UART_BASE	UART1_BASE
-#define CONFIG_MXC_GPIO

 /*
 * SPI Configs
--- a/include/configs/usbarmory.h
+++ b/include/configs/usbarmory.h
@ -12,7 +12,6 @@
 #define __CONFIG_H

 #define CONFIG_SYS_FSL_CLK
-#define CONFIG_MXC_GPIO

 #include <asm/arch/imx-regs.h>

--- a/include/configs/woodburn_common.h
+++ b/include/configs/woodburn_common.h
@ -44,7 +44,6 @@
 #define CONFIG_SYS_I2C_MXC_I2C3		/* enable I2C bus 3 */
 #define CONFIG_SYS_SPD_BUS_NUM		0
 #define CONFIG_MXC_SPI
-#define CONFIG_MXC_GPIO

 /* PMIC Controller */
 #define CONFIG_POWER
@ -76,8 +75,6 @@
 #define CONFIG_BOOTP_GATEWAY
 #define CONFIG_BOOTP_DNS

-#define CONFIG_MXC_GPIO
-
 #define CONFIG_NET_RETRY_COUNT	100


--- a/include/configs/zmx25.h
+++ b/include/configs/zmx25.h
@ -38,11 +38,6 @@
 */

 /*
- * GPIO
- */
-#define CONFIG_MXC_GPIO
-
-/*
 * Serial
 */
 #define CONFIG_MXC_UART
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@ -1428,7 +1428,6 @@ CONFIG_MX6DQ_LPDDR2
 CONFIG_MX6SX_SABRESD_REVA
 CONFIG_MX6UL_14X14_EVK_EMMC_REWORK
 CONFIG_MXC_EPDC
-CONFIG_MXC_GPIO
 CONFIG_MXC_GPT_HCLK
 CONFIG_MXC_MCI_REGS_BASE
 CONFIG_MXC_NAND_HWECC