-
Notifications
You must be signed in to change notification settings - Fork 88
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
soc: rename with_sdram option to with_main_ram (with_sdram was confus…
…ing)
1 parent
d09529d
commit 28d04ec
Showing
8 changed files
with
19 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -39,7 +39,7 @@ def __init__(self, platform, clk_freq, cpu_or_bridge=None, | |
cpu_boot_file="software/bios/bios.bin", | ||
with_rom=False, rom_size=0x8000, | ||
with_sram=True, sram_size=4096, | ||
with_sdram=False, sdram_size=64*1024, | ||
with_main_ram=False, main_ram_size=64*1024, | ||
with_csr=True, csr_data_width=8, csr_address_width=14, | ||
with_uart=True, uart_baudrate=115200, | ||
with_identifier=True, | ||
|
@@ -62,8 +62,8 @@ def __init__(self, platform, clk_freq, cpu_or_bridge=None, | |
self.with_sram = with_sram | ||
self.sram_size = sram_size | ||
|
||
self.with_sdram = with_sdram | ||
self.sdram_size = sdram_size | ||
self.with_main_ram = with_main_ram | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
enjoy-digital
Author
Contributor
|
||
self.main_ram_size = main_ram_size | ||
|
||
self.with_uart = with_uart | ||
self.uart_baudrate = uart_baudrate | ||
|
@@ -98,9 +98,10 @@ def __init__(self, platform, clk_freq, cpu_or_bridge=None, | |
self.submodules.sram = wishbone.SRAM(sram_size) | ||
self.register_mem("sram", self.mem_map["sram"], self.sram.bus, sram_size) | ||
|
||
if with_sdram: | ||
self.submodules.sdram = wishbone.SRAM(sdram_size) | ||
self.register_mem("sdram", self.mem_map["sdram"], self.sdram.bus, sdram_size) | ||
# Note: Main Ram can be used when no external SDRAM is available and use SDRAM mapping. | ||
if with_main_ram: | ||
self.submodules.main_ram = wishbone.SRAM(main_ram_size) | ||
self.register_mem("sdram", self.mem_map["sdram"], self.main_ram.bus, main_ram_size) | ||
|
||
elif cpu_or_bridge is not None and not isinstance(cpu_or_bridge, CPU): | ||
self._wb_masters += [cpu_or_bridge.wishbone] | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This should be called
with_integrated_main_ram
(andwith_integrated_rom
above). And in the memory mapping (usingregister_mem
), the main memory should not be calledsdram
butmain_ram
.