Skip to contentSkip to conversation

nios2: remove EP1C20, EP1S10, EP1S40 boards

PATCH New Thomas Chou 2 participants 6 messages Apr 21, 2010 – May 28, 2010 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 nios2: remove EP1C20, EP1S10, EP1S40 boards

The example configuration files of nios2-generic board can generated binary to run on the EP1C20, EP1S10, and EP1S40 boards. So the three boards can be removed.

With nios2-generic approach, the fpga parameter header file can be generated from hardware designs using tools. Porting u-boot for nios2 boards is simplified. Vendors can supply their fpga parameter file or patches to add a new nios2-generic board instance. There is no need to include other boards support for nios2 in the u-boot mainline.

---
 MAINTAINERS                   |    3 -
 MAKEALL                       |    3 -
 Makefile                      |    9 --
 board/altera/ep1c20/Makefile  |   55 -----------
 board/altera/ep1c20/config.mk |   31 ------
 board/altera/ep1c20/ep1c20.c  |   52 ----------
 board/altera/ep1s10/Makefile  |   55 -----------
 board/altera/ep1s10/config.mk |   31 ------
 board/altera/ep1s10/ep1s10.c  |   52 ----------
 board/altera/ep1s40/Makefile  |   55 -----------
 board/altera/ep1s40/config.mk |   31 ------
 board/altera/ep1s40/ep1s40.c  |   47 ---------
 include/configs/EP1C20.h      |  214 -----------------------------------------
 include/configs/EP1S10.h      |  207 ---------------------------------------
 include/configs/EP1S40.h      |  207 ---------------------------------------
 15 files changed, 0 insertions(+), 1052 deletions(-)
 delete mode 100644 board/altera/ep1c20/Makefile
 delete mode 100644 board/altera/ep1c20/config.mk
 delete mode 100644 board/altera/ep1c20/ep1c20.c
 delete mode 100644 board/altera/ep1s10/Makefile
 delete mode 100644 board/altera/ep1s10/config.mk
 delete mode 100644 board/altera/ep1s10/ep1s10.c
 delete mode 100644 board/altera/ep1s40/Makefile
 delete mode 100644 board/altera/ep1s40/config.mk
 delete mode 100644 board/altera/ep1s40/ep1s40.c
 delete mode 100644 include/configs/EP1C20.h
 delete mode 100644 include/configs/EP1S10.h
 delete mode 100644 include/configs/EP1S40.h
MAINTAINERS +0 -3
index 46e051b..bc9fad1 100644
@@ -855,9 +855,6 @@ Scott McNutt <[email protected]>
 
 	PCI5441		Nios-II
 	PK1C20		Nios-II
-	EP1C20		Nios-II
-	EP1S10		Nios-II
-	EP1S40		Nios-II
 	nios2-generic	Nios-II
 
 #########################################################################
MAKEALL +0 -3
index 216b89b..90bfd09 100755
@@ -819,9 +819,6 @@ LIST_nios="			\
 #########################################################################
 
 LIST_nios2="		\
-	EP1C20		\
-	EP1S10		\
-	EP1S40		\
 	PCI5441		\
 	PK1C20		\
 	nios2-generic	\
Makefile +0 -9
index af6e1ee..3802b17 100644
@@ -3523,15 +3523,6 @@ DK1S10_config:	unconfig
 ## Nios-II
 #########################################################################
 
-EP1C20_config : unconfig
-	@$(MKCONFIG)  EP1C20 nios2 nios2 ep1c20 altera
-
-EP1S10_config : unconfig
-	@$(MKCONFIG)  EP1S10 nios2 nios2 ep1s10 altera
-
-EP1S40_config : unconfig
-	@$(MKCONFIG)  EP1S40 nios2 nios2 ep1s40 altera
-
 PK1C20_config : unconfig
 	@$(MKCONFIG)  PK1C20 nios2 nios2 pk1c20 psyent
 
board/altera/ep1c20/Makefile deleted +0 -55

55 lines not on this page · raw message

board/altera/ep1c20/config.mk deleted +0 -31
deleted file mode 100644
index dab2740..0000000
@@ -1,31 +0,0 @@
-#
-# (C) Copyright 2005, Psyent Corporation <www.psyent.com>
-# Scott McNutt <[email protected]>
-#
-# See file CREDITS for list of people who contributed to this
-# project.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-# MA 02111-1307 USA
-#
-
-TEXT_BASE = 0x01fc0000
-
-PLATFORM_CPPFLAGS += -mno-hw-div -mno-hw-mul
-PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/$(VENDOR)/include
-
-ifeq ($(debug),1)
-PLATFORM_CPPFLAGS += -DDEBUG
-endif
board/altera/ep1c20/ep1c20.c deleted +0 -52

52 lines not on this page · raw message

board/altera/ep1s10/Makefile deleted +0 -55

55 lines not on this page · raw message

board/altera/ep1s10/config.mk deleted +0 -31
deleted file mode 100644
index dab2740..0000000
@@ -1,31 +0,0 @@
-#
-# (C) Copyright 2005, Psyent Corporation <www.psyent.com>
-# Scott McNutt <[email protected]>
-#
-# See file CREDITS for list of people who contributed to this
-# project.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-# MA 02111-1307 USA
-#
-
-TEXT_BASE = 0x01fc0000
-
-PLATFORM_CPPFLAGS += -mno-hw-div -mno-hw-mul
-PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/$(VENDOR)/include
-
-ifeq ($(debug),1)
-PLATFORM_CPPFLAGS += -DDEBUG
-endif
board/altera/ep1s10/ep1s10.c deleted +0 -52

52 lines not on this page · raw message

board/altera/ep1s40/Makefile deleted +0 -55

55 lines not on this page · raw message

board/altera/ep1s40/config.mk deleted +0 -31
deleted file mode 100644
index dab2740..0000000
@@ -1,31 +0,0 @@
-#
-# (C) Copyright 2005, Psyent Corporation <www.psyent.com>
-# Scott McNutt <[email protected]>
-#
-# See file CREDITS for list of people who contributed to this
-# project.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-# MA 02111-1307 USA
-#
-
-TEXT_BASE = 0x01fc0000
-
-PLATFORM_CPPFLAGS += -mno-hw-div -mno-hw-mul
-PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/$(VENDOR)/include
-
-ifeq ($(debug),1)
-PLATFORM_CPPFLAGS += -DDEBUG
-endif
board/altera/ep1s40/ep1s40.c deleted +0 -47

47 lines not on this page · raw message

include/configs/EP1C20.h deleted +0 -214

214 lines not on this page · raw message

include/configs/EP1S10.h deleted +0 -207

207 lines not on this page · raw message

include/configs/EP1S40.h deleted +0 -207

207 lines not on this page · raw message

Signature · 1 line
1.6.6.1
#1 lore raw

PATCH 1/1 nios2: remove EP1C20, EP1S10, EP1S40 boards

Hi Thomas,

Quoted 6 lines · Thomas Chou

The example configuration files of nios2-generic board can generated binary to run on the EP1C20, EP1S10, and EP1S40 boards. So the three boards can be removed.

With nios2-generic approach, the fpga parameter header file can be generated from hardware designs using tools. Porting u-boot for

What tools are you referring to?

Quoted 2 lines

nios2 boards is simplified. Vendors can supply their fpga parameter file or patches to add a new nios2-generic board instance. There is

Support for several Altera nios2 boards has been available in u-boot for at least four years. To date, this vendor has offered no support whatsoever, either through patches, files, consultation or otherwise.

Is there any reason you believe this is likely to change?

Quoted 2 lines

no need to include other boards support for nios2 in the u-boot mainline.

I'm not convinced that this is true.

Regards,
--Scott

#2 lore raw

PATCH 1/1 nios2: remove EP1C20, EP1S10, EP1S40 boards

Hi Scott,

Quoted 5 lines · Scott McNutt
Quoted 2 lines

With nios2-generic approach, the fpga parameter header file can be generated from hardware designs using tools. Porting u-boot for

What tools are you referring to?

There are two tools.

1. sopc-create-header-files

It is included in altera design suite v8.0 or later. I used this in the initial version of nios2-generic board.

2. sopc-create-config-files

The script is available at

http://sopc.et.ntust.edu.tw/?p=toolchain-build.git;
a=blob_plain;f=tools/sopc-create-config-files;hb=HEAD

I wrote this to generate unified u-boot header files, while I was discussing with Michal Simek. He liked this approach and I got his Acked-by of this patch.

Quoted 6 lines

Support for several Altera nios2 boards has been available in u-boot for at least four years. To date, this vendor has offered no support whatsoever, either through patches, files, consultation or otherwise.

Is there any reason you believe this is likely to change?

We really appreciate your work. But these boards are getting obsolete, and there are more new boards unsupported. We cannot add every board, and a generic approach should be taken as Michal suggested. We, (you, I , the community and Altera), should work together to offer a better solution.

The binary generated with the nios2-generic target should work on these three boards. I tested on EP1C20 and I believe it will work on the other two. These boards are still supported, just under a different name.

Quoted 5 lines
Quoted 2 lines

no need to include other boards support for nios2 in the u-boot mainline.

I'm not convinced that this is true.

Michal's work on microblaze-generic already proved this.

Best regards,
Thomas

#3 lore raw

PATCH 1/1 nios2: remove EP1C20, EP1S10, EP1S40 boards

Hi Thomas,

Quoted 11 lines · Thomas Chou
Quoted 4 lines
Quoted 2 lines

With nios2-generic approach, the fpga parameter header file can be generated from hardware designs using tools. Porting u-boot for

What tools are you referring to?

2. sopc-create-config-files

The script is available at

http://sopc.et.ntust.edu.tw/?p=toolchain-build.git;
a=blob_plain;f=tools/sopc-create-config-files;hb=HEAD

Ok ... GPL ... very nice! This addresses several of my big concerns.

Quoted 4 lines

We cannot add every board,
and a generic approach should be taken as Michal suggested. We, (you, I , the community and Altera), should work together to offer a better solution.

Agreed. And please realize that I think the "generic approach" is a great way to proceed. I listed my concerns in an earlier response to Dalon. The availability of your GPL-ed script addresses most of them.

Quoted 3 lines

The binary generated with the nios2-generic target should work on these three boards. I tested on EP1C20 and I believe it will work on the other two. These boards are still supported, just under a different name.

I tested on the 1c20 this evening as well ... works fine. I will test on the 2c35 board tomorrow. I'd like to get a positive confirmation WRT the 1S10 and 1S40 before applying this patch.

Quoted 5 lines
Quoted 4 lines
Quoted 2 lines

no need to include other boards support for nios2 in the u-boot mainline.

I'm not convinced that this is true.

Michal's work on microblaze-generic already proved this.

Michal proved the concept ... and the microblaze implementation (many thanks for your contributions Michal). I'd like to _know_ that nothing is broken before we remove existing code -- I don't want to leave anyone high and dry. I've been in such situations ... it's no fun.

I'll apply the generic board patch to the nios 'next' branch, but I'd like to hold off on blowing away those other board trees until we get a chance to test the generic board on the actual targets. Fair enough?

Thanks for your efforts.

Regards,
--Scott

#4 lore raw

PATCH 1/1 nios2: remove EP1C20, EP1S10, EP1S40 boards

Quoted 4 lines · Scott McNutt

I tested on the 1c20 this evening as well ... works fine. I will test on the 2c35 board tomorrow. I'd like to get a positive confirmation WRT the 1S10 and 1S40 before applying this patch.

Great! Please also check epcs/spi flash on EP1C20.

1. apply this patch, [PATCH] spi_flash: support old STMicro parts with RES

2. add the following to board/altera/nios2-generic/custom_fpga.h

/* epcs_controller.epcs_control_port is a
altera_avalon_epcs_flash_controller */
#define CONFIG_SYS_SPI_BASE 0x82100200
#define CONFIG_ALTERA_SPI
#define CONFIG_CMD_SPI
#define CONFIG_CMD_SF
#define CONFIG_SF_DEFAULT_SPEED 30000000
#define CONFIG_SPI_FLASH
#define CONFIG_SPI_FLASH_STMICRO

3.
sf probe 0
sf read/write

Quoted 6 lines

I'll apply the generic board patch to the nios 'next' branch, but I'd like to hold off on blowing away those other board trees until we get a chance to test the generic board on the actual targets. Fair enough?

OK.

Cheers,
Thomas

#5 lore raw

PATCH 1/1 nios2: remove EP1C20, EP1S10, EP1S40 boards

In reply to Scott McNutt
Quoted 3 lines · Scott McNutt

I tested on the 1c20 this evening as well ... works fine. I will test on the 2c35 board tomorrow. I'd like to get a positive confirmation WRT the 1S10 and 1S40 before applying this patch.

Hi Scott,

Please follow up this patch.

Best regards,
Thomas