From f84cdc7e6bbeb335ceb266ad1d76610e4e56ef9b Mon Sep 17 00:00:00 2001
From: Jens Ahrensfeld <jens@jayfield.org>
Date: Thu, 18 Mar 2021 16:34:29 +0000
Subject: [PATCH] - automatically build netlist in /lib/MIPS/syn - fixed path
 to bootloader ROM

git-svn-id: http://moon:8086/svn/vhdl/trunk@1386 cc03376c-175c-47c8-b038-4cd826a8556b
---
 projects/mips_sys/ise101/mips_sys/Makefile           | 12 +++++++++---
 .../mips_sys/ise101/mips_sys/project/mips_sys.prj    |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/projects/mips_sys/ise101/mips_sys/Makefile b/projects/mips_sys/ise101/mips_sys/Makefile
index 6f89942..b33327f 100644
--- a/projects/mips_sys/ise101/mips_sys/Makefile
+++ b/projects/mips_sys/ise101/mips_sys/Makefile
@@ -1,12 +1,15 @@
 .PHONY: clean
 
-all:	netlist
+all:	bit
 
 PRJ := mips_sys
 PREQ := ./project/$(PRJ).prj ./project/$(PRJ).xst ./project/$(PRJ).lso
 DEVICE := "xc4vsx35-ff668-10"
 DIRS := ./xst/tmp
 
+NETLIST_DIR := ../../../../lib/CPUs/MIPS/syn/ise101
+NETLIST_MIPS_TOP := $(NETLIST_DIR)/mips_top.ngc
+
 netlist: $(PRJ).ngc
 translate: $(PRJ).ngd
 map: $(PRJ)_map.ncd
@@ -15,13 +18,16 @@ bit: $(PRJ).bit
 prom : $(PRJ).mcs
 timing : $(PRJ).twr
 
+$(NETLIST_MIPS_TOP):
+	make -C $(NETLIST_DIR)
+	
 # Netlist
 $(PRJ).ngc: $(DIRS) $(PREQ) ./project/$(PRJ).ucf
 	xst -intstyle xflow -ifn ./project/$(PRJ).xst
 
 # Translate
-$(PRJ).ngd: $(PRJ).ngc ./project/$(PRJ).ucf
-	ngdbuild -p $(DEVICE) -sd "../../../../lib/CPUs/MIPS/syn/ise101" -dd _ngo -nt timestamp -uc ./project/$(PRJ).ucf $(PRJ).ngc $(PRJ).ngd
+$(PRJ).ngd: $(NETLIST_MIPS_TOP) $(PRJ).ngc ./project/$(PRJ).ucf
+	ngdbuild -p $(DEVICE) -sd $(NETLIST_DIR) -dd _ngo -nt timestamp -uc ./project/$(PRJ).ucf $(PRJ).ngc $(PRJ).ngd
 
 # Map
 $(PRJ)_map.ncd: $(PRJ).ngd
diff --git a/projects/mips_sys/ise101/mips_sys/project/mips_sys.prj b/projects/mips_sys/ise101/mips_sys/project/mips_sys.prj
index 9bb4d09..da5b49c 100644
--- a/projects/mips_sys/ise101/mips_sys/project/mips_sys.prj
+++ b/projects/mips_sys/ise101/mips_sys/project/mips_sys.prj
@@ -1,5 +1,5 @@
 vhdl work "../../../../lib/CPUs/MIPS/src/core/mips_types.vhd"
-vhdl work "../../../../../../mips/src/bootloader/build/ml402/eb/bootloader_with_flash.elf.ROM_ld.vhd"
+vhdl work "../../src/bootloader_flash.ROM.vhd"
 vhdl work "../../../../lib/misc/utils_pkg.vhd"
 vhdl work "../../../../lib/misc/singleshot.vhd"
 vhdl work "../../../../lib/misc/rom_wb.vhd"