Skip to content

Commit 2cb1921

Browse files
committed
new: proper python env setup, using yowasp under mingw in place of oss-cad
1 parent 4aaa51d commit 2cb1921

File tree

84 files changed

+316
-215
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+316
-215
lines changed

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ else()
162162
install(TARGETS silice RUNTIME DESTINATION bin/)
163163
install(TARGETS libsilice ARCHIVE DESTINATION bin/)
164164
install(PROGRAMS bin/silice-make.py DESTINATION bin/)
165+
install(PROGRAMS bin/silice-make.sh DESTINATION bin/)
165166
install(PROGRAMS bin/report-cycles.py DESTINATION bin/)
166167
install(FILES projects/ice-v/CPUs/ice-v.si DESTINATION share/silice/projects/ice-v/CPUs/)
167168
install(FILES projects/ice-v/CPUs/ice-v-dual.si DESTINATION share/silice/projects/ice-v/CPUs/)

GetStarted_Windows.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ The prompt should look like this (note the MinGW64 label in purple):
1818

1919
Then, from the prompt, enter the Silice directory and type: `./get_started_mingw64.sh`.
2020

21-
> **Note:** The script downloads necessary MinGW packages, compiles and installs Silice using standard paths (`/usr/local/bin` and `/usr/local/shared/silice`) as well as downloads and sets up the [oss-cad-suite](https://github.com/YosysHQ/oss-cad-suite-build) FPGA toolchain in `/usr/local/shared/silice`, adding a line in ` ~/.bashrc` to set environment variables.
21+
> **Note:** The script downloads necessary MinGW packages, compiles and installs Silice using standard paths (`/usr/local/bin` and `/usr/local/shared/silice`) and sets up the [YoWASP](https://yowasp.org/) FPGA toolchain in `/usr/local/shared/silice`, adding a line in ` ~/.bashrc` to set environment variables.
2222
2323
Open a new MinGW64 prompt to start using Silice.
2424

compile_silice_linux.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@ sudo make -j$(nproc) install
2525
cd ..
2626
cd ..
2727

28-
echo -e "\nInstalling python packages for building designs\n"
29-
pip3 install --break-system-packages --upgrade termcolor
30-
pip3 install --break-system-packages --upgrade edalize
31-
3228
echo " "
3329
echo " "
3430
echo "======================================"

compile_silice_mingw64.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,7 @@ mkdir BUILD
77
cd BUILD
88

99
echo -e "\nInstalling compilation packages for building Silice\n"
10-
pacman -S --noconfirm --needed unzip wget perl ${MINGW_PACKAGE_PREFIX}-cmake ${MINGW_PACKAGE_PREFIX}-gcc ${MINGW_PACKAGE_PREFIX}-make ${MINGW_PACKAGE_PREFIX}-python3 ${MINGW_PACKAGE_PREFIX}-python-pip ${MINGW_PACKAGE_PREFIX}-freeglut
11-
12-
echo -e "\nInstalling python packages for building designs\n"
13-
pip install termcolor
14-
pip install edalize
10+
pacman -S --noconfirm --needed unzip wget perl ${MINGW_PACKAGE_PREFIX}-cmake ${MINGW_PACKAGE_PREFIX}-gcc ${MINGW_PACKAGE_PREFIX}-make ${MINGW_PACKAGE_PREFIX}-python3 ${MINGW_PACKAGE_PREFIX}-python-pip ${MINGW_PACKAGE_PREFIX}-freeglut ${MINGW_PACKAGE_PREFIX}-python-termcolor
1511

1612
echo -e "\nDownloading JDK (for building only, not required afterwards)\n"
1713
wget -c https://download.java.net/java/GA/jdk14.0.1/664493ef4a6946b186ff29eb326336a2/7/GPL/openjdk-14.0.1_windows-x64_bin.zip

frameworks/boards/icebreaker/board.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@
2222
{"set" : "parallel_screen", "define" : "PARALLEL_SCREEN=1"}
2323
],
2424
"builders": [
25+
{
26+
"builder" : "shell",
27+
"command" : "icebreaker.sh",
28+
"description": "Custom shell scripts using yosys and nextpnr"
29+
},
2530
{
2631
"builder" : "edalize",
2732
"description": "Build using Edalize",
@@ -37,11 +42,6 @@
3742
"bitstream" : "build.bin",
3843
"constraints": [{"name": "icebreaker.pcf", "file_type": "PCF"}],
3944
"program": [{"cmd" : "iceprog", "args" : "build.bin"}]
40-
},
41-
{
42-
"builder" : "shell",
43-
"command" : "icebreaker.sh",
44-
"description": "Custom shell scripts using yosys and nextpnr"
4545
}
4646
]
4747
}

frameworks/boards/icebreaker/icebreaker.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,5 @@ if [[ ! -z "${NO_PROGRAM}" ]]; then
5252
exit
5353
fi
5454

55-
iceprog build.bin
55+
# iceprog build.bin
56+
openFPGALoader -b ice40_generic build.bin

frameworks/boards/icestick/board.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@
1616
{"set" : "pmod_qqspi", "define" : "PMOD_QQSPI=1"}
1717
],
1818
"builders": [
19+
{
20+
"builder" : "shell",
21+
"command" : "icestick.sh",
22+
"description": "Custom shell scripts using yosys and nextpnr"
23+
},
1924
{
2025
"builder" : "edalize",
2126
"description": "Build using Edalize",
@@ -31,11 +36,6 @@
3136
"constraints": [{"name": "icestick.pcf", "file_type": "PCF"}],
3237
"program": [{"cmd" : "iceprog", "args" : "build.bin"}]
3338
},
34-
{
35-
"builder" : "shell",
36-
"command" : "icestick.sh",
37-
"description": "Custom shell scripts using yosys and nextpnr"
38-
},
3939
{
4040
"builder" : "yowasp",
4141
"command" : "icestick.py",

frameworks/boards/icestick/icestick.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,5 @@ else
5050
icepack build.asc build.bin
5151
fi
5252

53-
iceprog build.bin
53+
# iceprog build.bin
54+
openFPGALoader -b ice40_generic build.bin

frameworks/boards/littlebee/littlebee.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ rm build*
3838
silice --frameworks_dir $FRAMEWORKS_DIR -f $FRAMEWORK_FILE -o build.v $1 "${@:2}"
3939
yosys -p "read_verilog -sv build.v" -p "synth_gowin -json build.json -top top"
4040

41-
pip install apycula
42-
4341
nextpnr-gowin --json build.json --write outbuild.json --device GW1NR-UV9QN881C6/I5 --cst $BOARD_DIR/littlebee.cst
4442
gowin_pack -d GW1N-9 -o pack.fs outbuild.json
4543
dos2unix pack.fs

frameworks/boards/orangecrab/board.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@
99
{"set" : "feather", "define" : "FEATHER=1"}
1010
],
1111
"builders": [
12+
{
13+
"builder" : "shell",
14+
"command" : "orangecrab.sh",
15+
"description": "Custom shell scripts using yosys and nextpnr"
16+
},
1217
{
1318
"builder" : "edalize",
1419
"description": "Build using Edalize",
@@ -30,11 +35,6 @@
3035
{"cmd" : "dfu-suffix", "args" : "-v 1209 -p 5af0 -a build.dfu"},
3136
{"cmd" : "dfu-util", "args" : "-D build.dfu"}
3237
]
33-
},
34-
{
35-
"builder" : "shell",
36-
"command" : "orangecrab.sh",
37-
"description": "Custom shell scripts using yosys and nextpnr"
3838
}
3939
]
4040
}

0 commit comments

Comments
 (0)