Skip to content

Commit 203ed61

Browse files
Bump oss-cad-suite toolchain (#291) to 20250211
We need some fixes in ghdl for more modern vhdl files such as ghdl/ghdl#2682 I've installed the new toolchain, we'll see how ci goes. We can walk this back as the old toolchain is still present on the build machine.
1 parent 5e7b0fe commit 203ed61

File tree

4 files changed

+7
-72
lines changed

4 files changed

+7
-72
lines changed

.github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ jobs:
8181
- name: Update pip reqs
8282
run : python3 -m pip install --upgrade -r tools/requirements.txt --break-system-packages
8383
- name: buck path
84-
run: echo "~/.cargo/bin:/opt/Xilinx/Vivado/2024.1/bin:/opt/oss-cad-suite-20240513/bin" >> "$GITHUB_PATH"
84+
run: echo "~/.cargo/bin:/opt/Xilinx/Vivado/2024.1/bin:/opt/oss-cad-suite-20250211/bin" >> "$GITHUB_PATH"
8585
- name: Build cosmo_hp bitstream
8686
run: buck2 build //hdl/projects/cosmo_hp:cosmo_hp --show-output
8787
- uses: actions/upload-artifact@v4

BUILD.vars.gha

+6-6
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ bin = "/opt/bsc-2022.01/bin/bsc"
44
libdir = "/opt/bsc-2022.01/lib/"
55

66
[yosys]
7-
bin = "/opt/oss-cad-suite-20240513/bin/yosys"
8-
libdir = "/opt/oss-cad-suite-20240513/share/yosys"
7+
bin = "/opt/oss-cad-suite-20250211/bin/yosys"
8+
libdir = "/opt/oss-cad-suite-20250211/share/yosys"
99

1010
[nextpnr]
11-
ecp5 = "/opt/oss-cad-suite-20240513/bin/nextpnr-ecp5"
12-
ecp5_pack = "/opt/oss-cad-suite-20240513/bin/ecppack"
13-
ice40 = "/opt/oss-cad-suite-20240513/bin/nextpnr-ice40"
14-
ice40_pack = "/opt/oss-cad-suite-20240513/bin/icepack"
11+
ecp5 = "/opt/oss-cad-suite-20250211/bin/nextpnr-ecp5"
12+
ecp5_pack = "/opt/oss-cad-suite-20250211/bin/ecppack"
13+
ice40 = "/opt/oss-cad-suite-20250211/bin/nextpnr-ice40"
14+
ice40_pack = "/opt/oss-cad-suite-20250211/bin/icepack"

hdl/projects/psc/BUILD

-21
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
bluespec_verilog('IgnitionTargetPSC',
88
top = 'IgnitionTargetPSC.bsv',
99
modules = [
10-
'mkPSCRevAResetButton',
1110
'mkPSCRevBResetButton',
1211
'mkPSCRevBResetButtonNoPowerFaultMonitor',
1312
'mkPSCRevB',
@@ -17,26 +16,6 @@ bluespec_verilog('IgnitionTargetPSC',
1716
'//hdl/ip/bsv/ignition:TargetWrapper',
1817
])
1918

20-
yosys_design('ignition_target_psc_rev_a_reset_button_top',
21-
top_module = 'mkPSCRevAResetButton',
22-
sources = [
23-
':IgnitionTargetPSC#mkPSCRevAResetButton',
24-
'//vnd/bluespec:Verilog.v#Verilog.v',
25-
'../../ip/bsv/InitialReset.v',
26-
],
27-
deps = [
28-
':IgnitionTargetPSC',
29-
'//vnd/bluespec:Verilog.v',
30-
])
31-
32-
nextpnr_ice40_bitstream('ignition_target_psc_rev_a_reset_button',
33-
env = 'ignition_target',
34-
design = ':ignition_target_psc_rev_a_reset_button_top#' \
35-
'ignition_target_psc_rev_a_reset_button_top.json',
36-
deps = [
37-
':ignition_target_psc_rev_a_reset_button_top',
38-
])
39-
4019
# Rev B targets
4120

4221
yosys_design('ignition_target_psc_rev_b_reset_button_top',

hdl/projects/sidecar/ignition_target/BUILD

-44
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
bluespec_verilog('IgnitionTargetSidecar',
88
top = 'IgnitionTargetSidecar.bsv',
99
modules = [
10-
'mkSidecarRevATargetWithResetButton',
11-
'mkSidecarRevATargetWithPowerButton',
1210
'mkSidecarRevBTargetWithResetButton',
1311
'mkSidecarRevBTargetWithPowerButton',
1412
'mkSidecarRevBTarget',
@@ -18,48 +16,6 @@ bluespec_verilog('IgnitionTargetSidecar',
1816
'//hdl/ip/bsv/ignition:TargetWrapper',
1917
])
2018

21-
# Rev A targets
22-
23-
yosys_design('ignition_target_rev_a_reset_button_top',
24-
top_module = 'mkSidecarRevATargetWithResetButton',
25-
sources = [
26-
':IgnitionTargetSidecar#mkSidecarRevATargetWithResetButton',
27-
'//vnd/bluespec:Verilog.v#Verilog.v',
28-
'../../../ip/bsv/InitialReset.v',
29-
],
30-
deps = [
31-
':IgnitionTargetSidecar',
32-
'//vnd/bluespec:Verilog.v',
33-
])
34-
35-
nextpnr_ice40_bitstream('ignition_target_sidecar_rev_a_reset_button',
36-
env = 'ignition_target',
37-
design = ':ignition_target_rev_a_reset_button_top#' \
38-
'ignition_target_rev_a_reset_button_top.json',
39-
deps = [
40-
':ignition_target_rev_a_reset_button_top',
41-
])
42-
43-
yosys_design('ignition_target_rev_a_power_button_top',
44-
top_module = 'mkSidecarRevATargetWithPowerButton',
45-
sources = [
46-
':IgnitionTargetSidecar#mkSidecarRevATargetWithPowerButton',
47-
'//vnd/bluespec:Verilog.v#Verilog.v',
48-
'../../../ip/bsv/InitialReset.v',
49-
],
50-
deps = [
51-
':IgnitionTargetSidecar',
52-
'//vnd/bluespec:Verilog.v',
53-
])
54-
55-
nextpnr_ice40_bitstream('ignition_target_sidecar_rev_a_power_button',
56-
env = 'ignition_target',
57-
design = ':ignition_target_rev_a_power_button_top#' \
58-
'ignition_target_rev_a_power_button_top.json',
59-
deps = [
60-
':ignition_target_rev_a_power_button_top',
61-
])
62-
6319
# Rev B, C targets
6420

6521
yosys_design('ignition_target_rev_b_reset_button_top',

0 commit comments

Comments
 (0)