Hardware/litex
1
0
Fork 0
mirror of https://github.com/enjoy-digital/litex.git synced 2025-01-04 09:52:26 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #214 from gsomlo/gls-alignment-fixup

Browse source 
soc_core: additional csr_alignment follow-up fixes
This commit is contained in:
enjoy-digital 2019-07-08 19:03:28 +02:00 committed by GitHub
commit bff081a818
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
litex/soc/integration/soc_core.py
View file

@ -186,11 +186,14 @@ class SoCCore(Module):
# Parameters managment --------------------------------------------------------------------- # Parameters managment ---------------------------------------------------------------------
# FIXME: RocketChip reserves the first 256Mbytes for internal use, change default mem_map # NOTE: RocketChip reserves the first 256Mbytes for internal use,
# so we must change default mem_map;
# Also, CSRs *must* be 64-bit aligned.
if cpu_type == "rocket": if cpu_type == "rocket":
self.soc_mem_map["rom"] = 0x10000000 self.soc_mem_map["rom"] = 0x10000000
self.soc_mem_map["sram"] = 0x11000000 self.soc_mem_map["sram"] = 0x11000000
self.soc_mem_map["csr"] = 0x12000000 self.soc_mem_map["csr"] = 0x12000000
csr_alignment = 64
if cpu_type == "None": if cpu_type == "None":
cpu_type = None cpu_type = None

2
litex/soc/software/bios/sdram.c
View file

@ -536,7 +536,7 @@ static void read_level(int module)
/* Write test pattern */ /* Write test pattern */
for(p=0;p<DFII_NPHASES;p++) for(p=0;p<DFII_NPHASES;p++)
for(i=0;i<DFII_PIX_DATA_SIZE;i++) for(i=0;i<DFII_PIX_DATA_SIZE;i++)
MMPTR(sdram_dfii_pix_wrdata_addr[p]+4*i) = prs[DFII_PIX_DATA_SIZE*p+i]; MMPTR(sdram_dfii_pix_wrdata_addr[p]+DFII_ADDR_SHIFT*i) = prs[DFII_PIX_DATA_SIZE*p+i];
sdram_dfii_piwr_address_write(0); sdram_dfii_piwr_address_write(0);
sdram_dfii_piwr_baddress_write(0); sdram_dfii_piwr_baddress_write(0);
command_pwr(DFII_COMMAND_CAS|DFII_COMMAND_WE|DFII_COMMAND_CS|DFII_COMMAND_WRDATA); command_pwr(DFII_COMMAND_CAS|DFII_COMMAND_WE|DFII_COMMAND_CS|DFII_COMMAND_WRDATA);

3
litex/soc/software/libbase/id.c
View file

@ -4,13 +4,14 @@
#include <string.h> #include <string.h>
#include <id.h> #include <id.h>
#define DFII_ADDR_SHIFT CONFIG_CSR_ALIGNMENT/8
void get_ident(char *ident) void get_ident(char *ident)
{ {
#ifdef CSR_IDENTIFIER_MEM_BASE #ifdef CSR_IDENTIFIER_MEM_BASE
int i; int i;
for(i=0;i<256;i++) for(i=0;i<256;i++)
ident[i] = MMPTR(CSR_IDENTIFIER_MEM_BASE + 4*i); ident[i] = MMPTR(CSR_IDENTIFIER_MEM_BASE + DFII_ADDR_SHIFT*i);
#else #else
ident[0] = 0; ident[0] = 0;
#endif #endif