From cd91e7201f87184bbcdc290edbf9e8f6c2559b00 Mon Sep 17 00:00:00 2001
From: Paul Selkirk <paul@psgd.org>
Date: Tue, 17 Jan 2017 23:48:40 -0500
Subject: Use the rewritten core_selector generator instead of the local fork.

---
 build/Makefile | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'build/Makefile')

diff --git a/build/Makefile b/build/Makefile
index d5d4871..9f46771 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -22,34 +22,35 @@ all:	$(project).bit
 
 # Build the default core_selector if it doesn't already exist.
 
-CONFIG          = .
+CONFIG          = $(CORE_TREE)/platform/common/config
+CONFIG_GEN      = $(CONFIG)/core_config.py -c $(CONFIG)/core.cfg -b alpha
 core_selector.v core_vfiles.mk:
-	$(CONFIG)/config.py
+	$(CONFIG_GEN)
 
 # Build some different configurations
 
 bare:
-	$(CONFIG)/config.py -s bare
+	$(CONFIG_GEN) -p bare
 	$(MAKE) project=$(project)_bare ucf=$(ucf)
 
 trng:
-	$(CONFIG)/config.py -s trng
+	$(CONFIG_GEN) -p trng
 	$(MAKE) project=$(project)_trng ucf=$(ucf)
 
 hash:
-	$(CONFIG)/config.py -s hash
+	$(CONFIG_GEN) -p hash
 	$(MAKE) project=$(project)_hash ucf=$(ucf)
 
 rsa:
-	$(CONFIG)/config.py -s rsa
+	$(CONFIG_GEN) -p rsa
 	$(MAKE) project=$(project)_rsa ucf=$(ucf)
 
 mkmif:
-	$(CONFIG)/config.py -s mkmif
+	$(CONFIG_GEN) -p mkmif
 	$(MAKE) project=$(project)_mkmif ucf=$(ucf)
 
 hsm:
-	$(CONFIG)/config.py -s hsm
+	$(CONFIG_GEN) -p hsm
 	$(MAKE) project=$(project)_hsm ucf=$(ucf)
 
 # Verilog files that always go with builds on this platform.
-- 
cgit v1.2.3