[U-Boot] Convert CONFIG_DA8XX_GPIO to Kconfig

Message ID 20180710120120.24292-1-aford173@gmail.com
State Accepted
Delegated to: Tom Rini
Headers show
Series
  • [U-Boot] Convert CONFIG_DA8XX_GPIO to Kconfig
Related show

Commit Message

Adam Ford July 10, 2018, 12:01 p.m.
This converts the following to Kconfig:
   CONFIG_DA8XX_GPIO

Signed-off-by: Adam Ford <aford173@gmail.com>

Comments

Tom Rini July 24, 2018, 12:39 p.m. | #1
On Tue, Jul 10, 2018 at 07:01:20AM -0500, Adam Ford wrote:

> This converts the following to Kconfig:
>    CONFIG_DA8XX_GPIO
> 
> Signed-off-by: Adam Ford <aford173@gmail.com>
> 
> diff --git a/configs/calimain_defconfig b/configs/calimain_defconfig
> index 7908cfcc34..bc704ff7bd 100644

Applied to u-boot/master, thanks!

Patch

diff --git a/configs/calimain_defconfig b/configs/calimain_defconfig
index 7908cfcc34..bc704ff7bd 100644
--- a/configs/calimain_defconfig
+++ b/configs/calimain_defconfig
@@ -23,6 +23,7 @@  CONFIG_CMD_DIAG=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_SYS_BOOTCOUNT_ADDR=0x01C23000
+CONFIG_DA8XX_GPIO=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SYS_NS16550=y
diff --git a/configs/da850_am18xxevm_defconfig b/configs/da850_am18xxevm_defconfig
index c76321fb47..3223b44ba5 100644
--- a/configs/da850_am18xxevm_defconfig
+++ b/configs/da850_am18xxevm_defconfig
@@ -35,6 +35,7 @@  CONFIG_CMD_DIAG=y
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DM=y
+CONFIG_DA8XX_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_DM_I2C_COMPAT=y
 CONFIG_DM_SPI_FLASH=y
diff --git a/configs/da850evm_defconfig b/configs/da850evm_defconfig
index 6a2b7ae670..b6ec087569 100644
--- a/configs/da850evm_defconfig
+++ b/configs/da850evm_defconfig
@@ -37,6 +37,7 @@  CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DM=y
 CONFIG_DM_GPIO=y
+CONFIG_DA8XX_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_DM_I2C_COMPAT=y
 CONFIG_DM_SPI_FLASH=y
diff --git a/configs/da850evm_direct_nor_defconfig b/configs/da850evm_direct_nor_defconfig
index f71d351ad3..9d6c47df50 100644
--- a/configs/da850evm_direct_nor_defconfig
+++ b/configs/da850evm_direct_nor_defconfig
@@ -35,6 +35,7 @@  CONFIG_CMD_DIAG=y
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_DM=y
+CONFIG_DA8XX_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_DM_I2C_COMPAT=y
 # CONFIG_MMC is not set
diff --git a/configs/ea20_defconfig b/configs/ea20_defconfig
index 497e5515d7..8d0aac700c 100644
--- a/configs/ea20_defconfig
+++ b/configs/ea20_defconfig
@@ -29,6 +29,7 @@  CONFIG_CMD_BMP=y
 CONFIG_CMD_DIAG=y
 CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_DA8XX_GPIO=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
diff --git a/configs/ipam390_defconfig b/configs/ipam390_defconfig
index 15c4944b3b..4256730e4c 100644
--- a/configs/ipam390_defconfig
+++ b/configs/ipam390_defconfig
@@ -33,5 +33,6 @@  CONFIG_MTDPARTS_DEFAULT="mtdparts=davinci_nand.0:128k(u-boot-env),1408k(u-boot),
 CONFIG_CMD_DIAG=y
 CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_DA8XX_GPIO=y
 # CONFIG_MMC is not set
 CONFIG_SYS_NS16550=y
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 29af22ecc7..9caa87846c 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -58,6 +58,11 @@  config ATMEL_PIO4
 	  may be dedicated as a general purpose I/O or be assigned to
 	  a function of an embedded peripheral.
 
+config DA8XX_GPIO
+	bool "DA8xx GPIO Driver"
+	help
+	  This driver supports the DA8xx GPIO controller
+
 config INTEL_BROADWELL_GPIO
 	bool "Intel Broadwell GPIO driver"
 	depends on DM
diff --git a/include/configs/calimain.h b/include/configs/calimain.h
index ab4a9e6ddc..690f605695 100644
--- a/include/configs/calimain.h
+++ b/include/configs/calimain.h
@@ -26,7 +26,6 @@ 
 #define CONFIG_SYS_TIMERBASE		DAVINCI_TIMER0_BASE
 #define CONFIG_SYS_HZ_CLOCK		clk_get(DAVINCI_AUXCLK_CLKID)
 #define CONFIG_ARCH_CPU_INIT
-#define CONFIG_DA8XX_GPIO
 #define CONFIG_HW_WATCHDOG
 #define CONFIG_SYS_WDTTIMERBASE	DAVINCI_TIMER1_BASE
 #define CONFIG_SYS_WDT_PERIOD_LOW \
diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index 6690be60b6..a8d4894bee 100644
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -226,7 +226,6 @@ 
 #define CONFIG_MTD_PARTITIONS		/* required for UBI partition support */
 #endif
 
-#define CONFIG_DA8XX_GPIO
 /*
  * U-Boot general configuration
  */
diff --git a/include/configs/ea20.h b/include/configs/ea20.h
index c84cd962d7..5e6f0c23d2 100644
--- a/include/configs/ea20.h
+++ b/include/configs/ea20.h
@@ -28,7 +28,6 @@ 
 #define CONFIG_SYS_TIMERBASE		DAVINCI_TIMER0_BASE
 #define CONFIG_SYS_HZ_CLOCK		clk_get(DAVINCI_AUXCLK_CLKID)
 #define CONFIG_SKIP_LOWLEVEL_INIT
-#define CONFIG_DA8XX_GPIO
 
 /*
  * Memory Info
diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h
index faf21ddb08..3b13798529 100644
--- a/include/configs/ipam390.h
+++ b/include/configs/ipam390.h
@@ -238,7 +238,6 @@ 
 #define CONFIG_SYS_SPL_ARGS_ADDR	LINUX_BOOT_PARAM_ADDR
 
 /* GPIO support */
-#define CONFIG_DA8XX_GPIO
 #define CONFIG_IPAM390_GPIO_BOOTMODE	((16 * 7) + 14)
 
 #define CONFIG_SHOW_BOOT_PROGRESS
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 8ded15c89a..120212c4a6 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -309,7 +309,6 @@  CONFIG_CUSTOMER_BOARD_SUPPORT
 CONFIG_D2NET_V2
 CONFIG_DA850_AM18X_EVM
 CONFIG_DA850_EVM_MAX_CPU_CLK
-CONFIG_DA8XX_GPIO
 CONFIG_DBAU1000
 CONFIG_DBGU
 CONFIG_DBG_MONITOR