[U-Boot] [PATCH 2/5] sparc: move CONFIG_{LEON, LEON2, LEON3} to Kconfig

[Masahiro Yamada]

Signed-off-by: Masahiro Yamada <yamada.m at jp.panasonic.com>
Cc: Daniel Hellstrom <daniel at gaisler.com>
---

 arch/sparc/Kconfig             | 16 ++++++++++++++++
 arch/sparc/cpu/leon2/config.mk |  2 --
 arch/sparc/cpu/leon3/config.mk |  2 --
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 24bdccb..56bdae6 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -4,17 +4,31 @@ menu "SPARC architecture"
 config SYS_ARCH
 	default "sparc"
 
+config LEON
+	bool
+
+config LEON2
+	bool
+	select LEON
+
+config LEON3
+	bool
+	select LEON
+
 choice
 	prompt "Board select"
 
 config TARGET_GRSIM_LEON2
 	bool "GRSIM simulating a LEON2 board"
+	select LEON2
 
 config TARGET_GR_CPCI_AX2000
 	bool "Gaisler GR-CPCI-AX2000 board"
+	select LEON3
 
 config TARGET_GR_EP2S60
 	bool "Gaisler Template design for Altera NIOS board with Stratix EP2S60"
+	select LEON3
 	help
 	  Gaisler Research AB's Template design (GPL Open Source SPARC/LEON3
 	  96MHz) for Altera NIOS Development board Stratix II edition,
@@ -22,9 +36,11 @@ config TARGET_GR_EP2S60
 
 config TARGET_GR_XC3S_1500
 	bool "Gaisler GR-XC3S-1500 spartan board"
+	select LEON3
 
 config TARGET_GRSIM
 	bool "GRSIM simulating a LEON3 GR-XC3S-1500 board"
+	select LEON3
 
 endchoice
 
diff --git a/arch/sparc/cpu/leon2/config.mk b/arch/sparc/cpu/leon2/config.mk
index c44b093..15ba1be 100644
--- a/arch/sparc/cpu/leon2/config.mk
+++ b/arch/sparc/cpu/leon2/config.mk
@@ -6,5 +6,3 @@
 #
 
 PLATFORM_RELFLAGS += -fPIC
-
-PLATFORM_CPPFLAGS += -DCONFIG_LEON -DCONFIG_LEON2
diff --git a/arch/sparc/cpu/leon3/config.mk b/arch/sparc/cpu/leon3/config.mk
index ca6c9b1..15ba1be 100644
--- a/arch/sparc/cpu/leon3/config.mk
+++ b/arch/sparc/cpu/leon3/config.mk
@@ -6,5 +6,3 @@
 #
 
 PLATFORM_RELFLAGS += -fPIC
-
-PLATFORM_CPPFLAGS += -DCONFIG_LEON -DCONFIG_LEON3
-- 
1.9.1