Fixed code compilation

flows/makefile.software

@@ -54,8 +54,8 @@ bootrom:
 	mkdir -p $(BOOTROM_BUILD_DIR)/verilog/ ;\
 	mkdir -p $(BOOTROM_BUILD_DIR)/bintxt/ ;\
 	python3 bootrom_gen.py -a $(BOOTROM_ADDRW) -i $(BOOTLOADER).hex -v $(BOOTROM_BUILD_DIR)/verilog/bootrom.v -b $(BOOTROM_BUILD_DIR)/bintxt/bootrom.bintxt )
-	mkdir -p $(SIM_DIR)/bootloader
-	cp $(BOOTROM_HEX)  $(SIM_DIR)/bootloader/$(BOOTLOADER).hex
+	mkdir -p $(SIM_TOP_DIR)/bootloader
+	cp $(BOOTROM_HEX)  $(SIM_TOP_DIR)/bootloader/$(BOOTLOADER).hex
 
 # Compile test code
 # Note : The use of ls after compile allows the computing server to sync up
@@ -130,7 +130,7 @@ debugtester:
 	ls > /dev/null ;\
 	echo Copy $(DEBUGTESTER)_le.hex ;\
 	if [ -e  $(DEBUGTESTER)_le.hex ] ; then \
-	  cp $(DEBUGTESTER)_le.hex  $(SIM_DIR)/$(DEBUGTESTER)_le.hex ;\
+	  cp $(DEBUGTESTER)_le.hex  $(SIM_TOP_DIR)/debugtester/$(DEBUGTESTER)_le.hex ;\
 	else \
 	  while [ ! -e $(DEBUGTESTER)_le.hex ] ; do \
 	    echo Wait for hex file ...; \
@@ -138,14 +138,14 @@ debugtester:
 	    sleep 5 ; \
 	  done; \
 	  if [ -e  $(DEBUGTESTER)_le.hex ] ; then \
-	  	mkdir -p $(SIM_DIR) ;\
-	    cp $(DEBUGTESTER)_le.hex  $(SIM_DIR)/$(DEBUGTESTER)_le.hex ;\
+	  	mkdir -p $(SIM_TOP_DIR)/debugtester ;\
+	    cp $(DEBUGTESTER)_le.hex  $(SIM_TOP_DIR)/debugtester/$(DEBUGTESTER)_le.hex ;\
 	  fi ;\
 	fi ;\
 	echo Copy $(DEBUGTESTER)_be.hex ;\
 	if [ -e  $(DEBUGTESTER)_be.hex ] ; then \
-	  	mkdir -p $(SIM_DIR) ;\
-	  cp $(DEBUGTESTER)_be.hex  $(SIM_DIR)/$(DEBUGTESTER)_be.hex ;\
+	  	mkdir -p $(SIM_TOP_DIR)/debugtester ;\
+	  cp $(DEBUGTESTER)_be.hex  $(SIM_TOP_DIR)/debugtester/$(DEBUGTESTER)_be.hex ;\
 	else \
 	  while [ ! -e $(DEBUGTESTER)_be.hex ] ; do \
 	    echo Wait for hex file ...;\
@@ -153,14 +153,14 @@ debugtester:
 	    sleep 5 ; \
 	  done; \
 	  if [ -e  $(DEBUGTESTER)_be.hex ] ; then \
-	    cp $(DEBUGTESTER)_be.hex  $(SIM_DIR)/$(DEBUGTESTER)_be.hex ;\
+	    cp $(DEBUGTESTER)_be.hex  $(SIM_TOP_DIR)/debugtester/$(DEBUGTESTER)_be.hex ;\
 	  fi ;\
 	fi ;\
 	if [ ! -e $(DEBUGTESTER)_le.hex ] && [ ! -e $(DEBUGTESTER)_be.hex ] ; then \
 	    echo Problem reading hex file ;\
 	    exit 1 ;\
 	fi ;\
-	cd $(SIM_DIR) )
+	cd $(SIM_TOP_DIR)/debugtester )
 
 # Compile all software including boot ROM
 compile_all_code: bootrom debugtester
@@ -169,7 +169,7 @@ compile_all_code: bootrom debugtester
 	  echo Removing old image.hex ;\
 	  rm -f image.hex  ;\
 	  $(MAKE) testcode TESTNAME=$$thistest;\
-	  if [ -e $(SIM_DIR)/$$thistest/image.hex ] ; then \
+	  if [ -e $(SIM_TOP_DIR)/$$thistest/image.hex ] ; then \
             echo OK    - image.hex     created for test $$thistest ;\
 	  else \
 	    echo ERROR - image.hex NOT created for test $$thistest ;\

makefile

@@ -115,4 +115,4 @@ gen_defs:
 	
 # Remove RTL compile files, log files, software compile files
 clean : clean_all_code
-	@rm -rf $(SIM_DIR)
\ No newline at end of file
+	@rm -rf $(SIM_TOP_DIR)
\ No newline at end of file