From 89bedb0c10d47c3889a218c17c3ee4612ec9af6c Mon Sep 17 00:00:00 2001 From: Masahiro Yamada <yamada.m@jp.panasonic.com> Date: Thu, 30 Oct 2014 15:30:57 +0900 Subject: [PATCH] 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> --- arch/sparc/Kconfig | 13 ++++++++++--- board/gaisler/gr_cpci_ax2000/Kconfig | 6 ------ board/gaisler/gr_ep2s60/Kconfig | 6 ------ board/gaisler/gr_xc3s_1500/Kconfig | 6 ------ board/gaisler/grsim/Kconfig | 6 ------ board/gaisler/grsim_leon2/Kconfig | 6 ------ 6 files changed, 10 insertions(+), 33 deletions(-) diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index 56bdae66d6..2df09b2e50 100644 --- 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 8da050404c..c12a002179 100644 --- 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 00b2097cf4..f49937c55a 100644 --- 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 765e028b51..e695ba2cdd 100644 --- 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 751fa03be4..18598d3c2a 100644 --- 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 0907f3af89..0d21a0a985 100644 --- 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" -- 2.39.5