summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-06-26 23:00:19 -0400
committerScott McNutt <smcnutt@psyent.com>2011-06-30 09:18:46 -0400
commit4827d067dde99409c6e5b1c0bbbd8dff88db3cd5 (patch)
tree4649ec362b0b8a7f7530667f6f4ac35154ab8d15
parentb1af6f532e0d348b153d5c148369229d24af361a (diff)
downloadu-boot-imx-4827d067dde99409c6e5b1c0bbbd8dff88db3cd5.zip
u-boot-imx-4827d067dde99409c6e5b1c0bbbd8dff88db3cd5.tar.gz
u-boot-imx-4827d067dde99409c6e5b1c0bbbd8dff88db3cd5.tar.bz2
nios2: move generic config to boards.cfg
I can't build test this, but just looking at the config files written and it seems OK ... Tested-by: Thomas Chou <thomas@wytron.com.tw> Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Scott McNutt <smcnutt@psyent.com>
-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