nios2: rename board nios2-generic to 3c120_devboard

Rename board nios2-generic to 3c120_devboard. Since nios2 is converted to driver model and device tree control of u-boot, the nios2-generic board directory is removed. We can rename the board back to a real board name. Now the boards maintained in u-boot mainline are the same as Linux kernel, namely 3c120 and 10m50.

---
 configs/3c120_defconfig          |  27 ++++++++++
 configs/nios2-generic_defconfig  |  27 ----------
 doc/README.nios2                 |   8 +--
 include/configs/3c120_devboard.h | 107 +++++++++++++++++++++++++++++++++++++++
 include/configs/nios2-generic.h  | 107 ---------------------------------------
 5 files changed, 138 insertions(+), 138 deletions(-)
 create mode 100644 configs/3c120_defconfig
 delete mode 100644 configs/nios2-generic_defconfig
 create mode 100644 include/configs/3c120_devboard.h
 delete mode 100644 include/configs/nios2-generic.h

new file mode 100644
index 0000000..736119e
@@ -0,0 +1,27 @@
+CONFIG_NIOS2=y
+CONFIG_SYS_CONFIG_NAME="3c120_devboard"
+CONFIG_DM_SERIAL=y
+CONFIG_DM_GPIO=y
+CONFIG_DEFAULT_DEVICE_TREE="3c120_devboard"
+CONFIG_HUSH_PARSER=y
+CONFIG_CMD_CPU=y
+# CONFIG_CMD_BOOTD is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_ITEST is not set
+CONFIG_CMD_DHCP=y
+# CONFIG_CMD_NFS is not set
+CONFIG_CMD_PING=y
+CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_ALTERA_PIO=y
+CONFIG_MISC=y
+CONFIG_ALTERA_SYSID=y
+CONFIG_MTD=y
+CONFIG_CFI_FLASH=y
+CONFIG_DM_ETH=y
+CONFIG_ALTERA_TSE=y
+CONFIG_ALTERA_JTAG_UART=y
+CONFIG_ALTERA_JTAG_UART_BYPASS=y
+CONFIG_TIMER=y
+CONFIG_ALTERA_TIMER=y

deleted file mode 100644
index 0a6de6f..0000000
@@ -1,27 +0,0 @@
-CONFIG_NIOS2=y
-CONFIG_SYS_CONFIG_NAME="nios2-generic"
-CONFIG_DM_SERIAL=y
-CONFIG_DM_GPIO=y
-CONFIG_DEFAULT_DEVICE_TREE="3c120_devboard"
-CONFIG_HUSH_PARSER=y
-CONFIG_CMD_CPU=y
-# CONFIG_CMD_BOOTD is not set
-# CONFIG_CMD_IMLS is not set
-# CONFIG_CMD_XIMG is not set
-# CONFIG_CMD_FPGA is not set
-# CONFIG_CMD_ITEST is not set
-CONFIG_CMD_DHCP=y
-# CONFIG_CMD_NFS is not set
-CONFIG_CMD_PING=y
-CONFIG_NET_RANDOM_ETHADDR=y
-CONFIG_ALTERA_PIO=y
-CONFIG_MISC=y
-CONFIG_ALTERA_SYSID=y
-CONFIG_MTD=y
-CONFIG_CFI_FLASH=y
-CONFIG_DM_ETH=y
-CONFIG_ALTERA_TSE=y
-CONFIG_ALTERA_JTAG_UART=y
-CONFIG_ALTERA_JTAG_UART_BYPASS=y
-CONFIG_TIMER=y
-CONFIG_ALTERA_TIMER=y

index 2dab7d1..a33c4e8 100644
@@ -45,9 +45,9 @@ the sequence of these devices, like this,
 	};
 
 Next, you will need a default config file. You may start with
-nios2-generic_defconfig, modify the options and save it.
+3c120_defconfig, modify the options and save it.
 
-$ make nios2-generic_defconfig
+$ make 3c120_defconfig
 $ make menuconfig
 $ make savedefconfig
 $ cp defconfig configs/mysystem_defconfig

@@ -72,9 +72,9 @@ copies all the u-boot-dtb.bin, not just u-boot.bin.
 binary. This is handy for development, eg, using gdb or nios2-download.
 
 The last thing, legacy board header file describes those config options
-not covered in Kconfig yet. You may copy it from nios2-generic.h.
+not covered in Kconfig yet. You may copy it from 3c120_devboard.h.
 
-$ cp include/configs/nios2-generic.h include/configs/mysystem.h
+$ cp include/configs/3c120_devboard.h include/configs/mysystem.h
 
 Please change the SDRAM base and size to match your board. The base
 should be cached virtual address, for Nios II with MMU it is 0xCxxx_xxxx

2.5.0

Add 3c120 and 10m50 devboards MAINTAINERS

---
 board/altera/nios2/MAINTAINERS | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 board/altera/nios2/MAINTAINERS

new file mode 100644
index 0000000..aff618b
@@ -0,0 +1,13 @@
+3C120 DEVBOARD
+M:	Thomas Chou <[email protected]>
+S:	Maintained
+F:	arch/nios2/dts/3c120_devboard.dts
+F:	configs/3c120_defconfig
+F:	include/configs/3c120_devboard.h
+
+10M50 DEVBOARD
+M:	Thomas Chou <[email protected]>
+S:	Maintained
+F:	arch/nios2/dts/10m50_devboard.dts
+F:	configs/10m50_defconfig
+F:	include/configs/10m50_devboard.h

2.5.0

Next time, try git format-patch -M -C , this will generate much more reviewable patch.

Best regards,
Marek Vasut

Rename board nios2-generic to 3c120_devboard. Since nios2 is converted to driver model and device tree control of u-boot, the nios2-generic board directory is removed. We can rename the board back to a real board name. Now the boards maintained in u-boot mainline are the same as Linux kernel, namely 3c120 and 10m50.

---
v2
use git format-patch -M -C as suggested by Marek.

 configs/{nios2-generic_defconfig => 3c120_defconfig}  | 2 +-
 doc/README.nios2                                      | 8 ++++----
 include/configs/{nios2-generic.h => 3c120_devboard.h} | 0
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename configs/{nios2-generic_defconfig => 3c120_defconfig} (93%)
 rename include/configs/{nios2-generic.h => 3c120_devboard.h} (100%)

similarity index 93%
rename from configs/nios2-generic_defconfig
rename to configs/3c120_defconfig
index 0a6de6f..736119e 100644
@@ -1,5 +1,5 @@
 CONFIG_NIOS2=y
-CONFIG_SYS_CONFIG_NAME="nios2-generic"
+CONFIG_SYS_CONFIG_NAME="3c120_devboard"
 CONFIG_DM_SERIAL=y
 CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="3c120_devboard"

index 2dab7d1..a33c4e8 100644
@@ -45,9 +45,9 @@ the sequence of these devices, like this,
 	};
 
 Next, you will need a default config file. You may start with
-nios2-generic_defconfig, modify the options and save it.
+3c120_defconfig, modify the options and save it.
 
-$ make nios2-generic_defconfig
+$ make 3c120_defconfig
 $ make menuconfig
 $ make savedefconfig
 $ cp defconfig configs/mysystem_defconfig

@@ -72,9 +72,9 @@ copies all the u-boot-dtb.bin, not just u-boot.bin.
 binary. This is handy for development, eg, using gdb or nios2-download.
 
 The last thing, legacy board header file describes those config options
-not covered in Kconfig yet. You may copy it from nios2-generic.h.
+not covered in Kconfig yet. You may copy it from 3c120_devboard.h.
 
-$ cp include/configs/nios2-generic.h include/configs/mysystem.h
+$ cp include/configs/3c120_devboard.h include/configs/mysystem.h
 
 Please change the SDRAM base and size to match your board. The base
 should be cached virtual address, for Nios II with MMU it is 0xCxxx_xxxx

similarity index 100%
rename from include/configs/nios2-generic.h
rename to include/configs/3c120_devboard.h

2.5.0

Add 3c120 and 10m50 devboards MAINTAINERS

---
 board/altera/nios2/MAINTAINERS | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 board/altera/nios2/MAINTAINERS

new file mode 100644
index 0000000..aff618b
@@ -0,0 +1,13 @@
+3C120 DEVBOARD
+M:	Thomas Chou <[email protected]>
+S:	Maintained
+F:	arch/nios2/dts/3c120_devboard.dts
+F:	configs/3c120_defconfig
+F:	include/configs/3c120_devboard.h
+
+10M50 DEVBOARD
+M:	Thomas Chou <[email protected]>
+S:	Maintained
+F:	arch/nios2/dts/10m50_devboard.dts
+F:	configs/10m50_defconfig
+F:	include/configs/10m50_devboard.h

2.5.0

Heh, much better :-)

Obviously,

Thanks!

Best regards,
Marek Vasut

Rename board nios2-generic to 3c120_devboard. Since nios2 is converted to driver model and device tree control of u-boot, the nios2-generic board directory is removed. We can rename the board back to a real board name. Now the boards maintained in u-boot mainline are the same as Linux kernel, namely 3c120 and 10m50.

---
v2
use git format-patch -M -C as suggested by Marek.
v3
split README.nios2 to another patch.

 configs/{nios2-generic_defconfig => 3c120_defconfig}  | 2 +-
 include/configs/{nios2-generic.h => 3c120_devboard.h} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename configs/{nios2-generic_defconfig => 3c120_defconfig} (93%)
 rename include/configs/{nios2-generic.h => 3c120_devboard.h} (100%)

similarity index 93%
rename from configs/nios2-generic_defconfig
rename to configs/3c120_defconfig
index 0a6de6f..736119e 100644
@@ -1,5 +1,5 @@
 CONFIG_NIOS2=y
-CONFIG_SYS_CONFIG_NAME="nios2-generic"
+CONFIG_SYS_CONFIG_NAME="3c120_devboard"
 CONFIG_DM_SERIAL=y
 CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="3c120_devboard"

similarity index 100%
rename from include/configs/nios2-generic.h
rename to include/configs/3c120_devboard.h

2.5.0

The 10m50 devboard becomes the new golden reference design of Nios II Linux. So change README.nios2 to use 10m50 as template.

---
v3
use 10m50 as template.

 doc/README.nios2 | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

index 2dab7d1..46c704e 100644
@@ -30,12 +30,12 @@ http://www.alterawiki.com/wiki/Sopc2dts
 $ java -jar sopc2dts.jar --force-altr -i mysystem.sopcinfo -o mysystem.dts
 
 You will need to add additional properties to the dts. Please find an
-example at, arch/nios2/dts/3c120_devboard.dts.
+example at, arch/nios2/dts/10m50_devboard.dts.
 
 1. Add "stdout-path=..." property with your serial path to the chosen
 node, like this,
 	chosen {
-		stdout-path = &jtag_uart;
+		stdout-path = &uart_0;
 	};
 
 2. If you use SPI/EPCS or I2C, you will need to add aliases to number

@@ -45,9 +45,9 @@ the sequence of these devices, like this,
 	};
 
 Next, you will need a default config file. You may start with
-nios2-generic_defconfig, modify the options and save it.
+10m50_defconfig, modify the options and save it.
 
-$ make nios2-generic_defconfig
+$ make 10m50_defconfig
 $ make menuconfig
 $ make savedefconfig
 $ cp defconfig configs/mysystem_defconfig

@@ -72,15 +72,15 @@ copies all the u-boot-dtb.bin, not just u-boot.bin.
 binary. This is handy for development, eg, using gdb or nios2-download.
 
 The last thing, legacy board header file describes those config options
-not covered in Kconfig yet. You may copy it from nios2-generic.h.
+not covered in Kconfig yet. You may copy it from 10m50_devboard.h.
 
-$ cp include/configs/nios2-generic.h include/configs/mysystem.h
+$ cp include/configs/10m50_devboard.h include/configs/mysystem.h
 
 Please change the SDRAM base and size to match your board. The base
 should be cached virtual address, for Nios II with MMU it is 0xCxxx_xxxx
 to 0xDxxx_xxxx.
 
-#define CONFIG_SYS_SDRAM_BASE		0xD0000000
+#define CONFIG_SYS_SDRAM_BASE		0xc8000000
 #define CONFIG_SYS_SDRAM_SIZE		0x08000000
 
 You will need to change the environment variables location and setting,

2.5.0

Add 3c120 and 10m50 devboards MAINTAINERS

---
 board/altera/nios2/MAINTAINERS | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 board/altera/nios2/MAINTAINERS

new file mode 100644
index 0000000..aff618b
@@ -0,0 +1,13 @@
+3C120 DEVBOARD
+M:	Thomas Chou <[email protected]>
+S:	Maintained
+F:	arch/nios2/dts/3c120_devboard.dts
+F:	configs/3c120_defconfig
+F:	include/configs/3c120_devboard.h
+
+10M50 DEVBOARD
+M:	Thomas Chou <[email protected]>
+S:	Maintained
+F:	arch/nios2/dts/10m50_devboard.dts
+F:	configs/10m50_defconfig
+F:	include/configs/10m50_devboard.h

2.5.0

All is good with this series.

And thanks for all your good work, it's amazing!

Best regards,
Marek Vasut

Hi Marek,

Thanks a lot for your constant help and reviews, too. The work on nios2 for the v2016.01 release is almost done. I will send a PR to Tom tomorrow.

Now is the fun time for buildman. I fetched some toolchains with buildman, and realized that it is better to copy the toolchains from the download directory to somewhere like /toolchains, eg,

$ mv /home/sjg/.buildman-toolchains/gcc-4.5.1-nolibc/or32-linux /toolchains/

so that they can be detected correctly later.

I still miss some toolchains, like bfin. I can not find them on the internet. I will need to search my old HDDs. However, most others works. Do you have better results?

List of available toolchains (35):
aarch64 : /toolchains/aarch64-linux/bin/aarch64-linux-gcc
alpha : /toolchains/alpha-linux/bin/alpha-linux-gcc
am33_2.0 : /toolchains/am33_2.0-linux/bin/am33_2.0-linux-gcc
arm :
/toolchains/arm-unknown-linux-gnueabi/bin/arm-unknown-linux-gnueabi-gcc
avr : /usr/bin/avr-gcc
avr32 : /toolchains/avr32-linux/bin/avr32-linux-gcc
bfin : /toolchains/bfin-uclinux/bin/bfin-uclinux-gcc
c89 : /usr/bin/c89-gcc
c99 : /usr/bin/c99-gcc
cris : /toolchains/cris-linux/bin/cris-linux-gcc
crisv32 : /toolchains/crisv32-linux/bin/crisv32-linux-gcc
frv : /toolchains/frv-linux/bin/frv-linux-gcc
h8300 : /toolchains/h8300-elf/bin/h8300-elf-gcc
hppa : /toolchains/hppa-linux/bin/hppa-linux-gcc
hppa64 : /toolchains/hppa64-linux/bin/hppa64-linux-gcc
i386 : /toolchains/i386-linux/bin/i386-linux-gcc
ia64 : /toolchains/ia64-linux/bin/ia64-linux-gcc
m32r : /toolchains/m32r-linux/bin/m32r-linux-gcc
m68k : /toolchains/m68k-linux/bin/m68k-linux-gcc
microblaze: /toolchains/microblaze-linux/bin/microblaze-linux-gcc
mips : /toolchains/mips-linux/bin/mips-linux-gcc
mips64 : /toolchains/mips64-linux/bin/mips64-linux-gcc
nds32le : /toolchains/nds32le-linux-glibc-v1/bin/nds32le-linux-gcc
nios2 : /opt/sourceryg++-2015.05/bin/nios2-linux-gnu-gcc
or32 : /toolchains/or32-linux/bin/or32-linux-gcc
powerpc : /toolchains/powerpc-linux/bin/powerpc-linux-gcc
powerpc64 : /toolchains/powerpc64-linux/bin/powerpc64-linux-gcc
ppc64le : /toolchains/ppc64le-linux/bin/ppc64le-linux-gcc
s390x : /toolchains/s390x-linux/bin/s390x-linux-gcc
sandbox : /usr/bin/gcc
sh4 : /toolchains/sh4-linux/bin/sh4-linux-gcc
sparc : /toolchains/sparc-linux/bin/sparc-linux-gcc
sparc64 : /toolchains/sparc64-linux/bin/sparc64-linux-gcc
tilegx : /toolchains/tilegx-linux/bin/tilegx-linux-gcc
x86_64 : /usr/bin/x86_64-linux-gnu-gcc

$ ./tools/buildman/buildman -b master -s
boards.cfg is up to date. Nothing to do.
Summary of 15 commits for 1067 boards (8 threads, 1 job per thread)
01: ARM64: zynqmp: Sync zynq_sdhci_init() declaration
   blackfin:  +   cm-bf561 blackstamp bf537-minotaur bct-brettl2 
cm-bf527 bf506f-ezkit ip04 bf527-sdp pr1 bf609-ezkit bf537-stamp 
bf527-ezkit-v2 cm-bf537e tcm-bf518 cm-bf537u bf527-ezkit cm-bf533 
bf533-ezkit ibf-dsp561 bf537-pnav bf537-srv1 cm-bf548 bf538f-ezkit 
bf548-ezkit bf525-ucr2 blackvme tcm-bf537 bf533-stamp bf518f-ezbrd 
bf527-ad7160-eval bf526-ezbrd bf561-ezkit br4
    aarch64:  +   hikey xilinx_zynqmp_ep
      avr32:  +   atngw100mkii grasshopper atstk1002 atngw100
    powerpc:  +   TQM834x katmai
    sandbox:  +   sandbox
         sh:  +   sh7753evb rsk7269 rsk7264 shmin ms7720se mpr2 
sh7785lcr_32bit sh7785lcr rsk7203
      nios2:  +   10m50 3c120
        arm:  +   chromebook_jerry firefly-rk3288 x600

Best regards,
Thomas

Hi!

Cool!

I gave up on buildman. I want some builder where I can stop the builds if something goes wrong, but instead of this, buildman spawns multiple processes somewhere on my machine at random and I have no control over that. I'd like to reevaluate buildman eventually, but now I don't have the time or interest to dig in it.

Hi Marek,

I'd use "killall python" on another terminal to stop the builder. I setup it in around an hour including download toolchains from kernel.org.

1. Create ~/.buildman from the template in buildman/README

# Buildman settings file

[toolchain]
root: /
rest: /toolchains/*
eldk: /opt/eldk-4.2
arm: /opt/linaro/gcc-linaro-arm-linux-gnueabihf-4.8-2013.08_linux
aarch64: /opt/linaro/gcc-linaro-aarch64-none-elf-4.8-2013.10_linux

[toolchain-alias]
x86: i386
blackfin: bfin
sh: sh4
nds32: nds32le
openrisc: or32

2. Fetch the toolchains from kernel.org

$ for i in aarch64 arm avr32 i386 m68k microblaze mips or32 powerpc sh4 
sparc sparc64
do
./tools/buildman/buildman --fetch-arch $i
done
$ mv ~/.buildman-toolchains/*/* /toolchains/

# arc:
https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases
# blackfin: http://sourceforge.net/projects/adi-toolchain/files/
# nds32: http://osdk.andestech.com/packages/
# nios2: https://sourcery.mentor.com/GNUToolchain/subscription42545
# sh: http://sourcery.mentor.com/public/gnu_toolchain/sh-linux-gnu

nds32: http://osdk.andestech.com/packages/nds32le-linux-glibc-v1.tgz

Best regards,
Thomas

I absolutelly don't want to do killall python, it'd bring down much more than this buildman ;-)

OK, so can I use it in some blocking way ?

How do I for example build board "foo" and obtain the result of the build?

Best regards,
Marek Vasut

Hi Marek,

It does depend. On my desktop, there is no other python running as user. I would suggest that a "kill" option could be added to buildman.

What do you mean by "some blocking way"?

To build a board "foo",

$ ./tools/buildman/buildman foo

If you want binary, eg u-boot-dtb.bin, you can add "-k" flag.

You may find such usage at the last section of buildman/README, "How to change from MAKEALL".

Best regards,
Thomas

Hi!

I finally got buildman operational, it's pretty nice. Thanks :)

Best regards,
Marek Vasut

Hi Marek,

I look at sourceforge again. And the bfin toolchains is back.

Best regards,
Thomas

Hopefully they don't come with some additional ad-ware :-)

Best regards,
Marek Vasut