Added the user ID text block, copyright, and open source hardware
logo back into the layout (or maybe I never committed it before?).
Modified the compositor and fill generator scripts to use the GDS
created by "make ship" rather than attempting to do the same
process again.
diff --git a/mag/caravel.mag b/mag/caravel.mag
index 00a5d9a..627641d 100644
--- a/mag/caravel.mag
+++ b/mag/caravel.mag
@@ -80644,6 +80644,18 @@
rect 460640 6598 473160 19088
rect 515440 6598 527960 19088
rect 624040 6675 636580 19197
+use user_id_textblock user_id_textblock_0
+timestamp 1608324878
+transform 1 0 96272 0 1 6890
+box -656 1508 33720 10344
+use copyright_block copyright_block_0
+timestamp 1608325192
+transform 1 0 149582 0 1 16298
+box -262 -9464 35048 2764
+use open_source open_source_0 hexdigits
+timestamp 1608325192
+transform 1 0 205230 0 1 2174
+box 752 5164 29030 16242
use user_id_programming user_id_value ../maglef
timestamp 1609864636
transform 1 0 656624 0 1 80926
diff --git a/scripts/compositor.py b/scripts/compositor.py
index bbc13e2..6e0d67b 100755
--- a/scripts/compositor.py
+++ b/scripts/compositor.py
@@ -99,10 +99,11 @@
with open(magpath + '/compose_final.tcl', 'w') as ofile:
print('#!/bin/env wish', file=ofile)
print('drc off', file=ofile)
+ # print('gds read ../gds/user_project_wrapper', file=ofile)
+ # print('load ' + project + ' -dereference', file=ofile)
print('gds readonly true', file=ofile)
print('gds rescale false', file=ofile)
- print('gds read ../gds/user_project_wrapper', file=ofile)
- print('load ' + project + ' -dereference', file=ofile)
+ print('gds read ../gds/caravel', file=ofile)
print('select top cell', file=ofile)
# Ceate a cell to represent the generated fill. There are
diff --git a/scripts/generate_fill.py b/scripts/generate_fill.py
index b3d0d2b..cf09e5e 100755
--- a/scripts/generate_fill.py
+++ b/scripts/generate_fill.py
@@ -120,9 +120,12 @@
print('', file=ofile)
# Read the user project from GDS, as there is not necessarily a magic database file
# to go along with this.
- print('gds read ../gds/user_project_wrapper', file=ofile)
+ # print('gds read ../gds/user_project_wrapper', file=ofile)
# Now read the full caravel project
- print('load ' + project + ' -dereference', file=ofile)
+ # print('load ' + project + ' -dereference', file=ofile)
+ print('gds readonly true', file=ofile)
+ print('gds rescale false', file=ofile)
+ print('gds read ../gds/caravel', file=ofile)
print('select top cell', file=ofile)
print('expand', file=ofile)
print('cif ostyle wafflefill(tiled)', file=ofile)
