Merge branch 'next' of git://git.denx.de/u-boot-nios
* 'next' of git://git.denx.de/u-boot-nios: nios2: move generic config to boards.cfg
This commit is contained in:
commit
2c4ed7d250
3 changed files with 2 additions and 17 deletions
4
MAKEALL
4
MAKEALL
|
@ -553,9 +553,7 @@ LIST_x86="$(boards_by_arch x86)"
|
|||
## Nios-II Systems
|
||||
#########################################################################
|
||||
|
||||
LIST_nios2="$(boards_by_arch nios2)
|
||||
nios2-generic \
|
||||
"
|
||||
LIST_nios2="$(boards_by_arch nios2)"
|
||||
|
||||
#########################################################################
|
||||
## MicroBlaze Systems
|
||||
|
|
14
Makefile
14
Makefile
|
@ -1047,20 +1047,6 @@ smdk6400_config : unconfig
|
|||
@$(MKCONFIG) smdk6400 arm arm1176 smdk6400 samsung s3c64xx
|
||||
@echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
|
||||
|
||||
#========================================================================
|
||||
# Nios
|
||||
#========================================================================
|
||||
|
||||
#########################################################################
|
||||
## Nios-II
|
||||
#########################################################################
|
||||
|
||||
# nios2 generic boards
|
||||
NIOS2_GENERIC = nios2-generic
|
||||
|
||||
$(NIOS2_GENERIC:%=%_config) : unconfig
|
||||
@$(MKCONFIG) $@ nios2 nios2 nios2-generic altera
|
||||
|
||||
#########################################################################
|
||||
#########################################################################
|
||||
|
||||
|
|
|
@ -283,6 +283,7 @@ vct_platinumavc mips mips32 vct microna
|
|||
vct_platinumavc_small mips mips32 vct micronas - vct:VCT_PLATINUMAVC,VCT_SMALL_IMAGE
|
||||
vct_platinumavc_onenand mips mips32 vct micronas - vct:VCT_PLATINUMAVC,VCT_ONENAND
|
||||
vct_platinumavc_onenand_small mips mips32 vct micronas - vct:VCT_PLATINUMAVC,VCT_ONENAND,VCT_SMALL_IMAGE
|
||||
nios2-generic nios2 nios2 nios2-generic altera
|
||||
PCI5441 nios2 nios2 pci5441 psyent
|
||||
PK1C20 nios2 nios2 pk1c20 psyent
|
||||
EVB64260 powerpc 74xx_7xx evb64260 - - EVB64260
|
||||
|
|
Loading…
Reference in a new issue