Hardware
/
litex
mirror of https://github.com/enjoy-digital/litex.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bios: add main bus and csr bus infos, use KiB/GiB.

This commit is contained in:
Florent Kermarrec 2020-05-28 15:05:24 +02:00
parent 02072deab1
commit 76cc112ecf
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
litex/soc/integration/soc.py
View File

@ -644,7 +644,6 @@ class SoCController(Module, AutoCSR):
class SoC(Module): class SoC(Module):
mem_map = {} mem_map = {}
def __init__(self, platform, sys_clk_freq, def __init__(self, platform, sys_clk_freq,
bus_standard = "wishbone", bus_standard = "wishbone",
bus_data_width = 32, bus_data_width = 32,
bus_address_width = 32, bus_address_width = 32,
@ -856,6 +855,9 @@ class SoC(Module):
colorer(self.bus_interconnect.__class__.__name__), colorer(self.bus_interconnect.__class__.__name__),
colorer(len(self.bus.masters)), colorer(len(self.bus.masters)),
colorer(len(self.bus.slaves)))) colorer(len(self.bus.slaves))))
self.add_constant("CONFIG_BUS_STANDARD", self.bus.standard.upper())
self.add_constant("CONFIG_BUS_DATA_WIDTH", self.bus.data_width)
self.add_constant("CONFIG_BUS_ADDRESS_WIDTH", self.bus.address_width)
# SoC CSR Interconnect --------------------------------------------------------------------- # SoC CSR Interconnect ---------------------------------------------------------------------
self.submodules.csr_bankarray = csr_bus.CSRBankArray(self, self.submodules.csr_bankarray = csr_bus.CSRBankArray(self,

15
litex/soc/software/bios/main.c
View File

@ -103,13 +103,20 @@ int main(int i, char **c)
printf("\e[1mCPU\e[0m: %s @ %dMHz\n", printf("\e[1mCPU\e[0m: %s @ %dMHz\n",
CONFIG_CPU_HUMAN_NAME, CONFIG_CPU_HUMAN_NAME,
CONFIG_CLOCK_FREQUENCY/1000000); CONFIG_CLOCK_FREQUENCY/1000000);
printf("\e[1mROM\e[0m: %dKB\n", ROM_SIZE/1024); printf("\e[1mBUS\e[0m: %s %d-bit / %dGiB\n",
printf("\e[1mSRAM\e[0m: %dKB\n", SRAM_SIZE/1024); CONFIG_BUS_STANDARD,
CONFIG_BUS_DATA_WIDTH,
(1 << (CONFIG_BUS_ADDRESS_WIDTH - 30)));
printf("\e[1mCSR\e[0m: %d-bit / %d-bit aligned\n",
CONFIG_CSR_DATA_WIDTH,
CONFIG_CSR_ALIGNMENT);
printf("\e[1mROM\e[0m: %dKiB\n", ROM_SIZE/1024);
printf("\e[1mSRAM\e[0m: %dKiB\n", SRAM_SIZE/1024);
#ifdef CONFIG_L2_SIZE #ifdef CONFIG_L2_SIZE
printf("\e[1mL2\e[0m: %dKB\n", CONFIG_L2_SIZE/1024); printf("\e[1mL2\e[0m: %dKiB\n", CONFIG_L2_SIZE/1024);
#endif #endif
#ifdef MAIN_RAM_SIZE #ifdef MAIN_RAM_SIZE
printf("\e[1mMAIN-RAM\e[0m: %dKB\n", MAIN_RAM_SIZE/1024); printf("\e[1mMAIN-RAM\e[0m: %dKiB\n", MAIN_RAM_SIZE/1024);
#endif #endif
printf("\n"); printf("\n");