arm: dra7xx: move CONFIG_DRA7XX to Kconfig

The symbol CONFIG_DRA7XX is needed for Kconfig conditions.

Cc: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Uri Mashiach <uri.mashiach@compulab.co.il>
Reviewed-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/arm/mach-omap2/omap5/Kconfig b/arch/arm/mach-omap2/omap5/Kconfig
index 4041adc..c89c438 100644 (file)
--- a/arch/arm/mach-omap2/omap5/Kconfig
+++ b/arch/arm/mach-omap2/omap5/Kconfig
@@ -1,11 +1,17 @@
 if OMAP54XX
 
+config DRA7XX
+       bool
+       help
+         DRA7xx is an OMAP based SOC with Dual Core A-15s.
+
 choice
        prompt "OMAP5 board select"
        optional
 
 config TARGET_CL_SOM_AM57X
        bool "CompuLab CL-SOM-AM57x"
+       select DRA7XX
 
 config TARGET_CM_T54
        bool "CompuLab CM-T54"
@@ -16,12 +22,14 @@ config TARGET_OMAP5_UEVM
 config TARGET_DRA7XX_EVM
        bool "TI DRA7XX"
        select BOARD_LATE_INIT
+       select DRA7XX
        select TI_I2C_BOARD_DETECT
        select PHYS_64BIT
 
 config TARGET_AM57XX_EVM
        bool "AM57XX"
        select BOARD_LATE_INIT
+       select DRA7XX
        select TI_I2C_BOARD_DETECT
 
 endchoice

diff --git a/include/configs/am57xx_evm.h b/include/configs/am57xx_evm.h
index dc7a370..6962039 100644 (file)
--- a/include/configs/am57xx_evm.h
+++ b/include/configs/am57xx_evm.h
@@ -14,8 +14,6 @@
 
 #include <environment/ti/dfu.h>
 
-#define CONFIG_DRA7XX
-
 #ifdef CONFIG_SPL_BUILD
 #define CONFIG_IODELAY_RECALIBRATION
 #endif

diff --git a/include/configs/cl-som-am57x.h b/include/configs/cl-som-am57x.h
index a4950f3..d9965d6 100644 (file)
--- a/include/configs/cl-som-am57x.h
+++ b/include/configs/cl-som-am57x.h
@@ -11,8 +11,6 @@
 #ifndef __CONFIG_CL_SOM_AM57X_H
 #define __CONFIG_CL_SOM_AM57X_H
 
-#define CONFIG_DRA7XX
-
 #define CONFIG_NR_DRAM_BANKS           2
 
 #define CONSOLEDEV                     "ttyO2"

diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h
index 7d6f7ff..a9ca023 100644 (file)
--- a/include/configs/dra7xx_evm.h
+++ b/include/configs/dra7xx_evm.h
@@ -14,8 +14,6 @@
 
 #include <environment/ti/dfu.h>
 
-#define CONFIG_DRA7XX
-
 #ifdef CONFIG_SPL_BUILD
 #define CONFIG_IODELAY_RECALIBRATION
 #endif

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index ed349b9..1704f9c 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -664,7 +664,6 @@ CONFIG_DNET_AUTONEG_TIMEOUT
 CONFIG_DP_DDR_CTRL
 CONFIG_DP_DDR_DIMM_SLOTS_PER_CTLR
 CONFIG_DP_DDR_NUM_CTRLS
-CONFIG_DRA7XX
 CONFIG_DRAM_2G
 CONFIG_DRAM_TIMINGS_
 CONFIG_DRIVER_AT91EMAC