diff options
| author | Masahiro Yamada <yamada.m@jp.panasonic.com> | 2014-10-30 15:30:55 +0900 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-11-04 15:01:25 -0500 |
| commit | 8be29642404375d0a97ebb46e8f0161a85ead122 (patch) | |
| tree | 1c96ca51a62d46e3b102315618dd3fb6d7014d01 | |
| parent | 89c64cdd8fd815c5b88d50e3f9deb98d83e8cdf7 (diff) | |
| download | talos-obmc-uboot-8be29642404375d0a97ebb46e8f0161a85ead122.tar.gz talos-obmc-uboot-8be29642404375d0a97ebb46e8f0161a85ead122.zip | |
sparc: move CONFIG_{LEON, LEON2, LEON3} to Kconfig
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Daniel Hellstrom <daniel@gaisler.com>
| -rw-r--r-- | arch/sparc/Kconfig | 16 | ||||
| -rw-r--r-- | arch/sparc/cpu/leon2/config.mk | 2 | ||||
| -rw-r--r-- | 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 24bdccbd38..56bdae66d6 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 c44b0930ec..15ba1be048 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 ca6c9b13ec..15ba1be048 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 |
