sparc: merge CONFIG_SYS_CPU and CONFIG_SYS_VENDOR defines

For now, all the SPARC boards in U-Boot are provided by Gaisler.

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

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 56bdae66d64bd284a12ef5e418228e068c2894cc..2df09b2e50e3e18c5dacb9ce09f32f092c5ac54c 100644 (file)
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -1,9 +1,6 @@
 menu "SPARC architecture"
        depends on SPARC
 
-config SYS_ARCH
-       default "sparc"
-
 config LEON
        bool
 
@@ -44,6 +41,16 @@ config TARGET_GRSIM
 
 endchoice
 
+config SYS_ARCH
+       default "sparc"
+
+config SYS_CPU
+       default "leon2" if LEON2
+       default "leon3" if LEON3
+
+config SYS_VENDOR
+       default "gaisler"
+
 source "board/gaisler/gr_cpci_ax2000/Kconfig"
 source "board/gaisler/gr_ep2s60/Kconfig"
 source "board/gaisler/gr_xc3s_1500/Kconfig"

diff --git a/board/gaisler/gr_cpci_ax2000/Kconfig b/board/gaisler/gr_cpci_ax2000/Kconfig
index 8da050404cfa58ea528bc2e811525d9d6c7fdabb..c12a002179a584ebb2c3bbe38db1ab419260f091 100644 (file)
--- a/board/gaisler/gr_cpci_ax2000/Kconfig
+++ b/board/gaisler/gr_cpci_ax2000/Kconfig
@@ -1,14 +1,8 @@
 if TARGET_GR_CPCI_AX2000
 
-config SYS_CPU
-       default "leon3"
-
 config SYS_BOARD
        default "gr_cpci_ax2000"
 
-config SYS_VENDOR
-       default "gaisler"
-
 config SYS_CONFIG_NAME
        default "gr_cpci_ax2000"
 

diff --git a/board/gaisler/gr_ep2s60/Kconfig b/board/gaisler/gr_ep2s60/Kconfig
index 00b2097cf436fce073f303e122a93256bd2d62da..f49937c55a65bedf5af4f79c836b2ee7f4e8fc63 100644 (file)
--- a/board/gaisler/gr_ep2s60/Kconfig
+++ b/board/gaisler/gr_ep2s60/Kconfig
@@ -1,14 +1,8 @@
 if TARGET_GR_EP2S60
 
-config SYS_CPU
-       default "leon3"
-
 config SYS_BOARD
        default "gr_ep2s60"
 
-config SYS_VENDOR
-       default "gaisler"
-
 config SYS_CONFIG_NAME
        default "gr_ep2s60"
 

diff --git a/board/gaisler/gr_xc3s_1500/Kconfig b/board/gaisler/gr_xc3s_1500/Kconfig
index 765e028b51eb04bfd35f8470517196b6166281d4..e695ba2cddb83982c293acaba6d90b8c8af9fb10 100644 (file)
--- a/board/gaisler/gr_xc3s_1500/Kconfig
+++ b/board/gaisler/gr_xc3s_1500/Kconfig
@@ -1,14 +1,8 @@
 if TARGET_GR_XC3S_1500
 
-config SYS_CPU
-       default "leon3"
-
 config SYS_BOARD
        default "gr_xc3s_1500"
 
-config SYS_VENDOR
-       default "gaisler"
-
 config SYS_CONFIG_NAME
        default "gr_xc3s_1500"
 

diff --git a/board/gaisler/grsim/Kconfig b/board/gaisler/grsim/Kconfig
index 751fa03be4dd704372125ce5be0b41350ca66f86..18598d3c2a7fd7304be8adc3c3c06f7e2d0b08a6 100644 (file)
--- a/board/gaisler/grsim/Kconfig
+++ b/board/gaisler/grsim/Kconfig
@@ -1,14 +1,8 @@
 if TARGET_GRSIM
 
-config SYS_CPU
-       default "leon3"
-
 config SYS_BOARD
        default "grsim"
 
-config SYS_VENDOR
-       default "gaisler"
-
 config SYS_CONFIG_NAME
        default "grsim"
 

diff --git a/board/gaisler/grsim_leon2/Kconfig b/board/gaisler/grsim_leon2/Kconfig
index 0907f3af891ce527a5db41ec732d44789073f4f9..0d21a0a985e5876d72d053231f9961086741a2b9 100644 (file)
--- a/board/gaisler/grsim_leon2/Kconfig
+++ b/board/gaisler/grsim_leon2/Kconfig
@@ -1,14 +1,8 @@
 if TARGET_GRSIM_LEON2
 
-config SYS_CPU
-       default "leon2"
-
 config SYS_BOARD
        default "grsim_leon2"
 
-config SYS_VENDOR
-       default "gaisler"
-
 config SYS_CONFIG_NAME
        default "grsim_leon2"