[U-Boot] [PATCH] 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 vapier@gentoo.org --- MAKEALL | 4 +--- Makefile | 14 -------------- boards.cfg | 1 + 3 files changed, 2 insertions(+), 17 deletions(-)
diff --git a/MAKEALL b/MAKEALL index 13cd05a..8800394 100755 --- a/MAKEALL +++ b/MAKEALL @@ -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 diff --git a/Makefile b/Makefile index 6f17e3b..bb1958a 100644 --- a/Makefile +++ b/Makefile @@ -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 - ######################################################################### #########################################################################
diff --git a/boards.cfg b/boards.cfg index 2568e45..2e8c983 100644 --- a/boards.cfg +++ b/boards.cfg @@ -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
On 06/25/2011 09:12 AM, Mike Frysinger wrote:
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 thomas@wytron.com.tw
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
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
participants (3)
-
Mike Frysinger -
Scott McNutt -
Thomas Chou