diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-07-01 09:42:25 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-07-01 09:42:25 +0200 |
| commit | 2c4ed7d2506621574284ee66da27ce88b7c21a06 (patch) | |
| tree | 64e66639eb3bfc5f313f93d0f0e153ca4923ada0 | |
| parent | 4c2105cb9fc6f2cd871ad6b5c3c1a0b116196804 (diff) | |
| parent | 4827d067dde99409c6e5b1c0bbbd8dff88db3cd5 (diff) | |
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
| -rwxr-xr-x | MAKEALL | 4 | ||||
| -rw-r--r-- | Makefile | 14 | ||||
| -rw-r--r-- | boards.cfg | 1 |
3 files changed, 2 insertions, 17 deletions
@@ -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 @@ -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 - ######################################################################### ######################################################################### diff --git a/boards.cfg b/boards.cfg index dfefc3fd6a6..ff6f7e4d39e 100644 --- a/boards.cfg +++ b/boards.cfg @@ -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 |