asap7: fix ADDER_MAP_FILE default handling with ASAP7_USELVT and ASAP7_USESLVT

fixes #2990

Signed-off-by: Øyvind Harboe <[email protected]>

Author: oharboe

flow/platforms/asap7/config.mk

@@ -80,7 +80,6 @@ export DONT_USE_CELLS          += SDF* ICG*
 # Yosys mapping files
 export LATCH_MAP_FILE          = $(PLATFORM_DIR)/yoSys/cells_latch_R.v
 export CLKGATE_MAP_FILE        = $(PLATFORM_DIR)/yoSys/cells_clkgate_R.v
-export ADDER_MAP_FILE         ?= $(PLATFORM_DIR)/yoSys/cells_adders_R.v
 export SYNTH_MINIMUM_KEEP_SIZE       ?= 1000
 
 export ABC_DRIVER_CELL         = BUFx2_ASAP7_75t_R
@@ -153,6 +152,12 @@ export KLAYOUT_DRC_FILE = $(PLATFORM_DIR)/drc/asap7.lydrc
 # OpenRCX extRules
 export RCX_RULES               = $(PLATFORM_DIR)/rcx_patterns.rules
 
+ifeq ($(ASAP7_USELVT),)
+ifeq ($(ASAP7_USESLVT),)
+export ADDER_MAP_FILE         ?= $(PLATFORM_DIR)/yoSys/cells_adders_R.v
+endif
+endif
+
 # XS - defining function for using LVT
 ifeq ($(ASAP7_USELVT), 1)
    export TIEHI_CELL_AND_PORT     = TIEHIx1_ASAP7_75t_L H