[Cryptech-Commits] [user/sra/novena-releng] 02/02: Clean up awful patch kludge and pull in updated sw/libhal/.gitignore so automated build won't leave a mess.

[git at cryptech.is]

This is an automated email from the git hooks/post-receive script.

sra at hactrn.net pushed a commit to branch master
in repository user/sra/novena-releng.

commit 8daafcd56cb16324af5f1cc06304f343f6b3627a
Author: Rob Austein <sra at hactrn.net>
Date:   Mon Dec 21 04:39:36 2015 -0500

    Clean up awful patch kludge and pull in updated sw/libhal/.gitignore
    so automated build won't leave a mess.
---
 Makefile                           |  2 +-
 core/Makefile                      |  7 -------
 core/patches/01-config-cores.patch | 27 ---------------------------
 sw/libhal                          |  2 +-
 4 files changed, 2 insertions(+), 36 deletions(-)

diff --git a/Makefile b/Makefile
index 962b209..024667e 100644
--- a/Makefile
+++ b/Makefile
@@ -121,7 +121,7 @@ meta:
 	cd meta; $(call DCH, , meta package)
 	cd meta; debuild -S -uc -us
 	cd meta; debuild -b -uc -us -aarmhf
-	
+
 
 reprepro: ${REPOSITORY}/conf/distributions ${REPOSITORY}/conf/options
 	umask ${REPO_UMASK}; for f in *.changes; do reprepro -b ${REPOSITORY} include ${CODENAME} $$f; done
diff --git a/core/Makefile b/core/Makefile
index b6dc3ff..1866dd1 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -37,15 +37,8 @@ BUILD_DIR := platform/novena/eim/build
 
 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.
-
 all:
-	patch -p1 --forward <patches/01-config-cores.patch
-	touch platform/novena/common/rtl/ipcore/clkmgr_dcm.v
 	cd ${BUILD_DIR}; $(MAKE) xil_env='. $$(isedir)/settings${WORD_SIZE}.sh'
-	patch -p1 --reverse <patches/01-config-cores.patch
 
 clean:
 	cd ${BUILD_DIR}; $(MAKE) clean
diff --git a/core/patches/01-config-cores.patch b/core/patches/01-config-cores.patch
deleted file mode 100644
index 245e8a3..0000000
--- a/core/patches/01-config-cores.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: configure core selectors for cryptech dnssec signer
-
---- core/platform/common/core_selector/src/rtl/cipher_selector.v~
-+++ core/platform/common/core_selector/src/rtl/cipher_selector.v
-@@ -67,7 +67,7 @@ module cipher_selector
-    //----------------------------------------------------------------
-    // Comment following lines to exclude cores from implementation.
-    `define  USE_CORE_AES
--   `define  USE_CORE_CHACHA
-+//   `define  USE_CORE_CHACHA
- 
- 
-    //----------------------------------------------------------------
---- core/platform/common/core_selector/src/rtl/hash_selector.v~
-+++ core/platform/common/core_selector/src/rtl/hash_selector.v
-@@ -125,9 +125,9 @@ XXX move to `define in wrapper core??
-    // List of Available Cores
-    //----------------------------------------------------------------
-    // Comment following lines to exclude cores from implementation.
--   `define  USE_CORE_SHA1
-+//   `define  USE_CORE_SHA1
-    `define  USE_CORE_SHA256
--   `define  USE_CORE_SHA512
-+//   `define  USE_CORE_SHA512
-    
-    
-    //----------------------------------------------------------------
diff --git a/sw/libhal b/sw/libhal
index c82c39c..da6eb8a 160000
--- a/sw/libhal
+++ b/sw/libhal
@@ -1 +1 @@
-Subproject commit c82c39cfc41843f07109657891bee7e410def879
+Subproject commit da6eb8ad054fb4ddab40a39802b0d99cee65ca78