From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Thu, 10 Jun 2021 19:10:16 +0000 (+0100)
Subject: whoops Popcount datalen too big (wasted bits). reduce
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9b441052b032c662681b63c9f45396b3bddd155c;p=soc.git

whoops Popcount datalen too big (wasted bits). reduce
---

diff --git a/pinmux b/pinmux
index 303ac486..096caad8 160000
--- a/pinmux
+++ b/pinmux
@@ -1 +1 @@
-Subproject commit 303ac486f3db396cf6406e2d40932444a221b9e8
+Subproject commit 096caad8418250693c93ccf90047750704adcaa7
diff --git a/src/soc/fu/logical/popcount.py b/src/soc/fu/logical/popcount.py
index 23c0ab63..ca90112d 100644
--- a/src/soc/fu/logical/popcount.py
+++ b/src/soc/fu/logical/popcount.py
@@ -26,7 +26,7 @@ class Popcount(Elaboratable):
     def __init__(self):
         self.a = Signal(64, reset_less=True)
         self.b = Signal(64, reset_less=True)
-        self.data_len = Signal(64, reset_less=True)
+        self.data_len = Signal(4, reset_less=True) # data len up to... err.. 8?
         self.o = Signal(64, reset_less=True)
 
     def elaborate(self, platform):
diff --git a/src/soc/litex/florent b/src/soc/litex/florent
index 7d251f1b..6efd2e59 160000
--- a/src/soc/litex/florent
+++ b/src/soc/litex/florent
@@ -1 +1 @@
-Subproject commit 7d251f1b58cb3e1d5788645b4ce38286d6814c04
+Subproject commit 6efd2e59703f6f0747435f97030e8a463233457f