From 761d9d9229f9c1aa5420a12c5d3e4c2aab53bb11 Mon Sep 17 00:00:00 2001
From: Keith Rothman <537074+litghost@users.noreply.github.com>
Date: Wed, 17 Feb 2021 18:08:52 -0800
Subject: Correct some bugs in the create_bba Makefile.

Also add debug_test target to debug archcheck.

Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
---
 fpga_interchange/examples/create_bba/Makefile | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'fpga_interchange/examples/create_bba')

diff --git a/fpga_interchange/examples/create_bba/Makefile b/fpga_interchange/examples/create_bba/Makefile
index 3033daca..ffbc3103 100644
--- a/fpga_interchange/examples/create_bba/Makefile
+++ b/fpga_interchange/examples/create_bba/Makefile
@@ -30,7 +30,7 @@ include ../common.mk
 
 .DELETE_ON_ERROR:
 
-.PHONY: all chipdb
+.PHONY: all chipdb test debug_test
 
 all: chipdb
 
@@ -66,7 +66,7 @@ $(NEXTPNR_PATH)/build/bba/bbasm: | $(NEXTPNR_PATH)/build
 	cd $(NEXTPNR_PATH)/build && cmake -DARCH=fpga_interchange ..
 	make -j -C $(NEXTPNR_PATH)/build
 
-$(NEXTPNR_PATH)/fpga_interchange/chipdb.bba: build/.setup
+build/nextpnr/fpga_interchange/chipdb.bba: build/.setup
 	mkdir -p build/nextpnr/fpga_interchange
 	source build/env/bin/activate && \
 		cd build/python-fpga-interchange/ && \
@@ -76,7 +76,7 @@ $(NEXTPNR_PATH)/fpga_interchange/chipdb.bba: build/.setup
 		RAPIDWRIGHT_PATH=$(RAPIDWRIGHT_PATH) \
 		INTERCHANGE_PATH=$(INTERCHANGE_PATH)
 
-$(BBA_PATH): $(NEXTPNR_PATH)/build/bba/bbasm $(NEXTPNR_PATH)/fpga_interchange/chipdb.bba
+$(BBA_PATH): $(NEXTPNR_PATH)/build/bba/bbasm build/nextpnr/fpga_interchange/chipdb.bba
 	$(NEXTPNR_PATH)/build/bba/bbasm -l build/nextpnr/fpga_interchange/chipdb.bba $(BBA_PATH)
 
 chipdb: $(BBA_PATH)
@@ -87,5 +87,11 @@ test: chipdb
 		--package csg324 \
 		--test
 
+debug_test: chipdb
+	gdb --args $(NEXTPNR_PATH)/build/nextpnr-fpga_interchange \
+		--chipdb $(BBA_PATH) \
+		--package csg324 \
+		--test
+
 clean:
 	rm -rf build
-- 
cgit v1.2.3


From cd8297f54d71a5c9f47efab45b3cc93aea86d4e5 Mon Sep 17 00:00:00 2001
From: Keith Rothman <537074+litghost@users.noreply.github.com>
Date: Fri, 19 Feb 2021 09:46:27 -0800
Subject: Move RapidWright git URI back to upstream.

Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
---
 fpga_interchange/examples/create_bba/Makefile | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'fpga_interchange/examples/create_bba')

diff --git a/fpga_interchange/examples/create_bba/Makefile b/fpga_interchange/examples/create_bba/Makefile
index ffbc3103..c29bfa82 100644
--- a/fpga_interchange/examples/create_bba/Makefile
+++ b/fpga_interchange/examples/create_bba/Makefile
@@ -38,11 +38,7 @@ build:
 	mkdir build
 
 build/RapidWright: | build
-	# FIXME: Update URL / branch as fixes are merged upstream and / or
-	# interchange branch on Xilinx/RapidWright is merged to master branch.
-	#
-	#cd build && git clone -b interchange https://github.com/Xilinx/RapidWright.git
-	cd build && git clone -b move_strlist https://github.com/litghost/RapidWright.git
+	cd build && git clone https://github.com/Xilinx/RapidWright.git
 
 build/env: | build
 	python3 -mvenv build/env
-- 
cgit v1.2.3