Merge pull request #2968 from Pinata-Consulting/makefile-cleanup

macro: move macro code out of Makefile

Author: maliberty

flow/Makefile

@@ -188,10 +188,6 @@ ifneq ($(BLOCKS),)
   endif
 endif
 
-export RTLMP_RPT_DIR ?= $(OBJECTS_DIR)/rtlmp
-export RTLMP_RPT_FILE ?= partition.txt
-export RTLMP_BLOCKAGE_FILE ?= $(OBJECTS_DIR)/rtlmp/partition.txt.blockage
-
 #-------------------------------------------------------------------------------
 ifeq (,$(strip $(NUM_CORES)))
   # Linux (utility program)

flow/scripts/macro_place_util.tcl

@@ -1,6 +1,15 @@
 if {[find_macros] != ""} {
-# If wrappers defined replace macros with their wrapped version
-# # ----------------------------------------------------------------------------
+  if {![env_var_exists_and_non_empty RTLMP_RPT_DIR]} {
+    set ::env(RTLMP_RPT_DIR) "$::env(OBJECTS_DIR)/rtlmp"
+  }
+  if {![env_var_exists_and_non_empty RTLMP_RPT_FILE]} {
+    set ::env(RTLMP_RPT_FILE) "partition.txt"
+  }
+  if {![env_var_exists_and_non_empty RTLMP_BLOCKAGE_FILE]} {
+    set ::env(RTLMP_BLOCKAGE_FILE) "$::env(OBJECTS_DIR)/rtlmp/partition.txt.blockage"
+  }
+
+  # If wrappers defined replace macros with their wrapped version
   if {[env_var_exists_and_non_empty MACRO_WRAPPERS]} {
     source $::env(MACRO_WRAPPERS)