Skip to contentSkip to conversation

nios2: move generic config to boards.cfg

PATCH Superseded Mike Frysinger 3 participants 4 messages Jun 25, 2011 – Jun 30, 2011 Kbuild

lore
Share & tools
lore

Mike Frysinger

author
#0 lore raw

PATCH 1/1 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 ...

Signed-off-by Mike Frysinger <[email protected]>
---
 MAKEALL    |    4 +---
 Makefile   |   14 --------------
 boards.cfg |    1 +
 3 files changed, 2 insertions(+), 17 deletions(-)
MAKEALL +1 -3
index 13cd05a..8800394 100755
@@ -562,9 +562,7 @@ LIST_x86="$(boards_by_arch i386)"
 ## Nios-II Systems
 #########################################################################
 
-LIST_nios2="$(boards_by_arch nios2)
-	nios2-generic	\
-"
+LIST_nios2="$(boards_by_arch nios2)"
 
 #########################################################################
 ## MicroBlaze Systems
Makefile +0 -14
index 6f17e3b..bb1958a 100644
@@ -1099,20 +1099,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
-
 #########################################################################
 #########################################################################
boards.cfg +1 -0
index 2568e45..2e8c983 100644
@@ -247,6 +247,7 @@ vct_platinumavc              mips        mips        vct                 microna
 vct_platinumavc_small        mips        mips        vct                 micronas       -           vct:VCT_PLATINUMAVC,VCT_SMALL_IMAGE
 vct_platinumavc_onenand      mips        mips        vct                 micronas       -           vct:VCT_PLATINUMAVC,VCT_ONENAND
 vct_platinumavc_onenand_small mips       mips        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
Signature · 1 line
1.7.5.3
#1 lore raw

PATCH 1/1 nios2: move generic config to boards.cfg

Quoted 3 lines · Mike Frysinger

I can't build test this, but just looking at the config files written and it seems OK ...

Hi Mike,

Built and tested on nios2 board. Though the original patch doesn't apply to current head and might need rebase. Thanks.

Best regards,
Thomas

Tested-by Thomas Chou <[email protected]>
author
#2 lore raw

PATCH v2 1/1 nios2: move generic config to boards.cfg

In reply to Mike Frysinger

I can't build test this, but just looking at the config files written and it seems OK ...

Tested-by Thomas Chou <[email protected]>
Signed-off-by Mike Frysinger <[email protected]>

---
v2
- rebased onto master

 MAKEALL    |    4 +---
 Makefile   |   14 --------------
 boards.cfg |    1 +
 3 files changed, 2 insertions(+), 17 deletions(-)
MAKEALL +1 -3
index 51db13e..e37000f 100755
@@ -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
Makefile +0 -14
index 6bb5494..9925806 100644
@@ -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
-
 #########################################################################
 #########################################################################
boards.cfg +1 -0
index dfefc3f..ff6f7e4 100644
@@ -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
Signature · 1 line
1.7.5.3
#3 lore raw

PATCH v2 1/1 nios2: move generic config to boards.cfg

Mike,

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

Thanks,
--Scott

Quoted 66 lines · Mike Frysinger

I can't build test this, but just looking at the config files written and it seems OK ...

Tested-by Thomas Chou <[email protected]>
Signed-off-by Mike Frysinger <[email protected]>

---
v2
- rebased onto master

 MAKEALL    |    4 +---
 Makefile   |   14 --------------
 boards.cfg |    1 +
 3 files changed, 2 insertions(+), 17 deletions(-)
MAKEALL +1 -3
index 51db13e..e37000f 100755
@@ -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
Makefile +0 -14
index 6bb5494..9925806 100644
@@ -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
-
 #########################################################################
 #########################################################################
boards.cfg +1 -0
index dfefc3f..ff6f7e4 100644
@@ -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