misoclib/cpu: merge git.py in identifier

diff --git a/misoclib/cpu/git.py b/misoclib/cpu/git.py
deleted file mode 100644 (file)
index e92a608..0000000
--- a/misoclib/cpu/git.py
+++ /dev/null
@@ -1,6 +0,0 @@
-import subprocess
-
-
-def get_id():
-    output = subprocess.check_output(["git", "rev-parse", "HEAD"]).decode("ascii")
-    return int(output[:8], 16)

diff --git a/misoclib/cpu/identifier.py b/misoclib/cpu/identifier.py
index 2c0d8211d926a740e9fa41b55768d31c4bb8a272..7f24c6124a980b0c9820e531b3d705e19fdb52a1 100644 (file)
--- a/misoclib/cpu/identifier.py
+++ b/misoclib/cpu/identifier.py
@@ -1,7 +1,11 @@
+import subprocess
+
 from migen.fhdl.std import *
 from migen.bank.description import *
 
-from misoclib.cpu import git
+def get_id():
+    output = subprocess.check_output(["git", "rev-parse", "HEAD"]).decode("ascii")
+    return int(output[:8], 16)
 
 
 class Identifier(Module, AutoCSR):
@@ -13,7 +17,7 @@ class Identifier(Module, AutoCSR):
         ###
 
         if revision is None:
-            revision = git.get_id()
+            revision = get_id()
 
         self.comb += [
             self._sysid.status.eq(sysid),

diff --git a/software/common.mak b/software/common.mak
index b2aaf71b156c2479991e1ad81b3d53b8680dad0e..b43ef6576c7a57e0134d7969c74b827eb62b9667 100644 (file)
--- a/software/common.mak
+++ b/software/common.mak
@@ -19,7 +19,7 @@ LD_quiet = @echo " LD      " $@ && $(TARGET_PREFIX)ld
 OBJCOPY_quiet = @echo " OBJCOPY " $@ && $(TARGET_PREFIX)objcopy
 RANLIB_quiet = @echo " RANLIB   " $@ && $(TARGET_PREFIX)ranlib
 
-MSC_GIT_ID := $(shell cd $(MSCDIR) && python3 -c "from misoclib.cpu.git import get_id; print(hex(get_id()), end='')")
+MSC_GIT_ID := $(shell cd $(MSCDIR) && python3 -c "from misoclib.cpu.identifier import get_id; print(hex(get_id()), end='')")
 
 ifeq ($(V),1)
        CC = $(CC_normal)