From cc40657262f021048a7380d0613c368808cb8bd5 Mon Sep 17 00:00:00 2001
From: dam1n19 <dam1n19@soton.ac.uk>
Date: Wed, 5 Jul 2023 20:13:41 +0100
Subject: [PATCH] Updated FPGA Targets and fixed adp error
---
fpga/makefile | 2 +-
fpga/{makefile.fpga_targets => makefile.targets} | 0
makefile | 2 +-
3 files changed, 2 insertions(+), 2 deletions(-)
rename fpga/{makefile.fpga_targets => makefile.targets} (100%)
diff --git a/fpga/makefile b/fpga/makefile
index fb36daa..98890a6 100644
--- a/fpga/makefile
+++ b/fpga/makefile
@@ -10,7 +10,7 @@
#-----------------------------------------------------------------------------
# Get properties for FPGA Boards
-include $(SOCLABS_NANOSOC_TECH_DIR)/fpga/makefile.fpga_targets
+include $(SOCLABS_NANOSOC_TECH_DIR)/fpga/makefile.targets
# Vivado Options
VIVIADO_VERSION ?= 2021_1
diff --git a/fpga/makefile.fpga_targets b/fpga/makefile.targets
similarity index 100%
rename from fpga/makefile.fpga_targets
rename to fpga/makefile.targets
diff --git a/makefile b/makefile
index d39e564..b2d8184 100644
--- a/makefile
+++ b/makefile
@@ -79,7 +79,7 @@ SIM_DIR = $(SIM_TOP_DIR)/$(TESTNAME)
# Defaultly set to demo adp command file
DEFAULT_ADP_FILE = $(SIM_DIR)/adp.cmd
ADP_FILE ?= $(DEFAULT_ADP_FILE)
-ADP_PATH := $(shell realpath $(ADP_FILE))
+ADP_PATH := $(shell realpath $$(dirname $(ADP_FILE)))/$(shell basename $(ADP_FILE))
ADP_OPTIONS := -define ADP_FILE=\"$(ADP_PATH)\"
# Bootrom Parameters:
--
GitLab