github.com/wfjm.w11
1
0
Fork 0
mirror of https://github.com/wfjm/w11.git synced 2026-03-29 03:16:15 +00:00
Code Issues Releases Wiki Activity

cleanup tbrun setup, drop nexys4 and add nexys4d

Browse Source
This commit is contained in:
wfjm
2022-04-30 08:22:27 +02:00
parent 7ec5be2a30
commit a5640780d9
8 changed files with 37 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/ci.yml vendored
View File

@@ -1,4 +1,4 @@
# $Id: ci.yml 1227 2022-04-24 10:08:48Z mueller $
# $Id: ci.yml 1231 2022-04-28 08:40:50Z mueller $
# SPDX-License-Identifier: GPL-3.0-or-later
# Copyright 2022- by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
@@ -11,10 +11,10 @@ jobs:
fail-fast: false
matrix:
include:
- os: ubuntu-20.04 # Ub 20.4 && gcc
- os: ubuntu-20.04 # Ub 20.4 - gcc
cc: gcc
cxx: g++
- os: ubuntu-20.04 # Ub 40.4 && clang
- os: ubuntu-20.04 # Ub 20.4 - clang
cc: clang
cxx: clang++
env:

1
doc/CHANGELOG-w11a_V0.50-w11a_V0.60.md
View File

@@ -608,3 +608,4 @@ The version of several key tools and libraries changed:
- two complete system configurations with
- for a Digilent S3BOARD rtl/sys_gen/w11a/s3board/sys_w11a_s3
- for a Digilent Nexys2 rtl/sys_gen/w11a/nexys2/sys_w11a_n2
- see also [blog on w11](https://wfjm.github.io/blogs/w11/2010-06-21-yet-another-pdp11-in-fpga.html) and [blog on Opencores](https://wfjm.github.io/blogs/w11/2010-07-23-w11-on-opencores.html)

15
doc/CHANGELOG.md
View File

@@ -26,8 +26,11 @@ software or firmware builds or that the documentation is consistent.
The full set of tests is only run for tagged releases.
### Summary
- cleanup tbrun setup, drop nexys4 and add nexys4d ([see blog](https://wfjm.github.io/blogs/w11/2019-07-27-nexys4-obituary.html))
### New features
### Changes
- tools changes
- **/tbrun.yml: since nexys4 not longer available switch to nexys4d
### Bug Fixes
<!-- --------------------------------------------------------------------- -->
@@ -35,7 +38,7 @@ The full set of tests is only run for tagged releases.
## <a id="w11a_v0.791">2022-04-24: [w11a_V0.791](https://github.com/wfjm/w11/releases/tag/w11a_V0.791) - rev 1229(wfjm)</a>
### Summary
- drop Travis (now defunct)
- add preliminary GitHub Actions support
- add GitHub Actions support ([see blog](https://wfjm.github.io/blogs/w11/2022-04-24-ci-cd-workflow-now-github-actions-based.html))
- use Vivado 2020.1 as default
- use GHDL 2.0.0 as default
- use std=c++17 (requires gcc 7.3 or later)
@@ -111,7 +114,7 @@ The full set of tests is only run for tagged releases.
- add m9312 boot prom emulation
- add dz11 8 line serial port multiplexer
- update 211bsd system images (oskits)
- apply fpsim+tcsh patch (see [w11a blog 2017-06-06](https://wfjm.github.io/blogs/211bsd/2017-06-06-kernel-panic-here-doc-tcsh.html))
- apply fpsim+tcsh patch ([see blog](https://wfjm.github.io/blogs/211bsd/2017-06-06-kernel-panic-here-doc-tcsh.html))
- support dz11 lines
- update network setup
@@ -326,7 +329,7 @@ The full set of tests is only run for tagged releases.
### Summary
- add continuous integration support via [Travis CI](https://travis-ci.org),
add [project wfjm/w11](https://travis-ci.org/wfjm/w11), and setup
a `.travis.yml`.
a `.travis.yml` ([see blog](https://wfjm.github.io/blogs/w11/2018-09-16-travis-based-ci-cd-workflow.html)).
- use static source code analysis [Coverity Scan](https://scan.coverity.com),
add [project wfjm/w11](https://scan.coverity.com/projects/wfjm-w11).
The scans are manually uploaded, not automated via Travis (w11 is a `VHDL`
@@ -339,9 +342,9 @@ The full set of tests is only run for tagged releases.
- completely replace boost with std
- add KW11-P (programmable clock) to all w11 systems. It is usefull in test
benches (fast interrupt source) and enables on the long run to port the
2.10BSD kernel profiling code to 2.11BSD.
2.10BSD kernel profiling code to 2.11BSD ([see blog](https://wfjm.github.io/blogs/w11/2018-10-14-kw11-p-added.html))
- stay with Vivado 2017.2 as default tool, 2017.2 to 2018.2 exhibit much
longer build times for w11 designs (see [w11 blog posting](https://wfjm.github.io/blogs/w11/2018-09-01-vivado-2018.2-much-slower.html))
longer build times for w11 designs ([see blog](https://wfjm.github.io/blogs/w11/2018-09-01-vivado-2018.2-much-slower.html))
- the first Artix-7 designs for the nexys4 board where done in 2013 with
ISE 14.5, later with 14.7, simply because the early Vivado versions were
nice technology demonstrators, but didn't compile the w11 code base. That
@@ -733,7 +736,7 @@ The full set of tests is only run for tagged releases.
## <a id="w11a_v0.741">2016-12-23: [w11a_V0.741](https://github.com/wfjm/w11/releases/tag/w11a_V0.741) - rev 826(wfjm)</a>
### Summary
- moved w11 repository from OpenCores to GitHub
[wfjm/w11](https://github.com/wfjm/w11/)
[wfjm/w11](https://github.com/wfjm/w11/) ([see blog](https://wfjm.github.io/blogs/w11/2016-12-11-w11-moved-to-github.html))
- moved w11 project pages from OpenCores to GitHub-Pages
[wfjm.github.io/home/w11](https://wfjm.github.io/home/w11/)
- converted existing documentation from plain text to markdown

23
doc/INSTALL_quickstart.md
View File

@@ -85,7 +85,7 @@ full-featured [211bsd_rp](../tools/oskit/211bsd_rp/README.md) can be
used when more than 1024 kB memory is available, for systems with 512 to
1024 kB memory use the pruned down
[211bsd_rpmin](../tools/oskit/211bsd_rpmin/README.md).
For 2.11BSD with Ethernet, other OS and more details consult
For 2.11BSD with Ethernet, other OS, and more details consult
[w11a_os_guide](w11a_os_guide.md).
Key steps are
@@ -112,15 +112,15 @@ Key steps are
### <a id="tested">Concrete test run</a>
The recipe was tested
- system environment
- Kubuntu 16.04 LTS
- Vivado 2019.1
- on 2019-08-11
- Kubuntu 20.04 LTS (focal) with gcc 9.4.0
- Vivado 2020.1
- on 2022-04-29
- after commit [563e230](https://github.com/wfjm/w11/commit/563e230)
- after commit [7ec5be2a](https://github.com/wfjm/w11/commit/7ec5be2a)
cd $RETROBASE/tools/src
time make -j 4
# real 1m40.556s user 2m53.704s sys 0m14.668s
# real 3m5.530s user 5m9.533s sys 0m22.052s
- for design `nexys4d` for
[Nexys4 DDR](https://wfjm.github.io/home/w11/inst/boards.html#digi_nexys4d) or
@@ -129,9 +129,9 @@ The recipe was tested
cd $RETROBASE/rtl/sys_gen/w11a/nexys4d
time make sys_w11a_n4d.bit
# real 18m21.066s user 8m41.300s sys 0m53.416s
# real 21m40.918s user 10m39.529s sys 1m17.014s
time make sys_w11a_n4d.vconfig
# real 0m34.484s user 0m15.540s sys 0m1.660s
# real 0m35.288s user 0m21.578s sys 0m2.369s
- for oskit `211bsd_rp`
- in Linux terminal
@@ -145,7 +145,7 @@ The recipe was tested
# set board switches to SWI = 00000000 00101000
ti_w11 -tuD,12M,break,cts @211bsd_rp_boot.tcl
- in window `DL1vt100` hit `<ENTER>` to connect to backend, than see output
- in window `DL0 vt100` hit `<ENTER>` to connect to backend, than see output
and do required inputs as written in the
[README](../tools/oskit/211bsd_rp/README.md):
@@ -158,7 +158,10 @@ The recipe was tested
...
login: {root}
- feel free to explore also the second console in window `DL1 vt100`,
hit `<ENTER>` and start a 2nd session on the 2.11BSD system.
- when done with exploring 2.11BSD do proper system shutdown
- in 211bsd session type `shutdown -h now`
- in ti_w11 session wait for `CPU attention` and `H:cpu0` prompt,
- in `ti_w11` session wait for `CPU attention` and `H:cpu0` prompt,
than exit with `^D`.

7
rtl/sys_gen/tst_rlink/tbrun.yml
View File

@@ -1,14 +1,15 @@
# $Id: tbrun.yml 906 2017-06-04 21:59:13Z mueller $
# $Id: tbrun.yml 1231 2022-04-28 08:40:50Z mueller $
#
# Revision History:
# Date Rev Version Comment
# 2017-06-04 906 1.0.1 add cmoda7
# 2022-04-25 1231 1.2 drop nexys4; add nexys4d
# 2017-06-04 906 1.1 add cmoda7
# 2016-08-13 798 1.0 Initial version
#
- include: s3board/tb/tbrun.yml
- include: nexys2/tb/tbrun.yml
- include: nexys3/tb/tbrun.yml
- include: nexys4/tb/tbrun.yml
- include: nexys4d/tb/tbrun.yml
- include: basys3/tb/tbrun.yml
- include: arty/tb/tbrun.yml
- include: cmoda7/tb/tbrun.yml

5
rtl/sys_gen/tst_serloop/tbrun.yml
View File

@@ -1,10 +1,11 @@
# $Id: tbrun.yml 807 2016-09-17 07:49:26Z mueller $
# $Id: tbrun.yml 1231 2022-04-28 08:40:50Z mueller $
#
# Revision History:
# Date Rev Version Comment
# 2022-04-25 1231 1.1 drop nexys4,atlys; add nexys4d
# 2016-08-22 800 1.0 Initial version
#
- include: s3board/tb/tbrun.yml
- include: nexys2/tb/tbrun.yml
- include: nexys3/tb/tbrun.yml
- include: nexys4/tb/tbrun.yml
- include: nexys4d/tb/tbrun.yml

4
rtl/sys_gen/tst_sram/tbrun.yml
View File

@@ -1,7 +1,8 @@
# $Id: tbrun.yml 1103 2019-01-04 13:18:54Z mueller $
# $Id: tbrun.yml 1231 2022-04-28 08:40:50Z mueller $
#
# Revision History:
# Date Rev Version Comment
# 2022-04-25 1231 1.3 drop nexys4
# 2019-01-04 1103 1.2 add arty,nexys4d
# 2017-06-25 917 1.1 add cmoda7
# 2016-08-13 798 1.0 Initial version
@@ -10,6 +11,5 @@
- include: s3board/tb/tbrun.yml
- include: nexys2/tb/tbrun.yml
- include: nexys3/tb/tbrun.yml
- include: nexys4/tb/tbrun.yml
- include: nexys4d/tb/tbrun.yml
- include: cmoda7/tb/tbrun.yml

4
rtl/sys_gen/w11a/tbrun.yml
View File

@@ -1,7 +1,8 @@
# $Id: tbrun.yml 1224 2022-04-20 10:25:52Z mueller $
# $Id: tbrun.yml 1231 2022-04-28 08:40:50Z mueller $
#
# Revision History:
# Date Rev Version Comment
# 2022-04-25 1231 1.4 drop nexys4(dram),nexys4(bram)
# 2022-04-20 1224 1.3 drop artys7(dram)
# 2019-01-27 1107 1.2 add arty(dram),nexys4d(dram),artys7(dram)
# 2018-08-11 1038 1.1 add artys7(bram)
@@ -11,7 +12,6 @@
- include: s3board/tb/tbrun.yml
- include: nexys2/tb/tbrun.yml
- include: nexys3/tb/tbrun.yml
- include: nexys4/tb/tbrun.yml
- include: nexys4d/tb/tbrun.yml
- include: nexys4d_bram/tb/tbrun.yml
- include: basys3/tb/tbrun.yml