summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2011-07-01 09:42:25 +0200
committerWolfgang Denk <wd@denx.de>2011-07-01 09:42:25 +0200
commit2c4ed7d2506621574284ee66da27ce88b7c21a06 (patch)
tree64e66639eb3bfc5f313f93d0f0e153ca4923ada0
parent4c2105cb9fc6f2cd871ad6b5c3c1a0b116196804 (diff)
parent4827d067dde99409c6e5b1c0bbbd8dff88db3cd5 (diff)
downloadu-boot-imx-2c4ed7d2506621574284ee66da27ce88b7c21a06.zip
u-boot-imx-2c4ed7d2506621574284ee66da27ce88b7c21a06.tar.gz
u-boot-imx-2c4ed7d2506621574284ee66da27ce88b7c21a06.tar.bz2
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-xMAKEALL4
-rw-r--r--Makefile14
-rw-r--r--boards.cfg1
3 files changed, 2 insertions, 17 deletions
diff --git a/MAKEALL b/MAKEALL
index 51db13e..e37000f 100755
--- a/MAKEALL
+++ b/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
diff --git a/Makefile b/Makefile
index 3454db6..f4f28d8 100644
--- a/Makefile
+++ b/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
-
#########################################################################
#########################################################################
diff --git a/boards.cfg b/boards.cfg
index dfefc3f..ff6f7e4 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