diff mbox

[U-Boot,v2] nios2: move generic config to boards.cfg

Message ID 1309143619-1656-1-git-send-email-vapier@gentoo.org
State Accepted
Commit 4827d067dde99409c6e5b1c0bbbd8dff88db3cd5
Delegated to: Scott McNutt
Headers show

Commit Message

Mike Frysinger June 27, 2011, 3 a.m. UTC 
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>
---
v2
	- rebased onto master

 MAKEALL    |    4 +---
 Makefile   |   14 --------------
 boards.cfg |    1 +
 3 files changed, 2 insertions(+), 17 deletions(-)

Comments

Scott McNutt June 30, 2011, 1:30 p.m. UTC | #1 
Mike,

Applied to: git://git.denx.de/u-boot-nios.git 'next'

Thanks,
--Scott

Mike Frysinger wrote:
> 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>
> ---
> v2
> 	- rebased onto master
> 
>  MAKEALL    |    4 +---
>  Makefile   |   14 --------------
>  boards.cfg |    1 +
>  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 6bb5494..9925806 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
diff mbox

Patch

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 6bb5494..9925806 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