aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile5
-rw-r--r--core/Makefile6
2 files changed, 9 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 142e45c..962b209 100644
--- a/Makefile
+++ b/Makefile
@@ -104,6 +104,9 @@ clean:
git clean -dfx
git submodule foreach --recursive 'git clean -dfx'
+sandblast: clean
+ git submodule deinit -f .
+
sw:
cd sw; $(call DCH, -sw, software tools)
cd sw; debuild -S -uc -us
@@ -132,4 +135,4 @@ upload:
${RSYNC} --ignore-existing ${REPOSITORY}/ ${UPLOAD_URI}
${RSYNC} --delete --delete-delay ${REPOSITORY}/ ${UPLOAD_URI}
-.PHONY: all init clean sw rtl meta reprepro upload enchilada
+.PHONY: all init clean sw rtl meta reprepro upload enchilada sandblast
diff --git a/core/Makefile b/core/Makefile
index 55ce0ea..b6dc3ff 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -33,6 +33,10 @@
BUILD_DIR := platform/novena/eim/build
+# Build scripts need to know the build host's word size, sigh.
+
+WORD_SIZE := $(shell python -c 'from struct import pack; print len(pack("L", 0)) * 8')
+
# This business of patching files that are under revision control
# because we can't be bothered to generate a proper configuration file
# is kind of nasty.
@@ -40,7 +44,7 @@ BUILD_DIR := platform/novena/eim/build
all:
patch -p1 --forward <patches/01-config-cores.patch
touch platform/novena/common/rtl/ipcore/clkmgr_dcm.v
- cd ${BUILD_DIR}; $(MAKE)
+ cd ${BUILD_DIR}; $(MAKE) xil_env='. $$(isedir)/settings${WORD_SIZE}.sh'
patch -p1 --reverse <patches/01-config-cores.patch
clean: