Configure makefile vfiles list too.

1 files changed, 26 insertions, 62 deletions

diff --git a/eim/build/Makefile b/eim/build/Makefile
index badda45..baefa7f 100644
--- a/eim/build/Makefile
+++ b/eim/build/Makefile
@@ -1,67 +1,31 @@
-project = novena_eim
-vendor = xilinx
-family = spartan6
-part = xc6slx45csg324-3
-top_module = novena_top
-isedir = /opt/Xilinx/14.7/ISE_DS
-xil_env = . $(isedir)/settings64.sh
-ucf = ../ucf/novena_eim.ucf
+core_tree	:= $(abspath ../../../..)
+
+word_size	:= $(shell python -c 'from struct import pack; print len(pack("L", 0)) * 8')
+
+project		= novena_eim
+vendor		= xilinx
+family		= spartan6
+part		= xc6slx45csg324-3
+top_module	= novena_top
+isedir		= /opt/Xilinx/14.7/ISE_DS
+xil_env		= . $(isedir)/settings$(word_size).sh
+ucf		= ../ucf/novena_eim.ucf
 
 vfiles = \
-	../rtl/novena_eim.v \
-	../../common/rtl/novena_regs.v \
-	../../common/rtl/novena_clkmgr.v \
-	../../common/rtl/ipcore/clkmgr_dcm.v \
-	../../config/core_selector.v \
-	../../../../comm/eim/src/rtl/cdc_bus_pulse.v \
-	../../../../comm/eim/src/rtl/eim_arbiter_cdc.v \
-	../../../../comm/eim/src/rtl/eim_arbiter.v \
-	../../../../comm/eim/src/rtl/eim_da_phy.v \
-	../../../../comm/eim/src/rtl/eim_indicator.v \
-	../../../../comm/eim/src/rtl/eim_regs.v \
-	../../../../comm/eim/src/rtl/eim.v \
-	../../../../hash/sha1/src/rtl/sha1.v \
-	../../../../hash/sha1/src/rtl/sha1_core.v \
-	../../../../hash/sha1/src/rtl/sha1_w_mem.v \
-	../../../../hash/sha256/src/rtl/sha256.v \
-	../../../../hash/sha256/src/rtl/sha256_core.v \
-	../../../../hash/sha256/src/rtl/sha256_k_constants.v \
-	../../../../hash/sha256/src/rtl/sha256_w_mem.v \
-	../../../../hash/sha512/src/rtl/sha512.v \
-	../../../../hash/sha512/src/rtl/sha512_core.v \
-	../../../../hash/sha512/src/rtl/sha512_h_constants.v \
-	../../../../hash/sha512/src/rtl/sha512_k_constants.v \
-	../../../../hash/sha512/src/rtl/sha512_w_mem.v \
-	../../../../rng/avalanche_entropy/src/rtl/avalanche_entropy.v \
-	../../../../rng/avalanche_entropy/src/rtl/avalanche_entropy_core.v \
-	../../../../rng/rosc_entropy/src/rtl/rosc.v \
-	../../../../rng/rosc_entropy/src/rtl/rosc_entropy.v \
-	../../../../rng/rosc_entropy/src/rtl/rosc_entropy_core.v \
-	../../../../rng/trng/src/rtl/trng.v \
-	../../../../rng/trng/src/rtl/trng_csprng.v \
-	../../../../rng/trng/src/rtl/trng_csprng_fifo.v \
-	../../../../rng/trng/src/rtl/trng_mixer.v \
-	../../../../cipher/aes/src/rtl/aes.v \
-	../../../../cipher/aes/src/rtl/aes_core.v \
-	../../../../cipher/aes/src/rtl/aes_decipher_block.v \
-	../../../../cipher/aes/src/rtl/aes_encipher_block.v \
-	../../../../cipher/aes/src/rtl/aes_inv_sbox.v \
-	../../../../cipher/aes/src/rtl/aes_key_mem.v \
-	../../../../cipher/aes/src/rtl/aes_sbox.v \
-	../../../../cipher/chacha/src/rtl/chacha.v \
-	../../../../cipher/chacha/src/rtl/chacha_core.v \
-	../../../../cipher/chacha/src/rtl/chacha_qr.v \
-	../../../../math/modexps6/src/rtl/modexps6_adder64_carry32.v \
-	../../../../math/modexps6/src/rtl/modexps6_buffer_core.v \
-	../../../../math/modexps6/src/rtl/modexps6_buffer_user.v \
-	../../../../math/modexps6/src/rtl/modexps6_modinv32.v \
-	../../../../math/modexps6/src/rtl/modexps6_montgomery_coeff.v \
-	../../../../math/modexps6/src/rtl/modexps6_montgomery_multiplier.v \
-	../../../../math/modexps6/src/rtl/modexps6_top.v \
-	../../../../math/modexps6/src/rtl/modexps6_wrapper.v \
-	../../../../math/modexps6/src/rtl/ram_1rw_1ro_readfirst.v \
-	../../../../math/modexps6/src/rtl/ipcore/multiplier_s6.v \
-	../../../../math/modexps6/src/rtl/ipcore/subtractor_s6.v
+	$(core_tree)/platform/novena/eim/rtl/novena_eim.v \
+	$(core_tree)/platform/novena/common/rtl/novena_regs.v \
+	$(core_tree)/platform/novena/common/rtl/novena_clkmgr.v \
+	$(core_tree)/platform/novena/common/rtl/ipcore/clkmgr_dcm.v \
+	$(core_tree)/platform/novena/config/core_selector.v \
+	$(core_tree)/comm/eim/src/rtl/cdc_bus_pulse.v \
+	$(core_tree)/comm/eim/src/rtl/eim_arbiter_cdc.v \
+	$(core_tree)/comm/eim/src/rtl/eim_arbiter.v \
+	$(core_tree)/comm/eim/src/rtl/eim_da_phy.v \
+	$(core_tree)/comm/eim/src/rtl/eim_indicator.v \
+	$(core_tree)/comm/eim/src/rtl/eim_regs.v \
+	$(core_tree)/comm/eim/src/rtl/eim.v
+
+include $(core_tree)/platform/novena/config/core_vfiles.mk
 
 include xilinx.mk