fixed bad merge

Signed-off-by: Jeff Ng <[email protected]>

Author: jeffng-or

flow/designs/gf180/uart-blocks/tapcell.tcl

@@ -1,13 +1,8 @@
-if {[info exists ::env(TAP_CELL_NAME)] && $::env(TAP_CELL_NAME) != "" &&
-    [info exists ::env(ENDCAP_CELL_NAME)] && $::env(ENDCAP_CELL_NAME) != ""} {
-    tapcell \
-	-endcap_cpp             "12" \
-	-distance               100 \
-	-tapcell_master         $::env(TAP_CELL_NAME) \
-	-endcap_master          $::env(ENDCAP_CELL_NAME) \
-	-halo_width_x $::env(MACRO_HALO_X) \
-	-halo_width_y $::env(MACRO_HALO_Y)
-} else {
-    puts "Skipping tapcell insertion since TAP_CELL_NAME and/or ENDCAP_CELL_NAME are not defined"
-}
+  tapcell \
+    -endcap_cpp             "12" \
+    -distance               100 \
+    -tapcell_master         $::env(TIE_CELL) \
+    -endcap_master          $::env(ENDCAP_CELL) \
+    -halo_width_x $::env(MACRO_HALO_X) \
+    -halo_width_y $::env(MACRO_HALO_Y)
 

flow/platforms/asap7/openRoad/tapcell.tcl

@@ -1,18 +1,13 @@
-if {[info exists ::env(TAP_CELL_NAME)] && $::env(TAP_CELL_NAME) != "" &&
-    [info exists ::env(ENDCAP_CELL_NAME)] && $::env(ENDCAP_CELL_NAME) != ""} {
-    puts "Tap and End Cap cell insertion"
-    puts "  TAP Cell          : $::env(TAP_CELL_NAME)"
-    puts "  ENDCAP Cell       : $::env(TAP_CELL_NAME)"
-    puts "  Halo Around Macro : $::env(MACRO_HALO_X) $::env(MACRO_HALO_Y)"
-    puts "  TAP Cell Distance : 25"
+puts "Tap and End Cap cell insertion"
+puts "  TAP Cell          : $::env(TAP_CELL_NAME)"
+puts "  ENDCAP Cell       : $::env(TAP_CELL_NAME)"
+puts "  Halo Around Macro : $::env(MACRO_HALO_X) $::env(MACRO_HALO_Y)"
+puts "  TAP Cell Distance : 25"
 
-    # allow user to set the halo around macro with MACRO_HALO_?
-    tapcell \
-	-distance 25 \
-	-tapcell_master "$::env(TAP_CELL_NAME)" \
-	-endcap_master "$::env(TAP_CELL_NAME)"  \
-	-halo_width_x $::env(MACRO_HALO_X) \
-	-halo_width_y $::env(MACRO_HALO_Y)
-} else {
-    puts "Skipping tapcell insertion since TAP_CELL_NAME and/or ENDCAP_CELL_NAME are not defined"
-}
+# allow user to set the halo around macro with MACRO_HALO_?
+tapcell \
+  -distance 25 \
+  -tapcell_master "$::env(TAP_CELL_NAME)" \
+  -endcap_master "$::env(TAP_CELL_NAME)"  \
+  -halo_width_x $::env(MACRO_HALO_X) \
+  -halo_width_y $::env(MACRO_HALO_Y)

flow/platforms/gf180/openROAD/tapcell.tcl

@@ -1,10 +1,5 @@
-if {[info exists ::env(TAP_CELL_NAME)] && $::env(TAP_CELL_NAME) != "" &&
-    [info exists ::env(ENDCAP_CELL_NAME)] && $::env(ENDCAP_CELL_NAME) != ""} {
-    tapcell \
-	-endcap_cpp             "12" \
-	-distance               100 \
-	-tapcell_master         $::env(TAP_CELL_NAME) \
-	-endcap_master          $::env(ENDCAP_CELL_NAME)
-} else {
-    puts "Skipping tapcell insertion since TAP_CELL_NAME and/or ENDCAP_CELL_NAME are not defined"
-}
+  tapcell \
+    -endcap_cpp             "12" \
+    -distance               100 \
+    -tapcell_master         $::env(TIE_CELL) \
+    -endcap_master          $::env(ENDCAP_CELL)