From 19e60073dec1b8eb5c522361cff204113eb693b4 Mon Sep 17 00:00:00 2001 From: mwojcik Date: Tue, 7 Jun 2022 16:21:16 +0800 Subject: [PATCH 1/2] kasli_soc: ident = variant name --- src/gateware/kasli_soc.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gateware/kasli_soc.py b/src/gateware/kasli_soc.py index d45bfc4..36dfad9 100755 --- a/src/gateware/kasli_soc.py +++ b/src/gateware/kasli_soc.py @@ -118,7 +118,7 @@ class GenericStandalone(SoCCore): platform.toolchain.bitstream_commands.extend([ "set_property BITSTREAM.GENERAL.COMPRESS True [current_design]", ]) - ident = self.__class__.__name__ + ident = description["variant"] if self.acpki: ident = "acpki_" + ident SoCCore.__init__(self, platform=platform, csr_data_width=32, ident=ident) @@ -204,7 +204,7 @@ class GenericMaster(SoCCore): platform.toolchain.bitstream_commands.extend([ "set_property BITSTREAM.GENERAL.COMPRESS True [current_design]", ]) - ident = self.__class__.__name__ + ident = description["variant"] if self.acpki: ident = "acpki_" + ident SoCCore.__init__(self, platform=platform, csr_data_width=32, ident=ident) @@ -329,7 +329,7 @@ class GenericSatellite(SoCCore): platform.toolchain.bitstream_commands.extend([ "set_property BITSTREAM.GENERAL.COMPRESS True [current_design]", ]) - ident = self.__class__.__name__ + ident = description["variant"] if self.acpki: ident = "acpki_" + ident SoCCore.__init__(self, platform=platform, csr_data_width=32, ident=ident) -- 2.44.1 From dc862a9051ceeb85ac58693f935ecd495a2123a0 Mon Sep 17 00:00:00 2001 From: mwojcik Date: Fri, 21 Oct 2022 12:08:11 +0800 Subject: [PATCH 2/2] match ident message with mainline --- src/runtime/src/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/runtime/src/main.rs b/src/runtime/src/main.rs index a08c979..f7bca21 100644 --- a/src/runtime/src/main.rs +++ b/src/runtime/src/main.rs @@ -109,7 +109,7 @@ pub fn main_core0() { gic::InterruptController::gic(mpcore::RegisterBlock::mpcore()).enable_interrupts(); init_gateware(); - info!("detected gateware: {}", identifier_read(&mut [0; 64])); + info!("gateware ident: {}", identifier_read(&mut [0; 64])); i2c::init(); -- 2.44.1