consolidate all write..file() into config.py and update zc706.py to follow artiq repo #260

morgan · 2023-09-07T16:46:13+08:00

morgan commented

2023-09-07 16:46:13 +08:00

Sumamary

write_csr_file(), write_mem_file() & write_rustc_cfg_file() from kasli_soc.py and zc706.py are moved to config.py
- refactor write_rustc_cfg_file() to use cpu_interface.get_rust_cfg
- zc706.py now auto generated has_CRS_core to its rustc_cfg file
following artiq repo, all self.rustc_cfg at zc706.py are replaced with self.config
zc706 rustc-cfg file check
- run python src/gateware/zc706.py -c build/rustc-cfg -V <variant> for zc706_nist_clock master, satellite & standalone
- vertified new rustc-cfg contains all the cfgs that the old cfg files have
kasli_soc rustc-cfg file check
- run python src/gateware/zc706.py -c build/rustc-cfg <variant>.json for kasli_soc master, satellite & standalone
- vertified the rustc-cfg has the same cfgs before patch
compilation check
- run nix build <variant> -L for kasli_soc master, satellite, standalone and all built successfully
- run nix build <variant> -L for zc706_nist_clock, zc706_nist_clock_master, zc706_nist_clock_satellite and all built successfully

## Sumamary - `write_csr_file()`, `write_mem_file()` & `write_rustc_cfg_file()` from `kasli_soc.py` and `zc706.py` are moved to `config.py` - refactor `write_rustc_cfg_file()` to use `cpu_interface.get_rust_cfg` - `zc706.py` now auto generated `has_CRS_core` to its rustc_cfg file - following artiq repo, all `self.rustc_cfg` at `zc706.py` are replaced with `self.config` - zc706 rustc-cfg file check - run `python src/gateware/zc706.py -c build/rustc-cfg -V <variant>` for zc706_nist_clock master, satellite & standalone - vertified new rustc-cfg contains all the cfgs that the old cfg files have - kasli_soc rustc-cfg file check - run `python src/gateware/zc706.py -c build/rustc-cfg <variant>.json` for kasli_soc master, satellite & standalone - vertified the rustc-cfg has the same cfgs before patch - compilation check - run `nix build <variant> -L` for kasli_soc master, satellite, standalone and all built successfully - run `nix build <variant> -L` for zc706_nist_clock, zc706_nist_clock_master, zc706_nist_clock_satellite and all built successfully

👍 1

morgan force-pushed zc_cfg_fix from b41b931ce5 to aa2009d49e

2023-09-07 16:47:58 +08:00

Compare

mwojcik commented

2023-09-07 16:50:53 +08:00

Now I'm thinking that since write_... functions are shared between zc706 and kasli-soc, they could be just extracted into e.g. config.py - but it's not a big deal if it isn't.

Now I'm thinking that since ``write_...`` functions are shared between zc706 and kasli-soc, they could be just extracted into e.g. ``config.py`` - but it's not a big deal if it isn't.

sb10q commented

2023-09-07 18:15:00 +08:00

they could be just extracted into e.g. config.py

Sounds good.

> they could be just extracted into e.g. config.py Sounds good.

morgan added 2 commits 2023-09-11 11:47:02 +08:00

consolidate all write..file() into config.py 4716d1a4c5

refactor write_rustc_cfg_file() 3807857423

morgan changed title from ~~zc706.py: replace self.rustc_cfg and change write_rustc_cfg_file() to follow artiq repo~~ to consolidate all `write..file()` into `config.py` and update `zc706.py` to follow artiq repo

2023-09-11 11:47:33 +08:00

sb10q merged commit b3856e879b into master

2023-09-11 11:48:19 +08:00

~~morgan referenced this pull request 2023-10-26 13:05:45 +08:00~~

release-7: fix zc706 satellite compilation warning #275

Sign in to join this conversation.

No reviewers