Updated the OSU install for GF180MCU to match changes made to the

upstream repository.
RTimothyEdwards · Nov 8, 2022 · 3af1337 · 3af1337
1 parent 6bcdf1f
commit 3af1337
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.0.355
+1.0.356
diff --git a/gf180mcu/Makefile.in b/gf180mcu/Makefile.in
@@ -861,29 +861,29 @@ digital-osu-%:
 		-target ${STAGING_PATH}/${GF180MCU$*} \
 		-techlef lib/9T/tlef/gf180mcu_*_tech.lef \
 			rename=gf180mcu_osu_sc_9T.tlef \
-		-liberty char/techfiles/gf180mcu_9T_TT_3P3_25C*.lib \
+		-liberty lib/9T/lib/gf180mcu_9T_TT_3P3_25C*.lib \
 			rename=gf180mcu_osu_sc_9T__tt_025C_3v30 \
 		-verilog lib/9T/verilog/*.v \
 			rename=gf180mcu_osu_sc_9T \
 		-lef lib/9T/lef/*.lef \
-		-gds lib/9T/gds/*.gds compile-only \
-		-spice lib/9T/ngspice/*.spice compile-only \
-		-xschem lib/9T/schematics/*.sch \
+		-gds lib/9T/*/*.gds compile-only \
+		-spice lib/9T/*/*.spice compile-only \
+		-xschem lib/9T/*/*.sch \
 		-library digital gf180mcu_osu_sc_9T 2>&1 | \
 		tee -a ${GF180MCU$*}_make.log
 
 	${STAGE} -source ${GF180MCU_OSU_SC_PATH} \
 		-target ${STAGING_PATH}/${GF180MCU$*} \
 		-techlef lib/12T/tlef/gf180mcu_*_tech.lef \
 			rename=gf180mcu_osu_sc_12T.tlef \
-		-liberty char/techfiles/gf180mcu_12T_TT_3P3_25C*.lib \
+		-liberty lib/12T/lib/gf180mcu_12T_TT_3P3_25C*.lib \
 			rename=gf180mcu_osu_sc_12T__tt_025C_3v30 \
 		-verilog lib/12T/verilog/*.v \
 			rename=gf180mcu_osu_sc_12T \
 		-lef lib/12T/lef/*.lef \
-		-gds lib/12T/gds/*.gds compile-only \
-		-spice lib/12T/ngspice/*.spice compile-only \
-		-xschem lib/12T/schematics/*.sch \
+		-gds lib/12T/*/*.gds compile-only \
+		-spice lib/12T/*/*.spice compile-only \
+		-xschem lib/12T/*/*.sch \
 		-library digital gf180mcu_osu_sc_12T 2>&1 | \
 		tee -a ${GF180MCU$*}_make.log
 

diff --git a/sky130/netgen/sky130_setup.tcl b/sky130/netgen/sky130_setup.tcl
@@ -335,6 +335,10 @@ lappend devices sky130_fd_pr__npn_05v5_W1p00L1p00
 lappend devices sky130_fd_pr__npn_05v5_W1p00L2p00
 lappend devices sky130_fd_pr__pnp_05v5_W0p68L0p68
 lappend devices sky130_fd_pr__pnp_05v5_W3p40L3p40
+lappend devices sky130_fd_pr__rf_npn_05v5_W1p00L1p00
+lappend devices sky130_fd_pr__rf_npn_05v5_W1p00L2p00
+lappend devices sky130_fd_pr__rf_pnp_05v5_W0p68L0p68
+lappend devices sky130_fd_pr__rf_pnp_05v5_W3p40L3p40
 lappend devices sky130_fd_pr__npn_05v5
 lappend devices sky130_fd_pr__pnp_05v5
 lappend devices sky130_fd_pr__npn_11v0