diff options
author | Stefano Babic <sbabic@denx.de> | 2014-08-11 10:21:03 +0200 |
---|---|---|
committer | Stefano Babic <sbabic@denx.de> | 2014-08-11 10:21:03 +0200 |
commit | e82abaeb7f2a0833fccf90460c48b9f2100258f8 (patch) | |
tree | de701f5c90b7373966412d566b5c00d3837954bc /arch/sparc | |
parent | f93f21906e374d46c6abfbdf4eb9cb1ab51b6384 (diff) | |
parent | 1899fac925eda817e12234aef3d01d354788662e (diff) | |
download | u-boot-e82abaeb7f2a0833fccf90460c48b9f2100258f8.zip u-boot-e82abaeb7f2a0833fccf90460c48b9f2100258f8.tar.gz u-boot-e82abaeb7f2a0833fccf90460c48b9f2100258f8.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts:
boards.cfg
Signed-off-by: Stefano Babic <sbabic@denx.de>
Diffstat (limited to 'arch/sparc')
-rw-r--r-- | arch/sparc/Kconfig | 34 | ||||
-rw-r--r-- | arch/sparc/config.mk | 2 |
2 files changed, 35 insertions, 1 deletions
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig new file mode 100644 index 0000000..fc92910 --- /dev/null +++ b/arch/sparc/Kconfig @@ -0,0 +1,34 @@ +menu "SPARC architecture" + depends on SPARC + +config SYS_ARCH + string + default "sparc" + +choice + prompt "Target select" + +config TARGET_GRSIM_LEON2 + bool "Support grsim_leon2" + +config TARGET_GR_CPCI_AX2000 + bool "Support gr_cpci_ax2000" + +config TARGET_GR_EP2S60 + bool "Support gr_ep2s60" + +config TARGET_GR_XC3S_1500 + bool "Support gr_xc3s_1500" + +config TARGET_GRSIM + bool "Support grsim" + +endchoice + +source "board/gaisler/gr_cpci_ax2000/Kconfig" +source "board/gaisler/gr_ep2s60/Kconfig" +source "board/gaisler/gr_xc3s_1500/Kconfig" +source "board/gaisler/grsim/Kconfig" +source "board/gaisler/grsim_leon2/Kconfig" + +endmenu diff --git a/arch/sparc/config.mk b/arch/sparc/config.mk index be59f58..196d28a 100644 --- a/arch/sparc/config.mk +++ b/arch/sparc/config.mk @@ -14,4 +14,4 @@ gcclibdir := $(shell dirname `$(CC) -print-libgcc-file-name`) CONFIG_STANDALONE_LOAD_ADDR ?= 0x00000000 -L $(gcclibdir) \ -T $(srctree)/examples/standalone/sparc.lds -PLATFORM_CPPFLAGS += -DCONFIG_SPARC -D__sparc__ +PLATFORM_CPPFLAGS += -D__sparc__ |