[U-Boot] [PATCH v3 1/7] arm: dra7xx: move CONFIG_DRA7XX to Kconfig

Uri Mashiach
2017-02-19T13:27:13Z

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>
---
V3 -> V2: new commit

board/compulab/cl-som-am57x/Kconfig | 4 ++++
board/ti/am57xx/Kconfig | 4 ++++
board/ti/dra7xx/Kconfig | 4 ++++
include/configs/am57xx_evm.h | 2 --
include/configs/cl-som-am57x.h | 2 --
include/configs/dra7xx_evm.h | 2 --
scripts/config_whitelist.txt | 1 -
7 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/board/compulab/cl-som-am57x/Kconfig b/board/compulab/cl-som-am57x/Kconfig
index 85fc9a1..6d9ddc0 100644
--- a/board/compulab/cl-som-am57x/Kconfig
+++ b/board/compulab/cl-som-am57x/Kconfig
@@ -9,4 +9,8 @@ config SYS_VENDOR
config SYS_CONFIG_NAME
default "cl-som-am57x"

+config DRA7XX
+ bool
+ default y
+
endif
diff --git a/board/ti/am57xx/Kconfig b/board/ti/am57xx/Kconfig
index cead0f4..e70bcee 100644
--- a/board/ti/am57xx/Kconfig
+++ b/board/ti/am57xx/Kconfig
@@ -18,6 +18,10 @@ config CONS_INDEX
Depending on your specific board you may want something other than UART3
here.

+config DRA7XX
+ bool
+ default y
+
source "board/ti/common/Kconfig"

endif
diff --git a/board/ti/dra7xx/Kconfig b/board/ti/dra7xx/Kconfig
index b642113..bec3f1e 100644
--- a/board/ti/dra7xx/Kconfig
+++ b/board/ti/dra7xx/Kconfig
@@ -18,6 +18,10 @@ config CONS_INDEX
Depending on your specific board you may want something other than UART1
here.

+config DRA7XX
+ bool
+ default y
+
source "board/ti/common/Kconfig"

endif
diff --git a/include/configs/am57xx_evm.h b/include/configs/am57xx_evm.h
index 3d8b996..42cd434 100644
--- 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 e1f724b..c5f39ff 100644
--- 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 bf8c041..3c7bdef 100644
--- 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 d21589b..7f5b3c7 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -806,7 +806,6 @@ CONFIG_DNP5370_EXT_WD_DISABLE
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
--
2.7.4