Skip to content

Commit c7243b2

Browse files
committed
fix build file
1 parent d9aaf51 commit c7243b2

File tree

2 files changed

+11
-13
lines changed

2 files changed

+11
-13
lines changed

build.tcl

+3-8
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ if {$dev eq "mega60k"} {
2121
add_file -type verilog "src/m60k/pll_27.v"
2222
add_file -type verilog "src/m60k/pll_33.v"
2323
add_file -type verilog "src/m60k/pll_74.v"
24-
25-
set_option -output_base_name gbatang-m60k-${mcu}
2624
} elseif {$dev eq "mega138k"} {
2725
set_device GW5AST-LV138PG484AC1/I0 -device_version B
2826
add_file -type cst "src/m138k/m138k.cst"
@@ -32,8 +30,6 @@ if {$dev eq "mega60k"} {
3230
add_file -type verilog "src/m138k/pll_27.v"
3331
add_file -type verilog "src/m138k/pll_33.v"
3432
add_file -type verilog "src/m138k/pll_74.v"
35-
36-
set_option -output_base_name gbatang-m138k-${mcu}
3733
} elseif {$dev eq "mega138kpro"} {
3834
set_device GW5AST-LV138FPG676AC1/I0 -device_version B
3935
add_file -type cst "src/m138k/m138kpro.cst"
@@ -43,8 +39,6 @@ if {$dev eq "mega60k"} {
4339
add_file -type verilog "src/m138k/pll_27.v"
4440
add_file -type verilog "src/m138k/pll_33.v"
4541
add_file -type verilog "src/m138k/pll_74.v"
46-
47-
set_option -output_base_name gbatang-m138kpro-${mcu}
4842
} elseif {$dev eq "console60k"} {
4943
set_device GW5AT-LV60PG484AC1/I0 -device_version B
5044
add_file -type cst "src/console60k/gbatang.cst"
@@ -53,12 +47,13 @@ if {$dev eq "mega60k"} {
5347
add_file -type verilog "src/m60k/pll_27.v"
5448
add_file -type verilog "src/m60k/pll_33.v"
5549
add_file -type verilog "src/m60k/pll_74.v"
56-
57-
set_option -output_base_name gbatang-console60k-${mcu}
5850
} else {
5951
error "Unknown device $dev"
6052
}
6153

54+
set_option -output_base_name gbatang_${dev}
55+
56+
6257
if {$mcu eq "bl616"} {
6358
add_file -type verilog "src/iosys/iosys_bl616.v"
6459
add_file -type verilog "src/iosys/uart_fixed.v"

buildall.bat

+8-5
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,30 @@
22
@REM 'x REG unPlaced' problem:
33
@REM 1.9.11 placement algo 3 works
44

5-
set GWSH=\Gowin\Gowin_V1.9.10.03_x64\IDE\bin\gw_sh
5+
set GWSH=\Gowin\Gowin_V1.9.11_x64\IDE\bin\gw_sh
66

77
echo
88
echo "============ Building console60k ==============="
99
echo
1010
%GWSH% build.tcl console60k
11+
if %errorlevel% neq 0 exit /b %errorlevel%
1112

1213
echo
1314
echo "============ Building mega60k ==============="
1415
echo
1516
%GWSH% build.tcl mega60k
17+
if %errorlevel% neq 0 exit /b %errorlevel%
1618

1719
echo
1820
echo "============ Building mega138k ==============="
1921
echo
2022
%GWSH% build.tcl mega138k
23+
if %errorlevel% neq 0 exit /b %errorlevel%
2124

22-
echo
23-
echo "============ Building mega138k pro ==============="
24-
echo
25-
%GWSH% build.tcl mega138kpro
25+
@REM echo
26+
@REM echo "============ Building mega138k pro ==============="
27+
@REM echo
28+
@REM %GWSH% build.tcl mega138kpro
2629

2730
dir impl\pnr\*.fs
2831

0 commit comments

Comments
 (0)