From: Mike Frysinger Date: Mon, 27 Jun 2011 03:00:19 +0000 (-0400) Subject: nios2: move generic config to boards.cfg X-Git-Tag: v2011.09-rc1~307^2 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4827d067dde99409c6e5b1c0bbbd8dff88db3cd5;p=u-boot 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 Signed-off-by: Mike Frysinger Signed-off-by: Scott McNutt --- diff --git a/MAKEALL b/MAKEALL index 51db13e59a..e37000f64e 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 3454db62d7..f4f28d898d 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 dfefc3fd6a..ff6f7e4d39 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